From 8b40fccc68a330bd577e63d0f0ebaf0e647a9a7d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 6 Dec 2024 15:02:40 +0800 Subject: [PATCH 01/20] chore: Sync Plugin Info (#263) Sync Plugin Info Co-authored-by: robinv8 --- embed-basic/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/embed-basic/package.json b/embed-basic/package.json index eadd0b3e..35e2bb68 100644 --- a/embed-basic/package.json +++ b/embed-basic/package.json @@ -1,6 +1,6 @@ { "name": "embed-basic", - "version": "1.1.2", + "version": "1.1.3", "description": "", "files": [ "dist", From 4de18ce0ff551e8fb329e81506d67664a6b360e7 Mon Sep 17 00:00:00 2001 From: Luffy <52o@qq52o.cn> Date: Thu, 5 Dec 2024 17:16:47 +0800 Subject: [PATCH 02/20] fix: missing translations in slack --- notification-slack/i18n/en_US.yaml | 4 +++ notification-slack/i18n/zh_CN.yaml | 6 ++++- user-center-slack/i18n/en_US.yaml | 35 +++++++++++++++++++++++++ user-center-slack/i18n/zh_CN.yaml | 41 +++++++++++++++++++++++++++--- 4 files changed, 82 insertions(+), 4 deletions(-) diff --git a/notification-slack/i18n/en_US.yaml b/notification-slack/i18n/en_US.yaml index f3149992..62a2a2ba 100644 --- a/notification-slack/i18n/en_US.yaml +++ b/notification-slack/i18n/en_US.yaml @@ -108,3 +108,7 @@ plugin: other: "<{{.TriggerUserUrl}}|{{.TriggerUserDisplayName}}> invited you to answer <{{.QuestionUrl}}|{{.QuestionTitle}}>" new_question: other: "New question:\n<{{.QuestionUrl}}|{{.QuestionTitle}}>\n{{.QuestionTags}}" + upvoted_answer: + other: "<{{.TriggerUserUrl}}|{{.TriggerUserDisplayName}}> upvoted your answer <{{.AnswerUrl}}|{{.QuestionTitle}}>" + downvoted_answer: + other: "<{{.TriggerUserUrl}}|{{.TriggerUserDisplayName}}> downvoted your answer <{{.AnswerUrl}}|{{.QuestionTitle}}>" diff --git a/notification-slack/i18n/zh_CN.yaml b/notification-slack/i18n/zh_CN.yaml index 23e61b9b..2bd95408 100644 --- a/notification-slack/i18n/zh_CN.yaml +++ b/notification-slack/i18n/zh_CN.yaml @@ -107,4 +107,8 @@ plugin: invited_you_to_answer: other: "<{{.TriggerUserUrl}}|{{.TriggerUserDisplayName}}> 邀请你回答 <{{.QuestionUrl}}|{{.QuestionTitle}}>" new_question: - other: "新问题:\n<{{.QuestionUrl}}|{{.QuestionTitle}}>\n{{.QuestionTags}}" \ No newline at end of file + other: "新问题:\n<{{.QuestionUrl}}|{{.QuestionTitle}}>\n{{.QuestionTags}}" + upvoted_answer: + other: "<{{.TriggerUserUrl}}|{{.TriggerUserDisplayName}}> upvoted your answer <{{.AnswerUrl}}|{{.QuestionTitle}}>" + downvoted_answer: + other: "<{{.TriggerUserUrl}}|{{.TriggerUserDisplayName}}> downvoted your answer <{{.AnswerUrl}}|{{.QuestionTitle}}>" diff --git a/user-center-slack/i18n/en_US.yaml b/user-center-slack/i18n/en_US.yaml index 90d76451..e8f2b8ef 100644 --- a/user-center-slack/i18n/en_US.yaml +++ b/user-center-slack/i18n/en_US.yaml @@ -72,6 +72,9 @@ plugin: description: other: Slack signing secret user_config: + webhook_url: + title: + other: Webhook URL inbox_notifications: title: other: Inbox Notifications @@ -93,6 +96,34 @@ plugin: other: Turn on new questions for following tags description: other: Get notified of new questions for following tags. + upvoted_answers: + title: + other: UpVoted Answers + label: + other: Turn on notification for upvoted answers + description: + other: Get notified of upvoted answers + downvoted_answers: + title: + other: DownVoted Answers + label: + other: Turn on notification for downvoted answers + description: + other: Get notified of downvoted answers + updated_questions: + title: + other: Updated Questions + label: + other: Turn on notification for updated questions + description: + other: Get notified of updated questions + updated_answers: + title: + other: Updated Answers + label: + other: Turn on notification for updated answers + description: + other: Get notified of updated answers tpl: update_question: other: "{{.TriggerUserDisplayName}} updated question {{.QuestionTitle}}" @@ -114,3 +145,7 @@ plugin: other: "{{.TriggerUserDisplayName}} invited you to answer {{.QuestionTitle}}" new_question: other: "New question:\n{{.QuestionTitle}}\n{{.QuestionTags}}" + upvoted_answer: + other: "{{.TriggerUserDisplayName}} 点赞了你的回答 {{.QuestionTitle}}" + downvoted_answer: + other: "{{.TriggerUserDisplayName}} 反对了你的回答 {{.QuestionTitle}}" diff --git a/user-center-slack/i18n/zh_CN.yaml b/user-center-slack/i18n/zh_CN.yaml index f369ac8b..d755e7ea 100644 --- a/user-center-slack/i18n/zh_CN.yaml +++ b/user-center-slack/i18n/zh_CN.yaml @@ -28,7 +28,7 @@ plugin: name: other: Slack description: - other: 通过Slack进行登录 + other: 通过 Slack 进行登录 config: tip: title: @@ -65,13 +65,16 @@ plugin: title: other: 通知 description: - other: 用户将在Slack上收到通知。 + other: 用户将在 Slack 上收到通知。 signing_secret: title: other: Signing Secret description: other: Slack signing secret user_config: + webhook_url: + title: + other: Webhook URL inbox_notifications: title: other: 收件箱通知 @@ -93,6 +96,34 @@ plugin: other: 打开关注标签的新问题通知 description: other: 收到以下标签的新问题通知。 + upvoted_answers: + title: + other: 收到一个点赞 + label: + other: 打开点赞通知 + description: + other: 收到点赞的通知 + downvoted_answers: + title: + other: 收到一个反对 + label: + other: 打开反对通知 + description: + other: 收到反对的通知 + updated_questions: + title: + other: 问题更新 + label: + other: 打开问题更新通知 + description: + other: 收到问题更新的通知 + updated_answers: + title: + other: 回答更新 + label: + other: 打开回答更新通知 + description: + other: 收到回答更新的通知 tpl: update_question: other: "{{.TriggerUserDisplayName}} 更新问题 {{.QuestionTitle}}" @@ -113,4 +144,8 @@ plugin: invited_you_to_answer: other: "{{.TriggerUserDisplayName}} 邀请你回答 {{.QuestionTitle}}" new_question: - other: "新问题:\n{{.QuestionTitle}}\n{{.QuestionTags}}" \ No newline at end of file + other: "新问题:\n{{.QuestionTitle}}\n{{.QuestionTags}}" + upvoted_answer: + other: "{{.TriggerUserDisplayName}} 点赞了你的回答 {{.QuestionTitle}}" + downvoted_answer: + other: "{{.TriggerUserDisplayName}} 反对了你的回答 {{.QuestionTitle}}" From 2c62ccb12f1c42f2bcce05902ab0cbfdd4cfd9c5 Mon Sep 17 00:00:00 2001 From: LinkinStars Date: Fri, 6 Dec 2024 15:28:14 +0800 Subject: [PATCH 03/20] build(user-center-slack): update version to 1.0.3 --- user-center-slack/info.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user-center-slack/info.yaml b/user-center-slack/info.yaml index 8b689fdf..cd716d9b 100644 --- a/user-center-slack/info.yaml +++ b/user-center-slack/info.yaml @@ -17,6 +17,6 @@ slug_name: slack_user_center type: user_center -version: 1.0.2 +version: 1.0.3 author: AnanChen link: https://github.com/apache/incubator-answer-plugins/tree/main/user-center-slack From 1bda63f9004ace08d61110a496d65f7cb09b8b8c Mon Sep 17 00:00:00 2001 From: LinkinStars Date: Fri, 6 Dec 2024 15:31:23 +0800 Subject: [PATCH 04/20] fix(i18n): update translation texts for Slack plugins --- notification-slack/i18n/zh_CN.yaml | 4 ++-- user-center-slack/i18n/en_US.yaml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/notification-slack/i18n/zh_CN.yaml b/notification-slack/i18n/zh_CN.yaml index 2bd95408..0cd8b4d8 100644 --- a/notification-slack/i18n/zh_CN.yaml +++ b/notification-slack/i18n/zh_CN.yaml @@ -109,6 +109,6 @@ plugin: new_question: other: "新问题:\n<{{.QuestionUrl}}|{{.QuestionTitle}}>\n{{.QuestionTags}}" upvoted_answer: - other: "<{{.TriggerUserUrl}}|{{.TriggerUserDisplayName}}> upvoted your answer <{{.AnswerUrl}}|{{.QuestionTitle}}>" + other: "<{{.TriggerUserUrl}}|{{.TriggerUserDisplayName}}> 点赞了你的回答 <{{.AnswerUrl}}|{{.QuestionTitle}}>" downvoted_answer: - other: "<{{.TriggerUserUrl}}|{{.TriggerUserDisplayName}}> downvoted your answer <{{.AnswerUrl}}|{{.QuestionTitle}}>" + other: "<{{.TriggerUserUrl}}|{{.TriggerUserDisplayName}}> 反对了你的回答 <{{.AnswerUrl}}|{{.QuestionTitle}}>" diff --git a/user-center-slack/i18n/en_US.yaml b/user-center-slack/i18n/en_US.yaml index e8f2b8ef..ea7ed75d 100644 --- a/user-center-slack/i18n/en_US.yaml +++ b/user-center-slack/i18n/en_US.yaml @@ -25,7 +25,7 @@ plugin: failed: other: Contacts sync failed. info: - name: + name: other: Slack User Center description: other: A plugin for integrating Slack user management @@ -146,6 +146,6 @@ plugin: new_question: other: "New question:\n{{.QuestionTitle}}\n{{.QuestionTags}}" upvoted_answer: - other: "{{.TriggerUserDisplayName}} 点赞了你的回答 {{.QuestionTitle}}" + other: "{{.TriggerUserDisplayName}} upvoted your answer {{.QuestionTitle}}" downvoted_answer: - other: "{{.TriggerUserDisplayName}} 反对了你的回答 {{.QuestionTitle}}" + other: "{{.TriggerUserDisplayName}} downvoted your answer {{.QuestionTitle}}" From f70d84ae93d0470586bacfe8355dcec4d2a3d6a0 Mon Sep 17 00:00:00 2001 From: robin Date: Mon, 9 Dec 2024 15:56:43 +0800 Subject: [PATCH 05/20] refactor(render): remove logging of theme selection in config methods --- render-markdown-codehighlight/renderMarkdownCodehighlight.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/render-markdown-codehighlight/renderMarkdownCodehighlight.go b/render-markdown-codehighlight/renderMarkdownCodehighlight.go index e97388bd..9c016f5e 100644 --- a/render-markdown-codehighlight/renderMarkdownCodehighlight.go +++ b/render-markdown-codehighlight/renderMarkdownCodehighlight.go @@ -92,12 +92,10 @@ func (r *Render) ConfigReceiver(config []byte) error { c := &RenderConfig{} _ = json.Unmarshal(config, c) r.Config = c - log.Println("Received theme:", r.Config.SelectTheme) return nil } func (r *Render) GetRenderConfig(ctx *gin.Context) (renderConfig *plugin.RenderConfig) { - log.Println("Current theme:", r.Config.SelectTheme) renderConfig = &plugin.RenderConfig{ SelectTheme: r.Config.SelectTheme, } From db5dfaf22973a99a17783db4bb3be2fca480d364 Mon Sep 17 00:00:00 2001 From: robin Date: Mon, 9 Dec 2024 15:57:42 +0800 Subject: [PATCH 06/20] build(render-markdown-codehighlight): bump version to 0.2.1 --- render-markdown-codehighlight/info.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/render-markdown-codehighlight/info.yaml b/render-markdown-codehighlight/info.yaml index 5e60175b..dd79aacb 100644 --- a/render-markdown-codehighlight/info.yaml +++ b/render-markdown-codehighlight/info.yaml @@ -17,6 +17,6 @@ slug_name: render_markdown_codehighlight type: render -version: 0.2.0 +version: 0.2.1 author: Chen Jiaji, Zhu Xuanlyu link: https://github.com/apache/incubator-answer-plugins/tree/main/render-markdown-codehighlight From 0dba336554358806cb5571f039dc4654dbef9ddc Mon Sep 17 00:00:00 2001 From: robin Date: Mon, 9 Dec 2024 16:33:07 +0800 Subject: [PATCH 07/20] refactor(render-markdown-codehighlight): remove unused log import --- render-markdown-codehighlight/renderMarkdownCodehighlight.go | 1 - 1 file changed, 1 deletion(-) diff --git a/render-markdown-codehighlight/renderMarkdownCodehighlight.go b/render-markdown-codehighlight/renderMarkdownCodehighlight.go index 9c016f5e..c1ca809a 100644 --- a/render-markdown-codehighlight/renderMarkdownCodehighlight.go +++ b/render-markdown-codehighlight/renderMarkdownCodehighlight.go @@ -26,7 +26,6 @@ import ( "github.com/apache/incubator-answer-plugins/util" "github.com/apache/incubator-answer/plugin" "github.com/gin-gonic/gin" - "log" "strings" ) From d99270e8823a7a18206b00da40d6035fa85ca082 Mon Sep 17 00:00:00 2001 From: robin Date: Mon, 9 Dec 2024 16:33:23 +0800 Subject: [PATCH 08/20] build(render-markdown-codehighlight): bump version to 0.2.2 --- render-markdown-codehighlight/info.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/render-markdown-codehighlight/info.yaml b/render-markdown-codehighlight/info.yaml index dd79aacb..be82141a 100644 --- a/render-markdown-codehighlight/info.yaml +++ b/render-markdown-codehighlight/info.yaml @@ -17,6 +17,6 @@ slug_name: render_markdown_codehighlight type: render -version: 0.2.1 +version: 0.2.2 author: Chen Jiaji, Zhu Xuanlyu link: https://github.com/apache/incubator-answer-plugins/tree/main/render-markdown-codehighlight From 9d75869e3d3748de367e9ce8768b45414f3595dd Mon Sep 17 00:00:00 2001 From: lihui Date: Fri, 3 Jan 2025 00:53:32 +0800 Subject: [PATCH 09/20] feat: add wecom notification --- notification-wecom/README.md | 33 +++++ notification-wecom/README_CN.md | 33 +++++ notification-wecom/config.go | 53 ++++++++ notification-wecom/docs/wecom-config.png | Bin 0 -> 104028 bytes notification-wecom/go.mod | 47 +++++++ notification-wecom/go.sum | 147 ++++++++++++++++++++++ notification-wecom/i18n/en_US.yaml | 93 ++++++++++++++ notification-wecom/i18n/translation.go | 52 ++++++++ notification-wecom/i18n/zh_CN.yaml | 92 ++++++++++++++ notification-wecom/info.yaml | 5 + notification-wecom/notification_wecom.go | 149 +++++++++++++++++++++++ notification-wecom/schema.go | 38 ++++++ notification-wecom/user_config.go | 137 +++++++++++++++++++++ 13 files changed, 879 insertions(+) create mode 100644 notification-wecom/README.md create mode 100644 notification-wecom/README_CN.md create mode 100644 notification-wecom/config.go create mode 100644 notification-wecom/docs/wecom-config.png create mode 100644 notification-wecom/go.mod create mode 100644 notification-wecom/go.sum create mode 100644 notification-wecom/i18n/en_US.yaml create mode 100644 notification-wecom/i18n/translation.go create mode 100644 notification-wecom/i18n/zh_CN.yaml create mode 100644 notification-wecom/info.yaml create mode 100644 notification-wecom/notification_wecom.go create mode 100644 notification-wecom/schema.go create mode 100644 notification-wecom/user_config.go diff --git a/notification-wecom/README.md b/notification-wecom/README.md new file mode 100644 index 00000000..5006009d --- /dev/null +++ b/notification-wecom/README.md @@ -0,0 +1,33 @@ +# Wecom Notification Plugin + +## How to use + +To use the notification-wecom plugin with your application, install it using the following command: + +```bash +./answer build --with github.com/lhui/incubator-answer-plugins/notification-wecom +``` + + +## Feature + +- Send message to Wecom + +## Config + +> Config Webhook URL and open the notification + +- Webhook URL: such as `https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx` + +## Preview + +![Wecom Config](./docs/wecom-config.png) + +## Document + +https://open.work.weixin.qq.com/help2/pc/14931 +https://developer.work.weixin.qq.com/document/path/91770 + +## Thanks + +Thanks for sharing the DingTalk notification plugin, it's a helpful reference for this plugin development. diff --git a/notification-wecom/README_CN.md b/notification-wecom/README_CN.md new file mode 100644 index 00000000..607f225b --- /dev/null +++ b/notification-wecom/README_CN.md @@ -0,0 +1,33 @@ +# 企业微信通知插件 + +## 使用指南 + +要使用通知企业微信通知插件，请使用以下命令进行安装： + +```bash +./answer build --with github.com/lhui/incubator-answer-plugins/notification-wecom +``` + + +## 功能 + +- 通过企业微信群机器人发送信息到企业微信 + +## 配置 + +> 配置Webhook URL并打开通知 + +- Webhook 地址: 类似于 `https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx` + +## 预览 + +![企业微信配置](./docs/wecom-config.png) + +## 开发文档 + +https://open.work.weixin.qq.com/help2/pc/14931 +https://developer.work.weixin.qq.com/document/path/91770 + +## 致谢 + +感谢钉钉通知插件的开发，本插件很多代码参考壶或者直接沿用了钉钉通知插件的代码。 \ No newline at end of file diff --git a/notification-wecom/config.go b/notification-wecom/config.go new file mode 100644 index 00000000..0bdcc81c --- /dev/null +++ b/notification-wecom/config.go @@ -0,0 +1,53 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package wecom + +import ( + "encoding/json" + + "github.com/apache/incubator-answer-plugins/notification-wecom/i18n" + "github.com/apache/incubator-answer/plugin" +) + +type NotificationConfig struct { + Notification bool `json:"notification"` +} + +func (n *Notification) ConfigFields() []plugin.ConfigField { + return []plugin.ConfigField{ + { + Name: "notification", + Type: plugin.ConfigTypeSwitch, + Title: plugin.MakeTranslator(i18n.ConfigNotificationTitle), + Description: plugin.MakeTranslator(i18n.ConfigNotificationDescription), + UIOptions: plugin.ConfigFieldUIOptions{ + Label: plugin.MakeTranslator(i18n.ConfigNotificationLabel), + }, + Value: n.Config.Notification, + }, + } +} + +func (n *Notification) ConfigReceiver(config []byte) error { + c := &NotificationConfig{} + _ = json.Unmarshal(config, c) + n.Config = c + return nil +} diff --git a/notification-wecom/docs/wecom-config.png b/notification-wecom/docs/wecom-config.png new file mode 100644 index 0000000000000000000000000000000000000000..be534f104060c2df6da86840a15274432c50fd6a GIT binary patch literal 104028 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
wVHh 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
>LdG?|ab4``pQX$`XfEdX;>@hWw`^f&% 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 SoJl?&2DJx|m8%pj!~Pe%GuAi& literal 0 HcmV?d00001 diff --git a/notification-wecom/go.mod b/notification-wecom/go.mod new file mode 100644 index 00000000..24655890 --- /dev/null +++ b/notification-wecom/go.mod @@ -0,0 +1,47 @@ +module github.com/apache/incubator-answer-plugins/notification-wecom + +go 1.23.4 + +require ( + github.com/apache/incubator-answer v1.4.1 + github.com/apache/incubator-answer-plugins/util v1.0.2 +) + +require ( + github.com/LinkinStars/go-i18n/v2 v2.2.2 // indirect + github.com/aymerick/douceur v0.2.0 // indirect + github.com/bytedance/sonic v1.12.2 // indirect + github.com/bytedance/sonic/loader v0.2.0 // indirect + github.com/cloudwego/base64x v0.1.4 // indirect + github.com/cloudwego/iasm v0.2.0 // indirect + github.com/gabriel-vasile/mimetype v1.4.5 // indirect + github.com/gin-contrib/sse v0.1.0 // indirect + github.com/gin-gonic/gin v1.10.0 // indirect + github.com/go-playground/locales v0.14.1 // indirect + github.com/go-playground/universal-translator v0.18.1 // indirect + github.com/go-playground/validator/v10 v10.22.1 // indirect + github.com/goccy/go-json v0.10.3 // indirect + github.com/google/wire v0.5.0 // indirect + github.com/gorilla/css v1.0.1 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/klauspost/cpuid/v2 v2.2.8 // indirect + github.com/kr/text v0.2.0 // indirect + github.com/leodido/go-urn v1.4.0 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/microcosm-cc/bluemonday v1.0.27 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/pelletier/go-toml/v2 v2.2.3 // indirect + github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f // indirect + github.com/segmentfault/pacman/contrib/i18n v0.0.0-20230822083413-c0075a2d401f // indirect + github.com/twitchyliquid64/golang-asm v0.15.1 // indirect + github.com/ugorji/go/codec v1.2.12 // indirect + golang.org/x/arch v0.10.0 // indirect + golang.org/x/crypto v0.27.0 // indirect + golang.org/x/net v0.29.0 // indirect + golang.org/x/sys v0.25.0 // indirect + golang.org/x/text v0.18.0 // indirect + google.golang.org/protobuf v1.34.2 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect + sigs.k8s.io/yaml v1.4.0 // indirect +) diff --git a/notification-wecom/go.sum b/notification-wecom/go.sum new file mode 100644 index 00000000..b08ce5b9 --- /dev/null +++ b/notification-wecom/go.sum @@ -0,0 +1,147 @@ +github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU= +github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= +github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= +github.com/apache/incubator-answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= +github.com/apache/incubator-answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= +github.com/apache/incubator-answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= +github.com/apache/incubator-answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= +github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= +github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= +github.com/bytedance/sonic v1.12.2/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk= +github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= +github.com/bytedance/sonic/loader v0.2.0 h1:zNprn+lsIP06C/IqCHs3gPQIvnvpKbbxyXQP1iU4kWM= +github.com/bytedance/sonic/loader v0.2.0/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= +github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y= +github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= +github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg= +github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/gabriel-vasile/mimetype v1.4.5 h1:J7wGKdGu33ocBOhGy0z653k/lFKLFDPJMG8Gql0kxn4= +github.com/gabriel-vasile/mimetype v1.4.5/go.mod h1:ibHel+/kbxn9x2407k1izTA1S81ku1z/DlgOW2QE0M4= +github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= +github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= +github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU= +github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y= +github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= +github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= +github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= +github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= +github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= +github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= +github.com/go-playground/validator/v10 v10.22.1 h1:40JcKH+bBNGFczGuoBYgX4I6m/i27HYW8P9FDk5PbgA= +github.com/go-playground/validator/v10 v10.22.1/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= +github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA= +github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/subcommands v1.0.1/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= +github.com/google/wire v0.5.0 h1:I7ELFeVBr3yfPIcc8+MWvrjk+3VjbcSzoXm3JVa+jD8= +github.com/google/wire v0.5.0/go.mod h1:ngWDr9Qvq3yZA10YrxfyGELY/AFWGVpy9c1LTRi1EoU= +github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= +github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= +github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= +github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM= +github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= +github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M= +github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= +github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= +github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/microcosm-cc/bluemonday v1.0.27 h1:MpEUotklkwCSLeH+Qdx1VJgNqLlpY2KXwXFM08ygZfk= +github.com/microcosm-cc/bluemonday v1.0.27/go.mod h1:jFi9vgW+H7c3V0lb6nR74Ib/DIB5OBs92Dimizgw2cA= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M= +github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8= +github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= +github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f h1:9f2Bjf6bdMvNyUop32wAGJCdp+Jdm/d6nKBYvFvkRo0= +github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f/go.mod h1:5lNp5REd8QMThmBUvR3Fi9Y3AsOB4GRq7soCB4QLqOs= +github.com/segmentfault/pacman/contrib/i18n v0.0.0-20230822083413-c0075a2d401f h1:xia6AXJor4UV4T6htmHlfN7CGXZ04vlWwybVtFKJ/mA= +github.com/segmentfault/pacman/contrib/i18n v0.0.0-20230822083413-c0075a2d401f/go.mod h1:7QcRmnV7OYq4hNOOCWXT5HXnN/u756JUsqIW0Bw8n9E= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= +github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= +github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE= +github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +golang.org/x/arch v0.10.0 h1:S3huipmSclq3PJMNe76NGwkBR504WFkQ5dhzWzP8ZW8= +golang.org/x/arch v0.10.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= +golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= +golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= +golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= +golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50= +sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= +sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/notification-wecom/i18n/en_US.yaml b/notification-wecom/i18n/en_US.yaml new file mode 100644 index 00000000..ba01cdc1 --- /dev/null +++ b/notification-wecom/i18n/en_US.yaml @@ -0,0 +1,93 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + + +plugin: + wecom_notification: + backend: + info: + name: + other: Wecom Notification + description: + other: Send notifications to Wecom + config: + tip: + title: + other: Push notification service has been turned off. + notification: + label: + other: Turn on push notifications + title: + other: Notifications + description: + other: Users will receive notifications on Wecom. + user_config: + webhook_url: + title: + other: Webhook URL + inbox_notifications: + title: + other: Inbox Notifications + label: + other: Turn on inbox notifications + description: + other: Answers to your questions, comments, invites, and more. + all_new_questions: + title: + other: All New Questions + label: + other: Turn on all new questions + description: + other: Get notified of all new questions. Up to 50 questions per week. + new_questions_for_following_tags: + title: + other: New Questions for Following Tags + label: + other: Turn on new questions for following tags + description: + other: Get notified of new questions for following tags. + tpl: + update_question: + text: + other: "[{{.TriggerUserDisplayName}}]({{.TriggerUserUrl}}) updated question [{{.QuestionTitle}}]({{.QuestionUrl}})" + answer_the_question: + text: + other: "[{{.TriggerUserDisplayName}}]({{.TriggerUserUrl}}) answered the question [{{.QuestionTitle}}]({{.AnswerUrl}})" + update_answer: + text: + other: "[{{.TriggerUserDisplayName}}]({{.TriggerUserUrl}}) updated answer [{{.QuestionTitle}}]({{.AnswerUrl}})" + accept_answer: + text: + other: "[{{.TriggerUserDisplayName}}]({{.TriggerUserUrl}}) accepted answer [{{.QuestionTitle}}]({{.AnswerUrl}})" + comment_question: + text: + other: "[{{.TriggerUserDisplayName}}]({{.TriggerUserUrl}}) commented question [{{.QuestionTitle}}]({{.CommentUrl}})" + comment_answer: + text: + other: "[{{.TriggerUserDisplayName}}]({{.TriggerUserUrl}}) commented answer [{{.QuestionTitle}}]({{.CommentUrl}})" + reply_to_you: + text: + other: "[{{.TriggerUserDisplayName}}]({{.TriggerUserUrl}}) replied you [{{.QuestionTitle}}]({{.CommentUrl}})" + mention_you: + text: + other: "[{{.TriggerUserDisplayName}}]({{.TriggerUserUrl}}) mentioned you [{{.QuestionTitle}}]({{.CommentUrl}})" + invited_you_to_answer: + text: + other: "[{{.TriggerUserDisplayName}}]({{.TriggerUserUrl}}) invited you to answer [{{.QuestionTitle}}]({{.QuestionUrl}})" + new_question: + text: + other: "New question:\n[{{.QuestionTitle}}]({{.QuestionUrl}})\n Tag: {{.QuestionTags}}" diff --git a/notification-wecom/i18n/translation.go b/notification-wecom/i18n/translation.go new file mode 100644 index 00000000..80db37ee --- /dev/null +++ b/notification-wecom/i18n/translation.go @@ -0,0 +1,52 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package i18n + +const ( + InfoName = "plugin.wecom_notification.backend.info.name" + InfoDescription = "plugin.wecom_notification.backend.info.description" + ConfigTipTitle = "plugin.wecom_notification.backend.config.tip.title" + ConfigNotificationLabel = "plugin.wecom_notification.backend.config.notification.label" + ConfigNotificationTitle = "plugin.wecom_notification.backend.config.notification.title" + ConfigNotificationDescription = "plugin.wecom_notification.backend.config.notification.description" + + UserConfigWebhookURLTitle = "plugin.wecom_notification.backend.user_config.webhook_url.title" + UserConfigInboxNotificationsTitle = "plugin.wecom_notification.backend.user_config.inbox_notifications.title" + UserConfigInboxNotificationsLabel = "plugin.wecom_notification.backend.user_config.inbox_notifications.label" + UserConfigInboxNotificationsDescription = "plugin.wecom_notification.backend.user_config.inbox_notifications.description" + + UserConfigAllNewQuestionsNotificationsTitle = "plugin.wecom_notification.backend.user_config.all_new_questions.title" + UserConfigAllNewQuestionsNotificationsLabel = "plugin.wecom_notification.backend.user_config.all_new_questions.label" + UserConfigAllNewQuestionsNotificationsDescription = "plugin.wecom_notification.backend.user_config.all_new_questions.description" + + UserConfigNewQuestionsForFollowingTagsTitle = "plugin.wecom_notification.backend.user_config.new_questions_for_following_tags.title" + UserConfigNewQuestionsForFollowingTagsLabel = "plugin.wecom_notification.backend.user_config.new_questions_for_following_tags.label" + UserConfigNewQuestionsForFollowingTagsDescription = "plugin.wecom_notification.backend.user_config.new_questions_for_following_tags.description" + + TplUpdateQuestion = "plugin.wecom_notification.backend.tpl.update_question.text" + TplAnswerTheQuestion = "plugin.wecom_notification.backend.tpl.answer_the_question.text" + TplUpdateAnswer = "plugin.wecom_notification.backend.tpl.update_answer.text" + TplAcceptAnswer = "plugin.wecom_notification.backend.tpl.accept_answer.text" + TplCommentQuestion = "plugin.wecom_notification.backend.tpl.comment_question.text" + TplCommentAnswer = "plugin.wecom_notification.backend.tpl.comment_answer.text" + TplReplyToYou = "plugin.wecom_notification.backend.tpl.reply_to_you.text" + TplMentionYou = "plugin.wecom_notification.backend.tpl.mention_you.text" + TplInvitedYouToAnswer = "plugin.wecom_notification.backend.tpl.invited_you_to_answer.text" + TplNewQuestion = "plugin.wecom_notification.backend.tpl.new_question.text" +) diff --git a/notification-wecom/i18n/zh_CN.yaml b/notification-wecom/i18n/zh_CN.yaml new file mode 100644 index 00000000..23547038 --- /dev/null +++ b/notification-wecom/i18n/zh_CN.yaml @@ -0,0 +1,92 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +plugin: + wecom_notification: + backend: + info: + name: + other: 企业微信通知 + description: + other: 发送通知到企业微信 + config: + tip: + title: + other: 推送通知服务已关闭。 + notification: + label: + other: 打开通知 + title: + other: 通知 + description: + other: 用户将在企业微信上收到通知。 + user_config: + webhook_url: + title: + other: Webhook URL + inbox_notifications: + title: + other: 收件箱通知 + label: + other: 打开收件箱通知 + description: + other: 问题的答案、评论、邀请等。 + all_new_questions: + title: + other: 所有新问题通知 + label: + other: 打开所有新问题通知 + description: + other: 收到所有新问题的通知。每周最多 50 个问题。 + new_questions_for_following_tags: + title: + other: 关注标签的新问题通知 + label: + other: 打开关注标签的新问题通知 + description: + other: 收到以下标签的新问题通知。 + tpl: + update_question: + text: + other: "[{{.TriggerUserDisplayName}}]({{.TriggerUserUrl}}) 更新问题 [{{.QuestionTitle}}]({{.QuestionUrl}})" + answer_the_question: + text: + other: "[{{.TriggerUserDisplayName}}]({{.TriggerUserUrl}}) 回答了问题 [{{.QuestionTitle}}]({{.AnswerUrl}})" + update_answer: + text: + other: "[{{.TriggerUserDisplayName}}]({{.TriggerUserUrl}}) 更新答案 [{{.QuestionTitle}}]({{.AnswerUrl}})" + accept_answer: + text: + other: "[{{.TriggerUserDisplayName}}]({{.TriggerUserUrl}}) 接受答案 [{{.QuestionTitle}}]({{.AnswerUrl}})" + comment_question: + text: + other: "[{{.TriggerUserDisplayName}}]({{.TriggerUserUrl}}) 评论提问 [{{.QuestionTitle}}]({{.CommentUrl}})" + comment_answer: + text: + other: "[{{.TriggerUserDisplayName}}]({{.TriggerUserUrl}}) 评论回答 [{{.QuestionTitle}}]({{.CommentUrl}})" + reply_to_you: + text: + other: "[{{.TriggerUserDisplayName}}]({{.TriggerUserUrl}}) 回复了问题 [{{.QuestionTitle}}]({{.CommentUrl}})" + mention_you: + text: + other: "[{{.TriggerUserDisplayName}}]({{.TriggerUserUrl}}) 提到了你 [{{.QuestionTitle}}]({{.CommentUrl}})" + invited_you_to_answer: + text: + other: "[{{.TriggerUserDisplayName}}]({{.TriggerUserUrl}}) 邀请你回答 [{{.QuestionTitle}}]({{.QuestionUrl}})" + new_question: + text: + other: "新问题:\n [{{.QuestionTitle}}]({{.QuestionUrl}}) \n 标签: {{.QuestionTags}}" diff --git a/notification-wecom/info.yaml b/notification-wecom/info.yaml new file mode 100644 index 00000000..bb07c5c0 --- /dev/null +++ b/notification-wecom/info.yaml @@ -0,0 +1,5 @@ +slug_name: notification_wecom +type: notification +version: 0.0.1 +author: lihui +link: https://github.com/lhui/incubator-answer-plugins/tree/dev/notification-wecom diff --git a/notification-wecom/notification_wecom.go b/notification-wecom/notification_wecom.go new file mode 100644 index 00000000..64fc0f59 --- /dev/null +++ b/notification-wecom/notification_wecom.go @@ -0,0 +1,149 @@ +package wecom + +import ( + "embed" + "github.com/apache/incubator-answer/plugin" + "github.com/go-resty/resty/v2" + "strings" + + "github.com/apache/incubator-answer-plugins/util" + wecomI18n "github.com/apache/incubator-answer-plugins/notification-wecom/i18n" + "github.com/segmentfault/pacman/i18n" + "github.com/segmentfault/pacman/log" +) + +//go:embed info.yaml +var Info embed.FS + +type Notification struct { + Config *NotificationConfig + UserConfigCache *UserConfigCache +} + +func init() { + uc := &Notification{ + Config: &NotificationConfig{}, + UserConfigCache: NewUserConfigCache(), + } + plugin.Register(uc) +} +func (*Notification) Info() plugin.Info { + info := &util.Info{} + info.GetInfo(Info) + + return plugin.Info{ + Name: plugin.MakeTranslator(wecomI18n.InfoName), + SlugName: info.SlugName, + Description: plugin.MakeTranslator(wecomI18n.InfoDescription), + Author: info.Author, + Version: info.Version, + Link: info.Link, + } +} + + + +// GetNewQuestionSubscribers returns the subscribers of the new question notification +func (n *Notification) GetNewQuestionSubscribers() (userIDs []string) { + for userID, conf := range n.UserConfigCache.userConfigMapping { + if conf.AllNewQuestions { + userIDs = append(userIDs, userID) + } + } + return userIDs +} + +// Notify sends a notification to the user +func (n *Notification) Notify(msg plugin.NotificationMessage) { + log.Debugf("try to send notification %+v", msg) + + if !n.Config.Notification { + return + } + + // get user config + userConfig, err := n.getUserConfig(msg.ReceiverUserID) + if err != nil { + log.Errorf("get user config failed: %v", err) + return + } + if userConfig == nil { + log.Debugf("user %s has no config", msg.ReceiverUserID) + return + } + + // check if the notification is enabled + switch msg.Type { + case plugin.NotificationNewQuestion: + if !userConfig.AllNewQuestions { + log.Debugf("user %s not config the new question", msg.ReceiverUserID) + return + } + case plugin.NotificationNewQuestionFollowedTag: + if !userConfig.NewQuestionsForFollowingTags { + log.Debugf("user %s not config the new question followed tag", msg.ReceiverUserID) + return + } + default: + if !userConfig.InboxNotifications { + log.Debugf("user %s not config the inbox notification", msg.ReceiverUserID) + return + } + } + + log.Debugf("user %s config the notification", msg.ReceiverUserID) + + if len(userConfig.WebhookURL) == 0 { + log.Errorf("user %s has no webhook url", msg.ReceiverUserID) + return + } + + notificationMsg:= renderNotification(msg) + // no need to send empty message + if len(notificationMsg) == 0 { + log.Debugf("this type of notification will be drop, the type is %s", msg.Type) + return + } + + // Create a Resty Client + client := resty.New() + resp, err := client.R(). + SetHeader("Content-Type", "application/json"). + SetBody(NewWebhookReq(notificationMsg)). + Post(userConfig.WebhookURL) + + if err != nil { + log.Errorf("send message failed: %v %v", err, resp) + } else { + log.Infof("send message to %s success, resp: %s", msg.ReceiverUserID, resp.String()) + } +} + +func renderNotification(msg plugin.NotificationMessage) (string) { + lang := i18n.Language(msg.ReceiverLang) + switch msg.Type { + case plugin.NotificationUpdateQuestion: + return plugin.TranslateWithData(lang, wecomI18n.TplUpdateQuestion, msg) + case plugin.NotificationAnswerTheQuestion: + return plugin.TranslateWithData(lang, wecomI18n.TplAnswerTheQuestion, msg) + case plugin.NotificationUpdateAnswer: + return plugin.TranslateWithData(lang, wecomI18n.TplUpdateAnswer, msg) + case plugin.NotificationAcceptAnswer: + return plugin.TranslateWithData(lang, wecomI18n.TplAcceptAnswer, msg) + case plugin.NotificationCommentQuestion: + return plugin.TranslateWithData(lang, wecomI18n.TplCommentQuestion, msg) + case plugin.NotificationCommentAnswer: + return plugin.TranslateWithData(lang, wecomI18n.TplCommentAnswer, msg) + case plugin.NotificationReplyToYou: + return plugin.TranslateWithData(lang, wecomI18n.TplReplyToYou, msg) + case plugin.NotificationMentionYou: + return plugin.TranslateWithData(lang, wecomI18n.TplMentionYou, msg) + case plugin.NotificationInvitedYouToAnswer: + return plugin.TranslateWithData(lang, wecomI18n.TplInvitedYouToAnswer, msg) + case plugin.NotificationNewQuestion, plugin.NotificationNewQuestionFollowedTag: + msg.QuestionTags = strings.Join(strings.Split(msg.QuestionTags, ","), ", ") + return plugin.TranslateWithData(lang, wecomI18n.TplNewQuestion, msg) + } + return "" +} + diff --git a/notification-wecom/schema.go b/notification-wecom/schema.go new file mode 100644 index 00000000..45b08110 --- /dev/null +++ b/notification-wecom/schema.go @@ -0,0 +1,38 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package wecom + +type WebhookReq struct { + MsgType string `json:"msgtype"` + Markdown struct { + Text string `json:"content"` + } `json:"markdown"` +} + +func NewWebhookReq(content string) *WebhookReq { + return &WebhookReq{ + MsgType: "markdown", + Markdown: struct { + Text string `json:"content"` + }{ + Text: content, + }, + } +} diff --git a/notification-wecom/user_config.go b/notification-wecom/user_config.go new file mode 100644 index 00000000..bb294a8f --- /dev/null +++ b/notification-wecom/user_config.go @@ -0,0 +1,137 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package wecom + +import ( + "encoding/json" + "fmt" + "sync" + + "github.com/apache/incubator-answer-plugins/notification-wecom/i18n" + "github.com/apache/incubator-answer/plugin" + "github.com/segmentfault/pacman/log" +) + +type UserConfig struct { + WebhookURL string `json:"webhook_url"` + InboxNotifications bool `json:"inbox_notifications"` + AllNewQuestions bool `json:"all_new_questions"` + NewQuestionsForFollowingTags bool `json:"new_questions_for_following_tags"` +} + +type UserConfigCache struct { + // key: userID value: user config + userConfigMapping map[string]*UserConfig + sync.Mutex +} + +func NewUserConfigCache() *UserConfigCache { + ucc := &UserConfigCache{ + userConfigMapping: make(map[string]*UserConfig), + } + return ucc +} + +func (ucc *UserConfigCache) SetUserConfig(userID string, config *UserConfig) { + ucc.Lock() + defer ucc.Unlock() + ucc.userConfigMapping[userID] = config +} + +func (n *Notification) UserConfigFields() []plugin.ConfigField { + fields := make([]plugin.ConfigField, 0) + // Show tip for user, if the notification service is disabled + if !n.Config.Notification { + fields = append(fields, plugin.ConfigField{ + Name: "tip", + Type: plugin.ConfigTypeLegend, + Title: plugin.MakeTranslator(i18n.ConfigTipTitle), + Description: plugin.Translator{}, + UIOptions: plugin.ConfigFieldUIOptions{ + ClassName: "mb-3", + FieldClassName: "mb-0 text-danger", + }, + }) + } + fields = append(fields, plugin.ConfigField{ + Name: "webhook_url", + Type: plugin.ConfigTypeInput, + Title: plugin.MakeTranslator(i18n.UserConfigWebhookURLTitle), + Required: true, + UIOptions: plugin.ConfigFieldUIOptions{ + InputType: plugin.InputTypeText, + }, + }) + fields = append(fields, createSwitchConfig( + "inbox_notifications", + i18n.UserConfigInboxNotificationsTitle, + i18n.UserConfigInboxNotificationsLabel, + i18n.UserConfigInboxNotificationsDescription, + )) + fields = append(fields, createSwitchConfig( + "all_new_questions", + i18n.UserConfigAllNewQuestionsNotificationsTitle, + i18n.UserConfigAllNewQuestionsNotificationsLabel, + i18n.UserConfigAllNewQuestionsNotificationsDescription, + )) + fields = append(fields, createSwitchConfig( + "new_questions_for_following_tags", + i18n.UserConfigNewQuestionsForFollowingTagsTitle, + i18n.UserConfigNewQuestionsForFollowingTagsLabel, + i18n.UserConfigNewQuestionsForFollowingTagsDescription, + )) + return fields +} + +func createSwitchConfig(name, title, label, desc string) plugin.ConfigField { + return plugin.ConfigField{ + Name: name, + Type: plugin.ConfigTypeSwitch, + Title: plugin.MakeTranslator(title), + Description: plugin.MakeTranslator(desc), + UIOptions: plugin.ConfigFieldUIOptions{ + Label: plugin.MakeTranslator(label), + }, + } +} + +func (n *Notification) UserConfigReceiver(userID string, config []byte) error { + log.Debugf("receive user config %s %s", userID, string(config)) + var userConfig UserConfig + err := json.Unmarshal(config, &userConfig) + if err != nil { + return fmt.Errorf("unmarshal user config failed: %w", err) + } + n.UserConfigCache.SetUserConfig(userID, &userConfig) + return nil +} + +func (n *Notification) getUserConfig(userID string) (config *UserConfig, err error) { + userConfig := plugin.GetPluginUserConfig(userID, n.Info().SlugName) + if len(userConfig) == 0 { + return nil, nil + } + config = &UserConfig{} + err = json.Unmarshal(userConfig, config) + if err != nil { + return nil, fmt.Errorf("unmarshal user config failed: %w", err) + } + return config, nil +} From 19bf88c8e0c853bd58566785c3a53b5aff4aa52a Mon Sep 17 00:00:00 2001 From: lihui Date: Fri, 3 Jan 2025 01:24:16 +0800 Subject: [PATCH 10/20] feat: update package name for find plugins --- notification-wecom/config.go | 2 +- notification-wecom/go.mod | 2 +- notification-wecom/notification_wecom.go | 2 +- notification-wecom/user_config.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/notification-wecom/config.go b/notification-wecom/config.go index 0bdcc81c..19a7fe1d 100644 --- a/notification-wecom/config.go +++ b/notification-wecom/config.go @@ -22,7 +22,7 @@ package wecom import ( "encoding/json" - "github.com/apache/incubator-answer-plugins/notification-wecom/i18n" + "github.com/lhui/incubator-answer-plugins/notification-wecom/i18n" "github.com/apache/incubator-answer/plugin" ) diff --git a/notification-wecom/go.mod b/notification-wecom/go.mod index 24655890..6e1292c2 100644 --- a/notification-wecom/go.mod +++ b/notification-wecom/go.mod @@ -1,4 +1,4 @@ -module github.com/apache/incubator-answer-plugins/notification-wecom +module github.com/lhui/incubator-answer-plugins/notification-wecom go 1.23.4 diff --git a/notification-wecom/notification_wecom.go b/notification-wecom/notification_wecom.go index 64fc0f59..3f6e4389 100644 --- a/notification-wecom/notification_wecom.go +++ b/notification-wecom/notification_wecom.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/apache/incubator-answer-plugins/util" - wecomI18n "github.com/apache/incubator-answer-plugins/notification-wecom/i18n" + wecomI18n "github.com/lhui/incubator-answer-plugins/notification-wecom/i18n" "github.com/segmentfault/pacman/i18n" "github.com/segmentfault/pacman/log" ) diff --git a/notification-wecom/user_config.go b/notification-wecom/user_config.go index bb294a8f..30562d28 100644 --- a/notification-wecom/user_config.go +++ b/notification-wecom/user_config.go @@ -24,7 +24,7 @@ import ( "fmt" "sync" - "github.com/apache/incubator-answer-plugins/notification-wecom/i18n" + "github.com/lhui/incubator-answer-plugins/notification-wecom/i18n" "github.com/apache/incubator-answer/plugin" "github.com/segmentfault/pacman/log" ) From 012639633a0055f656387f51b4865d9c4b555dd5 Mon Sep 17 00:00:00 2001 From: lihui Date: Fri, 3 Jan 2025 01:28:17 +0800 Subject: [PATCH 11/20] feat: update package name for find plugins in go.mod --- notification-wecom/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/notification-wecom/go.mod b/notification-wecom/go.mod index 6e1292c2..24655890 100644 --- a/notification-wecom/go.mod +++ b/notification-wecom/go.mod @@ -1,4 +1,4 @@ -module github.com/lhui/incubator-answer-plugins/notification-wecom +module github.com/apache/incubator-answer-plugins/notification-wecom go 1.23.4 From e0fbafb0d3c846d971dc1a5076d449d6332e017a Mon Sep 17 00:00:00 2001 From: lihui Date: Fri, 3 Jan 2025 01:35:32 +0800 Subject: [PATCH 12/20] Revert "feat: update package name for find plugins in go.mod" This reverts commit e78df67c48d905755d349ece38618428027f5607. --- notification-wecom/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/notification-wecom/go.mod b/notification-wecom/go.mod index 24655890..6e1292c2 100644 --- a/notification-wecom/go.mod +++ b/notification-wecom/go.mod @@ -1,4 +1,4 @@ -module github.com/apache/incubator-answer-plugins/notification-wecom +module github.com/lhui/incubator-answer-plugins/notification-wecom go 1.23.4 From cded6aa9b251822502eb11578f90c940ae109323 Mon Sep 17 00:00:00 2001 From: lihui Date: Fri, 3 Jan 2025 12:09:59 +0800 Subject: [PATCH 13/20] feat: update notication-wecom package name and version --- notification-wecom/README.md | 2 +- notification-wecom/README_CN.md | 2 +- notification-wecom/config.go | 2 +- notification-wecom/go.mod | 2 +- notification-wecom/info.yaml | 4 +-- notification-wecom/notification_wecom.go | 42 +++++++++++------------- notification-wecom/user_config.go | 2 +- 7 files changed, 26 insertions(+), 30 deletions(-) diff --git a/notification-wecom/README.md b/notification-wecom/README.md index 5006009d..e7a3dcae 100644 --- a/notification-wecom/README.md +++ b/notification-wecom/README.md @@ -5,7 +5,7 @@ To use the notification-wecom plugin with your application, install it using the following command: ```bash -./answer build --with github.com/lhui/incubator-answer-plugins/notification-wecom +./answer build --with github.com/apache/incubator-answer-plugins/notification-wecom ``` diff --git a/notification-wecom/README_CN.md b/notification-wecom/README_CN.md index 607f225b..ca3e3627 100644 --- a/notification-wecom/README_CN.md +++ b/notification-wecom/README_CN.md @@ -5,7 +5,7 @@ 要使用通知企业微信通知插件，请使用以下命令进行安装： ```bash -./answer build --with github.com/lhui/incubator-answer-plugins/notification-wecom +./answer build --with github.com/apache/incubator-answer-plugins/notification-wecom ``` diff --git a/notification-wecom/config.go b/notification-wecom/config.go index 19a7fe1d..0bdcc81c 100644 --- a/notification-wecom/config.go +++ b/notification-wecom/config.go @@ -22,7 +22,7 @@ package wecom import ( "encoding/json" - "github.com/lhui/incubator-answer-plugins/notification-wecom/i18n" + "github.com/apache/incubator-answer-plugins/notification-wecom/i18n" "github.com/apache/incubator-answer/plugin" ) diff --git a/notification-wecom/go.mod b/notification-wecom/go.mod index 6e1292c2..24655890 100644 --- a/notification-wecom/go.mod +++ b/notification-wecom/go.mod @@ -1,4 +1,4 @@ -module github.com/lhui/incubator-answer-plugins/notification-wecom +module github.com/apache/incubator-answer-plugins/notification-wecom go 1.23.4 diff --git a/notification-wecom/info.yaml b/notification-wecom/info.yaml index bb07c5c0..71580225 100644 --- a/notification-wecom/info.yaml +++ b/notification-wecom/info.yaml @@ -1,5 +1,5 @@ slug_name: notification_wecom type: notification -version: 0.0.1 +version: 1.0.0 author: lihui -link: https://github.com/lhui/incubator-answer-plugins/tree/dev/notification-wecom +link: https://github.com/apache/incubator-answer-plugins/tree/main/notification-wecom diff --git a/notification-wecom/notification_wecom.go b/notification-wecom/notification_wecom.go index 3f6e4389..f76be4ae 100644 --- a/notification-wecom/notification_wecom.go +++ b/notification-wecom/notification_wecom.go @@ -1,15 +1,14 @@ package wecom import ( - "embed" - "github.com/apache/incubator-answer/plugin" - "github.com/go-resty/resty/v2" - "strings" - - "github.com/apache/incubator-answer-plugins/util" - wecomI18n "github.com/lhui/incubator-answer-plugins/notification-wecom/i18n" - "github.com/segmentfault/pacman/i18n" - "github.com/segmentfault/pacman/log" + "embed" + "github.com/apache/incubator-answer/plugin" + "strings" + + wecomI18n "github.com/apache/incubator-answer-plugins/notification-wecom/i18n" + "github.com/apache/incubator-answer-plugins/util" + "github.com/segmentfault/pacman/i18n" + "github.com/segmentfault/pacman/log" ) //go:embed info.yaml @@ -28,21 +27,19 @@ func init() { plugin.Register(uc) } func (*Notification) Info() plugin.Info { - info := &util.Info{} + info := &util.Info{} info.GetInfo(Info) - return plugin.Info{ - Name: plugin.MakeTranslator(wecomI18n.InfoName), - SlugName: info.SlugName, - Description: plugin.MakeTranslator(wecomI18n.InfoDescription), - Author: info.Author, - Version: info.Version, - Link: info.Link, - } + return plugin.Info{ + Name: plugin.MakeTranslator(wecomI18n.InfoName), + SlugName: info.SlugName, + Description: plugin.MakeTranslator(wecomI18n.InfoDescription), + Author: info.Author, + Version: info.Version, + Link: info.Link, + } } - - // GetNewQuestionSubscribers returns the subscribers of the new question notification func (n *Notification) GetNewQuestionSubscribers() (userIDs []string) { for userID, conf := range n.UserConfigCache.userConfigMapping { @@ -98,7 +95,7 @@ func (n *Notification) Notify(msg plugin.NotificationMessage) { return } - notificationMsg:= renderNotification(msg) + notificationMsg := renderNotification(msg) // no need to send empty message if len(notificationMsg) == 0 { log.Debugf("this type of notification will be drop, the type is %s", msg.Type) @@ -119,7 +116,7 @@ func (n *Notification) Notify(msg plugin.NotificationMessage) { } } -func renderNotification(msg plugin.NotificationMessage) (string) { +func renderNotification(msg plugin.NotificationMessage) string { lang := i18n.Language(msg.ReceiverLang) switch msg.Type { case plugin.NotificationUpdateQuestion: @@ -146,4 +143,3 @@ func renderNotification(msg plugin.NotificationMessage) (string) { } return "" } - diff --git a/notification-wecom/user_config.go b/notification-wecom/user_config.go index 30562d28..bb294a8f 100644 --- a/notification-wecom/user_config.go +++ b/notification-wecom/user_config.go @@ -24,7 +24,7 @@ import ( "fmt" "sync" - "github.com/lhui/incubator-answer-plugins/notification-wecom/i18n" + "github.com/apache/incubator-answer-plugins/notification-wecom/i18n" "github.com/apache/incubator-answer/plugin" "github.com/segmentfault/pacman/log" ) From d0b0cc78ab039ff9db20a2c15c75a253c4064156 Mon Sep 17 00:00:00 2001 From: lihui Date: Fri, 3 Jan 2025 13:42:28 +0800 Subject: [PATCH 14/20] feat: adjust apache header and recheck code --- notification-wecom/README.md | 2 ++ notification-wecom/README_CN.md | 4 +++- notification-wecom/go.mod | 5 +++-- notification-wecom/go.sum | 4 ++++ notification-wecom/notification_wecom.go | 20 ++++++++++++++++++++ 5 files changed, 32 insertions(+), 3 deletions(-) diff --git a/notification-wecom/README.md b/notification-wecom/README.md index e7a3dcae..53b3b344 100644 --- a/notification-wecom/README.md +++ b/notification-wecom/README.md @@ -1,5 +1,7 @@ # Wecom Notification Plugin +[English](./README.md) | [中文](./README_CN.md) + ## How to use To use the notification-wecom plugin with your application, install it using the following command: diff --git a/notification-wecom/README_CN.md b/notification-wecom/README_CN.md index ca3e3627..926ba357 100644 --- a/notification-wecom/README_CN.md +++ b/notification-wecom/README_CN.md @@ -1,5 +1,7 @@ # 企业微信通知插件 +[English](./README.md) | [中文](./README_CN.md) + ## 使用指南 要使用通知企业微信通知插件，请使用以下命令进行安装： @@ -30,4 +32,4 @@ https://developer.work.weixin.qq.com/document/path/91770 ## 致谢 -感谢钉钉通知插件的开发，本插件很多代码参考壶或者直接沿用了钉钉通知插件的代码。 \ No newline at end of file +感谢钉钉通知插件的开发，本插件很多代码参考或者直接沿用了钉钉通知插件的代码。 \ No newline at end of file diff --git a/notification-wecom/go.mod b/notification-wecom/go.mod index 24655890..1e191c73 100644 --- a/notification-wecom/go.mod +++ b/notification-wecom/go.mod @@ -1,10 +1,12 @@ module github.com/apache/incubator-answer-plugins/notification-wecom -go 1.23.4 +go 1.22.0 require ( github.com/apache/incubator-answer v1.4.1 github.com/apache/incubator-answer-plugins/util v1.0.2 + github.com/go-resty/resty/v2 v2.16.2 + github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f ) require ( @@ -32,7 +34,6 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.2.3 // indirect - github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f // indirect github.com/segmentfault/pacman/contrib/i18n v0.0.0-20230822083413-c0075a2d401f // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect diff --git a/notification-wecom/go.sum b/notification-wecom/go.sum index b08ce5b9..1bd7f183 100644 --- a/notification-wecom/go.sum +++ b/notification-wecom/go.sum @@ -36,6 +36,8 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= github.com/go-playground/validator/v10 v10.22.1 h1:40JcKH+bBNGFczGuoBYgX4I6m/i27HYW8P9FDk5PbgA= github.com/go-playground/validator/v10 v10.22.1/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= +github.com/go-resty/resty/v2 v2.16.2 h1:CpRqTjIzq/rweXUt9+GxzzQdlkqMdt8Lm/fuK/CAbAg= +github.com/go-resty/resty/v2 v2.16.2/go.mod h1:0fHAoK7JoBy/Ch36N8VFeMsK7xQOHhvWaC3iOktwmIU= github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA= github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -126,6 +128,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= +golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= diff --git a/notification-wecom/notification_wecom.go b/notification-wecom/notification_wecom.go index f76be4ae..9b01256c 100644 --- a/notification-wecom/notification_wecom.go +++ b/notification-wecom/notification_wecom.go @@ -1,8 +1,28 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package wecom import ( "embed" "github.com/apache/incubator-answer/plugin" + "github.com/go-resty/resty/v2" "strings" wecomI18n "github.com/apache/incubator-answer-plugins/notification-wecom/i18n" From 8a25e44234f528f3adaa91593caa8c6da623e322 Mon Sep 17 00:00:00 2001 From: lihui Date: Fri, 3 Jan 2025 13:48:30 +0800 Subject: [PATCH 15/20] feat: format code and add notification-wecom to README.md --- README.md | 1 + notification-wecom/i18n/translation.go | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 0b8d4c41..250f0f5b 100644 --- a/README.md +++ b/README.md @@ -56,6 +56,7 @@ The Notification plugin helps us to send messages to third-party notification sy - [x] [Slack](https://github.com/apache/incubator-answer-plugins/tree/main/notification-slack) - [x] [Lark](https://github.com/apache/incubator-answer-plugins/tree/main/notification-lark) - [x] [Ding talk](https://github.com/apache/incubator-answer-plugins/tree/main/notification-dingtalk) +- [x] [WeCom](https://github.com/apache/incubator-answer-plugins/tree/main/notification-wecom) ### Route diff --git a/notification-wecom/i18n/translation.go b/notification-wecom/i18n/translation.go index 80db37ee..d0ce5344 100644 --- a/notification-wecom/i18n/translation.go +++ b/notification-wecom/i18n/translation.go @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package i18n const ( @@ -39,14 +40,14 @@ const ( UserConfigNewQuestionsForFollowingTagsLabel = "plugin.wecom_notification.backend.user_config.new_questions_for_following_tags.label" UserConfigNewQuestionsForFollowingTagsDescription = "plugin.wecom_notification.backend.user_config.new_questions_for_following_tags.description" - TplUpdateQuestion = "plugin.wecom_notification.backend.tpl.update_question.text" - TplAnswerTheQuestion = "plugin.wecom_notification.backend.tpl.answer_the_question.text" - TplUpdateAnswer = "plugin.wecom_notification.backend.tpl.update_answer.text" - TplAcceptAnswer = "plugin.wecom_notification.backend.tpl.accept_answer.text" - TplCommentQuestion = "plugin.wecom_notification.backend.tpl.comment_question.text" - TplCommentAnswer = "plugin.wecom_notification.backend.tpl.comment_answer.text" - TplReplyToYou = "plugin.wecom_notification.backend.tpl.reply_to_you.text" - TplMentionYou = "plugin.wecom_notification.backend.tpl.mention_you.text" - TplInvitedYouToAnswer = "plugin.wecom_notification.backend.tpl.invited_you_to_answer.text" - TplNewQuestion = "plugin.wecom_notification.backend.tpl.new_question.text" + TplUpdateQuestion = "plugin.wecom_notification.backend.tpl.update_question.text" + TplAnswerTheQuestion = "plugin.wecom_notification.backend.tpl.answer_the_question.text" + TplUpdateAnswer = "plugin.wecom_notification.backend.tpl.update_answer.text" + TplAcceptAnswer = "plugin.wecom_notification.backend.tpl.accept_answer.text" + TplCommentQuestion = "plugin.wecom_notification.backend.tpl.comment_question.text" + TplCommentAnswer = "plugin.wecom_notification.backend.tpl.comment_answer.text" + TplReplyToYou = "plugin.wecom_notification.backend.tpl.reply_to_you.text" + TplMentionYou = "plugin.wecom_notification.backend.tpl.mention_you.text" + TplInvitedYouToAnswer = "plugin.wecom_notification.backend.tpl.invited_you_to_answer.text" + TplNewQuestion = "plugin.wecom_notification.backend.tpl.new_question.text" ) From 88f94cd2b3dfd9a0ae1b12028f5f73e4209ec2a7 Mon Sep 17 00:00:00 2001 From: LinkinStars Date: Mon, 6 Jan 2025 10:37:52 +0800 Subject: [PATCH 16/20] docs(notification-wecom): add Apache ASF header --- notification-wecom/info.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/notification-wecom/info.yaml b/notification-wecom/info.yaml index 71580225..a1f05e45 100644 --- a/notification-wecom/info.yaml +++ b/notification-wecom/info.yaml @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + slug_name: notification_wecom type: notification version: 1.0.0 From cf94ebc70954b97d3f9816c47fc46c9c3f3f039e Mon Sep 17 00:00:00 2001 From: LinkinStars Date: Tue, 7 Jan 2025 11:02:57 +0800 Subject: [PATCH 17/20] refactor(rename): rename incubator-answer --- .vaunt/config.yaml | 2 +- README.md | 50 ++++---- cache-redis/README.md | 2 +- cache-redis/go.mod | 6 +- cache-redis/go.sum | 8 +- cache-redis/info.yaml | 2 +- cache-redis/redis.go | 8 +- captcha-basic/basic.go | 6 +- captcha-basic/go.mod | 6 +- captcha-basic/go.sum | 8 +- captcha-basic/info.yaml | 2 +- captcha-google-v2/go.mod | 6 +- captcha-google-v2/go.sum | 8 +- captcha-google-v2/info.yaml | 2 +- captcha-google-v2/recaptcha.go | 6 +- cdn-aliyun/README.md | 2 +- cdn-aliyun/aliyun.go | 8 +- cdn-aliyun/go.mod | 6 +- cdn-aliyun/go.sum | 8 +- cdn-aliyun/info.yaml | 2 +- cdn-s3/go.mod | 6 +- cdn-s3/go.sum | 8 +- cdn-s3/info.yaml | 2 +- cdn-s3/s3.go | 8 +- connector-apache/apache.go | 8 +- connector-apache/go.mod | 6 +- connector-apache/go.sum | 8 +- connector-apache/info.yaml | 2 +- connector-basic/README.md | 2 +- connector-basic/basic.go | 8 +- connector-basic/go.mod | 6 +- connector-basic/go.sum | 8 +- connector-basic/info.yaml | 2 +- connector-dingtalk/README.md | 4 +- connector-dingtalk/dingtalk.go | 6 +- connector-dingtalk/go.mod | 6 +- connector-dingtalk/go.sum | 8 +- connector-dingtalk/info.yaml | 2 +- connector-github/README.md | 2 +- connector-github/github.go | 6 +- connector-github/go.mod | 6 +- connector-github/go.sum | 8 +- connector-github/info.yaml | 2 +- connector-google/README.md | 2 +- connector-google/go.mod | 6 +- connector-google/go.sum | 8 +- connector-google/google.go | 6 +- connector-google/info.yaml | 2 +- connector-wallet/README.md | 2 +- connector-wallet/go.mod | 6 +- connector-wallet/go.sum | 8 +- connector-wallet/info.yaml | 2 +- connector-wallet/wallet.go | 6 +- editor-chart/chart.go | 6 +- editor-chart/go.mod | 6 +- editor-chart/go.sum | 8 +- editor-chart/info.yaml | 2 +- editor-formula/formula.go | 6 +- editor-formula/go.mod | 6 +- editor-formula/go.sum | 8 +- editor-formula/info.yaml | 2 +- embed-basic/basic.go | 6 +- embed-basic/go.mod | 6 +- embed-basic/go.sum | 8 +- embed-basic/info.yaml | 2 +- notification-dingtalk/README.md | 2 +- notification-dingtalk/config.go | 4 +- .../dingtalk_notification.go | 7 +- notification-dingtalk/go.mod | 6 +- notification-dingtalk/go.sum | 8 +- notification-dingtalk/info.yaml | 2 +- notification-dingtalk/user_config.go | 4 +- notification-lark/README.md | 2 +- notification-lark/README_CN.md | 2 +- notification-lark/config.go | 4 +- notification-lark/go.mod | 6 +- notification-lark/go.sum | 8 +- notification-lark/info.yaml | 2 +- notification-lark/lark_card_test.go | 2 +- notification-lark/notification.go | 6 +- notification-lark/user_config.go | 4 +- notification-lark/utils_test.go | 2 +- notification-slack/config.go | 4 +- notification-slack/go.mod | 6 +- notification-slack/go.sum | 8 +- notification-slack/info.yaml | 2 +- notification-slack/slack_notification.go | 8 +- notification-slack/user_config.go | 4 +- notification-wecom/README.md | 2 +- notification-wecom/README_CN.md | 2 +- notification-wecom/config.go | 4 +- notification-wecom/go.mod | 6 +- notification-wecom/go.sum | 8 +- notification-wecom/info.yaml | 2 +- notification-wecom/notification_wecom.go | 7 +- notification-wecom/user_config.go | 4 +- plugins_desc.json | 108 +++++++++--------- render-markdown-codehighlight/go.mod | 6 +- render-markdown-codehighlight/go.sum | 8 +- render-markdown-codehighlight/info.yaml | 2 +- .../renderMarkdownCodehighlight.go | 6 +- reviewer-akismet/akismet.go | 3 +- reviewer-akismet/basic.go | 6 +- reviewer-akismet/go.mod | 6 +- reviewer-akismet/go.sum | 8 +- reviewer-akismet/info.yaml | 2 +- reviewer-baidu/basic.go | 6 +- reviewer-baidu/go.mod | 6 +- reviewer-baidu/go.sum | 8 +- reviewer-baidu/info.yaml | 2 +- reviewer-basic/basic.go | 6 +- reviewer-basic/go.mod | 6 +- reviewer-basic/go.sum | 8 +- reviewer-basic/info.yaml | 2 +- search-algolia/README.md | 2 +- search-algolia/algolia.go | 6 +- search-algolia/config.go | 4 +- search-algolia/go.mod | 6 +- search-algolia/go.sum | 8 +- search-algolia/info.yaml | 2 +- search-algolia/sync.go | 2 +- search-elasticsearch/README.md | 2 +- search-elasticsearch/es.go | 7 +- search-elasticsearch/es_index.go | 2 +- search-elasticsearch/go.mod | 6 +- search-elasticsearch/go.sum | 8 +- search-elasticsearch/info.yaml | 2 +- search-elasticsearch/sync.go | 2 +- search-meilisearch/README.md | 2 +- search-meilisearch/go.mod | 6 +- search-meilisearch/go.sum | 8 +- search-meilisearch/info.yaml | 2 +- search-meilisearch/meilisearch.go | 7 +- search-meilisearch/sync.go | 2 +- storage-aliyunoss/README.md | 2 +- storage-aliyunoss/aliyunoss.go | 6 +- storage-aliyunoss/go.mod | 6 +- storage-aliyunoss/go.sum | 8 +- storage-aliyunoss/info.yaml | 2 +- storage-s3/README.md | 2 +- storage-s3/go.mod | 6 +- storage-s3/go.sum | 8 +- storage-s3/info.yaml | 2 +- storage-s3/s3.go | 6 +- storage-s3/s3_client.go | 2 +- storage-tencentyuncos/README.md | 2 +- storage-tencentyuncos/go.mod | 6 +- storage-tencentyuncos/go.sum | 8 +- storage-tencentyuncos/info.yaml | 2 +- storage-tencentyuncos/tencentyuncos.go | 7 +- user-center-slack/client.go | 3 +- user-center-slack/config.go | 4 +- user-center-slack/go.mod | 6 +- user-center-slack/go.sum | 8 +- user-center-slack/handler.go | 2 +- user-center-slack/importer.go | 2 +- user-center-slack/info.yaml | 2 +- user-center-slack/notification.go | 5 +- user-center-slack/slack_user_center.go | 7 +- user-center-slack/user_config.go | 4 +- user-center-wecom/config.go | 4 +- user-center-wecom/go.mod | 6 +- user-center-wecom/go.sum | 8 +- user-center-wecom/handler.go | 4 +- user-center-wecom/info.yaml | 2 +- user-center-wecom/notification.go | 4 +- user-center-wecom/user_config.go | 4 +- user-center-wecom/wecom_user_center.go | 7 +- util/go.mod | 2 +- 169 files changed, 477 insertions(+), 491 deletions(-) diff --git a/.vaunt/config.yaml b/.vaunt/config.yaml index b772a958..64f940a6 100644 --- a/.vaunt/config.yaml +++ b/.vaunt/config.yaml @@ -2,7 +2,7 @@ version: 0.0.1 achievements: - achievement: name: Plugin Maestro - icon: https://raw.githubusercontent.com/apache/incubator-answer-plugins/main/.vaunt/plugin.png + icon: https://raw.githubusercontent.com/apache/answer-plugins/main/.vaunt/plugin.png description: Awarded for crafting a plugin, magical! triggers: - trigger: diff --git a/README.md b/README.md index 250f0f5b..41b0a27e 100644 --- a/README.md +++ b/README.md @@ -1,62 +1,62 @@ # Apache Answer Official Plugins -Apache Answer Official Plugins are built to enhance the feature of [Answer](https://github.com/apache/incubator-answer). +Apache Answer Official Plugins are built to enhance the feature of [Answer](https://github.com/apache/answer). -[![LICENSE](https://img.shields.io/github/license/apache/incubator-answer)](https://github.com/apache/incubator-answer/blob/main/LICENSE) +[![LICENSE](https://img.shields.io/github/license/apache/answer)](https://github.com/apache/answer/blob/main/LICENSE) [![Language](https://img.shields.io/badge/language-go-blue.svg)](https://golang.org/) [![Language](https://img.shields.io/badge/language-react-blue.svg)](https://reactjs.org/) -[![Go Report Card](https://goreportcard.com/badge/github.com/apache/incubator-answer)](https://goreportcard.com/report/github.com/apache/incubator-answer) +[![Go Report Card](https://goreportcard.com/badge/github.com/apache/answer)](https://goreportcard.com/report/github.com/apache/answer) [![Discord](https://img.shields.io/badge/discord-chat-5865f2?logo=discord&logoColor=f5f5f5)](https://discord.gg/Jm7Y4cbUej) ## Types of plugin -Our plugin is under development and the interface definition of the plugin can be viewed at [this link](https://github.com/apache/incubator-answer/tree/main/plugin). +Our plugin is under development and the interface definition of the plugin can be viewed at [this link](https://github.com/apache/answer/tree/main/plugin). ### Connector The Connector plugin helps us to implement third-party login functionality. For example: Google or GitHub OAuth login. -- [x] [OAuth2 Basic](https://github.com/apache/incubator-answer-plugins/tree/main/connector-basic) -- [x] [GitHub](https://github.com/apache/incubator-answer-plugins/tree/main/connector-github) -- [x] [Google](https://github.com/apache/incubator-answer-plugins/tree/main/connector-google) -- [x] [Dingtalk](https://github.com/apache/incubator-answer-plugins/tree/main/connector-dingtalk) +- [x] [OAuth2 Basic](https://github.com/apache/answer-plugins/tree/main/connector-basic) +- [x] [GitHub](https://github.com/apache/answer-plugins/tree/main/connector-github) +- [x] [Google](https://github.com/apache/answer-plugins/tree/main/connector-google) +- [x] [Dingtalk](https://github.com/apache/answer-plugins/tree/main/connector-dingtalk) ### Storage The Storage plugin helps us to upload files to third-party storage. For example: Aliyun OSS or AWS S3. -- [x] [Aliyun OSS](https://github.com/apache/incubator-answer-plugins/tree/main/storage-aliyunoss) -- [x] [Tencentyun COS](https://github.com/apache/incubator-answer-plugins/tree/main/storage-tencentyuncos) -- [x] [S3](https://github.com/apache/incubator-answer-plugins/tree/main/storage-s3) +- [x] [Aliyun OSS](https://github.com/apache/answer-plugins/tree/main/storage-aliyunoss) +- [x] [Tencentyun COS](https://github.com/apache/answer-plugins/tree/main/storage-tencentyuncos) +- [x] [S3](https://github.com/apache/answer-plugins/tree/main/storage-s3) ### Cache Using the Cache plugin allows you to store cached data in a different location. For example: Redis or Memcached. -- [x] [Redis](https://github.com/apache/incubator-answer-plugins/tree/main/cache-redis) +- [x] [Redis](https://github.com/apache/answer-plugins/tree/main/cache-redis) ### Search Support using search plugin to speed up the search of question answers. For example: Elasticsearch or Meilisearch. -- [x] [Elasticsearch](https://github.com/apache/incubator-answer-plugins/tree/main/search-elasticsearch) -- [x] [Meilisearch](https://github.com/apache/incubator-answer-plugins/tree/main/search-meilisearch) -- [x] [Algolia](https://github.com/apache/incubator-answer-plugins/tree/main/search-algolia) +- [x] [Elasticsearch](https://github.com/apache/answer-plugins/tree/main/search-elasticsearch) +- [x] [Meilisearch](https://github.com/apache/answer-plugins/tree/main/search-meilisearch) +- [x] [Algolia](https://github.com/apache/answer-plugins/tree/main/search-algolia) ### User Center Using the third-party user system to manage users. For example: WeCom -- [x] [WeCom](https://github.com/apache/incubator-answer-plugins/tree/main/user-center-wecom) +- [x] [WeCom](https://github.com/apache/answer-plugins/tree/main/user-center-wecom) ### Notification The Notification plugin helps us to send messages to third-party notification systems. For example: Slack. -- [x] [Slack](https://github.com/apache/incubator-answer-plugins/tree/main/notification-slack) -- [x] [Lark](https://github.com/apache/incubator-answer-plugins/tree/main/notification-lark) -- [x] [Ding talk](https://github.com/apache/incubator-answer-plugins/tree/main/notification-dingtalk) -- [x] [WeCom](https://github.com/apache/incubator-answer-plugins/tree/main/notification-wecom) +- [x] [Slack](https://github.com/apache/answer-plugins/tree/main/notification-slack) +- [x] [Lark](https://github.com/apache/answer-plugins/tree/main/notification-lark) +- [x] [Ding talk](https://github.com/apache/answer-plugins/tree/main/notification-dingtalk) +- [x] [WeCom](https://github.com/apache/answer-plugins/tree/main/notification-wecom) ### Route @@ -66,16 +66,16 @@ Support for custom routing. Support for extending the markdown editor's toolbar. -- [x] [chart](https://github.com/apache/incubator-answer-plugins/tree/main/editor-chart) -- [x] [formula](https://github.com/apache/incubator-answer-plugins/tree/main/editor-formula) -- [x] [embed](https://github.com/apache/incubator-answer-plugins/tree/main/editor-embed) +- [x] [chart](https://github.com/apache/answer-plugins/tree/main/editor-chart) +- [x] [formula](https://github.com/apache/answer-plugins/tree/main/editor-formula) +- [x] [embed](https://github.com/apache/answer-plugins/tree/main/editor-embed) ### Reviewer Support for customizing the reviewer. -- [x] [default](https://github.com/apache/incubator-answer-plugins/tree/main/reviewer-basic) -- [x] [akismet](https://github.com/apache/incubator-answer-plugins/tree/main/reviewer-akismet) +- [x] [default](https://github.com/apache/answer-plugins/tree/main/reviewer-basic) +- [x] [akismet](https://github.com/apache/answer-plugins/tree/main/reviewer-akismet) ### Filter (coming soon) diff --git a/cache-redis/README.md b/cache-redis/README.md index d069e09d..a101e86d 100644 --- a/cache-redis/README.md +++ b/cache-redis/README.md @@ -5,7 +5,7 @@ ### Build ```bash -./answer build --with github.com/apache/incubator-answer-plugins/cache-redis +./answer build --with github.com/apache/answer-plugins/cache-redis ``` ### Configuration diff --git a/cache-redis/go.mod b/cache-redis/go.mod index bb1646e3..7179ae4c 100644 --- a/cache-redis/go.mod +++ b/cache-redis/go.mod @@ -1,10 +1,10 @@ -module github.com/apache/incubator-answer-plugins/cache-redis +module github.com/apache/answer-plugins/cache-redis go 1.22.0 require ( - github.com/apache/incubator-answer v1.4.1 - github.com/apache/incubator-answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.1 + github.com/apache/answer-plugins/util v1.0.2 github.com/go-redis/redis/v8 v8.11.5 ) diff --git a/cache-redis/go.sum b/cache-redis/go.sum index e8e27f2f..fa139774 100644 --- a/cache-redis/go.sum +++ b/cache-redis/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/incubator-answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/incubator-answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/incubator-answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/incubator-answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= +github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= +github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= +github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/cache-redis/info.yaml b/cache-redis/info.yaml index 0ecf4c25..aacbf8bc 100644 --- a/cache-redis/info.yaml +++ b/cache-redis/info.yaml @@ -19,4 +19,4 @@ slug_name: redis_cache type: cache version: 1.2.9 author: answerdev -link: https://github.com/apache/incubator-answer-plugins/tree/main/cache-redis +link: https://github.com/apache/answer-plugins/tree/main/cache-redis diff --git a/cache-redis/redis.go b/cache-redis/redis.go index 4c915c13..29b3cf4d 100644 --- a/cache-redis/redis.go +++ b/cache-redis/redis.go @@ -25,13 +25,11 @@ import ( _ "embed" "encoding/json" "fmt" - "github.com/apache/incubator-answer-plugins/util" + "github.com/apache/answer-plugins/util" "time" - "github.com/apache/incubator-answer/plugin" - "github.com/go-redis/redis/v8" - - "github.com/apache/incubator-answer-plugins/cache-redis/i18n" + "github.com/apache/answer-plugins/cache-redis/i18n" + "github.com/apache/answer/plugin" ) var ( diff --git a/captcha-basic/basic.go b/captcha-basic/basic.go index 8a16cc38..0a76c347 100644 --- a/captcha-basic/basic.go +++ b/captcha-basic/basic.go @@ -21,11 +21,11 @@ package basic import ( "embed" - "github.com/apache/incubator-answer-plugins/util" + "github.com/apache/answer-plugins/util" "image/color" - "github.com/apache/incubator-answer-plugins/captcha-basic/i18n" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer-plugins/captcha-basic/i18n" + "github.com/apache/answer/plugin" "github.com/mojocn/base64Captcha" ) diff --git a/captcha-basic/go.mod b/captcha-basic/go.mod index 65555056..b9ab7a1e 100644 --- a/captcha-basic/go.mod +++ b/captcha-basic/go.mod @@ -1,10 +1,10 @@ -module github.com/apache/incubator-answer-plugins/captcha-basic +module github.com/apache/answer-plugins/captcha-basic go 1.22.0 require ( - github.com/apache/incubator-answer v1.4.1 - github.com/apache/incubator-answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.1 + github.com/apache/answer-plugins/util v1.0.2 github.com/mojocn/base64Captcha v1.3.6 ) diff --git a/captcha-basic/go.sum b/captcha-basic/go.sum index bda78c2c..bb4b977f 100644 --- a/captcha-basic/go.sum +++ b/captcha-basic/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/incubator-answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/incubator-answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/incubator-answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/incubator-answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= +github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= +github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= +github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/captcha-basic/info.yaml b/captcha-basic/info.yaml index 0fbb17a0..9e584b91 100644 --- a/captcha-basic/info.yaml +++ b/captcha-basic/info.yaml @@ -19,4 +19,4 @@ slug_name: basic_captcha type: captcha version: 1.0.4 author: answerdev -link: https://github.com/apache/incubator-answer-plugins/tree/main/captcha-basic \ No newline at end of file +link: https://github.com/apache/answer-plugins/tree/main/captcha-basic \ No newline at end of file diff --git a/captcha-google-v2/go.mod b/captcha-google-v2/go.mod index 592a1168..cee9da6e 100644 --- a/captcha-google-v2/go.mod +++ b/captcha-google-v2/go.mod @@ -1,10 +1,10 @@ -module github.com/apache/incubator-answer-plugins/captcha-google-v2 +module github.com/apache/answer-plugins/captcha-google-v2 go 1.22.0 require ( - github.com/apache/incubator-answer v1.4.1 - github.com/apache/incubator-answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.1 + github.com/apache/answer-plugins/util v1.0.2 github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f ) diff --git a/captcha-google-v2/go.sum b/captcha-google-v2/go.sum index 142206c8..64aa05d7 100644 --- a/captcha-google-v2/go.sum +++ b/captcha-google-v2/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/incubator-answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/incubator-answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/incubator-answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/incubator-answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= +github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= +github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= +github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/captcha-google-v2/info.yaml b/captcha-google-v2/info.yaml index ac18835f..46ff2463 100644 --- a/captcha-google-v2/info.yaml +++ b/captcha-google-v2/info.yaml @@ -19,4 +19,4 @@ slug_name: google_v2_captcha type: captcha version: 1.0.4 author: answerdev -link: https://github.com/apache/incubator-answer-plugins/tree/main/captcha-google-v2 \ No newline at end of file +link: https://github.com/apache/answer-plugins/tree/main/captcha-google-v2 \ No newline at end of file diff --git a/captcha-google-v2/recaptcha.go b/captcha-google-v2/recaptcha.go index b610a819..f1d15e67 100644 --- a/captcha-google-v2/recaptcha.go +++ b/captcha-google-v2/recaptcha.go @@ -21,13 +21,13 @@ package recaptcha import ( "embed" - "github.com/apache/incubator-answer-plugins/util" + "github.com/apache/answer-plugins/util" "io" "net/http" "time" - "github.com/apache/incubator-answer-plugins/captcha-google-v2/i18n" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer-plugins/captcha-google-v2/i18n" + "github.com/apache/answer/plugin" "encoding/json" diff --git a/cdn-aliyun/README.md b/cdn-aliyun/README.md index 13ea1171..37063866 100644 --- a/cdn-aliyun/README.md +++ b/cdn-aliyun/README.md @@ -5,7 +5,7 @@ ### Build ```bash -./answer build --with github.com/apache/incubator-answer-plugins/cdn-aliyun +./answer build --with github.com/apache/answer-plugins/cdn-aliyun ``` ### Configuration diff --git a/cdn-aliyun/aliyun.go b/cdn-aliyun/aliyun.go index b3a22f19..cdab85cd 100644 --- a/cdn-aliyun/aliyun.go +++ b/cdn-aliyun/aliyun.go @@ -24,10 +24,10 @@ import ( "encoding/json" "fmt" "github.com/aliyun/aliyun-oss-go-sdk/oss" - "github.com/apache/incubator-answer-plugins/cdn-aliyun/i18n" - "github.com/apache/incubator-answer-plugins/util" - "github.com/apache/incubator-answer/plugin" - "github.com/apache/incubator-answer/ui" + "github.com/apache/answer-plugins/cdn-aliyun/i18n" + "github.com/apache/answer-plugins/util" + "github.com/apache/answer/plugin" + "github.com/apache/answer/ui" "github.com/segmentfault/pacman/log" "io" "io/fs" diff --git a/cdn-aliyun/go.mod b/cdn-aliyun/go.mod index 0e77fe9f..884a7029 100644 --- a/cdn-aliyun/go.mod +++ b/cdn-aliyun/go.mod @@ -1,11 +1,11 @@ -module github.com/apache/incubator-answer-plugins/cdn-aliyun +module github.com/apache/answer-plugins/cdn-aliyun go 1.22.0 require ( github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible - github.com/apache/incubator-answer v1.4.1 - github.com/apache/incubator-answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.1 + github.com/apache/answer-plugins/util v1.0.2 github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f ) diff --git a/cdn-aliyun/go.sum b/cdn-aliyun/go.sum index e5b08f64..01a27fb3 100644 --- a/cdn-aliyun/go.sum +++ b/cdn-aliyun/go.sum @@ -4,10 +4,10 @@ github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2Q github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible h1:8psS8a+wKfiLt1iVDX79F7Y6wUM49Lcha2FMXt4UM8g= github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8= -github.com/apache/incubator-answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/incubator-answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/incubator-answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/incubator-answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= +github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= +github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= +github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/cdn-aliyun/info.yaml b/cdn-aliyun/info.yaml index 1326dda2..a62b4ca5 100644 --- a/cdn-aliyun/info.yaml +++ b/cdn-aliyun/info.yaml @@ -19,4 +19,4 @@ slug_name: aliyun_cdn type: cdn version: 1.0.2 author: answerdev -link: https://github.com/apache/incubator-answer-plugins/tree/main/cdn-aliyun +link: https://github.com/apache/answer-plugins/tree/main/cdn-aliyun diff --git a/cdn-s3/go.mod b/cdn-s3/go.mod index 229fa3f3..9b2f284e 100644 --- a/cdn-s3/go.mod +++ b/cdn-s3/go.mod @@ -1,10 +1,10 @@ -module github.com/apache/incubator-answer-plugins/cdn-s3 +module github.com/apache/answer-plugins/cdn-s3 go 1.22.0 require ( - github.com/apache/incubator-answer v1.4.1 - github.com/apache/incubator-answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.1 + github.com/apache/answer-plugins/util v1.0.2 github.com/aws/aws-sdk-go v1.44.314 github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f ) diff --git a/cdn-s3/go.sum b/cdn-s3/go.sum index 6a910aae..cdc538b8 100644 --- a/cdn-s3/go.sum +++ b/cdn-s3/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/incubator-answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/incubator-answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/incubator-answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/incubator-answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= +github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= +github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= +github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= github.com/aws/aws-sdk-go v1.44.314 h1:d/5Jyk/Fb+PBd/4nzQg0JuC2W4A0knrDIzBgK/ggAow= github.com/aws/aws-sdk-go v1.44.314/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= diff --git a/cdn-s3/info.yaml b/cdn-s3/info.yaml index 05700522..1542365c 100644 --- a/cdn-s3/info.yaml +++ b/cdn-s3/info.yaml @@ -19,4 +19,4 @@ slug_name: s3_cdn type: cdn version: 1.0.2 author: answerdev -link: https://github.com/apache/incubator-answer-plugins/tree/main/cdn-s3 +link: https://github.com/apache/answer-plugins/tree/main/cdn-s3 diff --git a/cdn-s3/s3.go b/cdn-s3/s3.go index 2d841955..9810beb4 100644 --- a/cdn-s3/s3.go +++ b/cdn-s3/s3.go @@ -25,9 +25,9 @@ import ( "encoding/hex" "encoding/json" "fmt" - "github.com/apache/incubator-answer-plugins/cdn-s3/i18n" - "github.com/apache/incubator-answer-plugins/util" - "github.com/apache/incubator-answer/ui" + "github.com/apache/answer-plugins/cdn-s3/i18n" + "github.com/apache/answer-plugins/util" + "github.com/apache/answer/ui" "github.com/segmentfault/pacman/log" "io" "io/fs" @@ -38,7 +38,7 @@ import ( "strings" "time" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer/plugin" ) var ( diff --git a/connector-apache/apache.go b/connector-apache/apache.go index 718ea04e..bc1ae239 100644 --- a/connector-apache/apache.go +++ b/connector-apache/apache.go @@ -23,13 +23,13 @@ import ( "embed" "encoding/json" "fmt" - "github.com/apache/incubator-answer-plugins/util" + "github.com/apache/answer-plugins/util" "io" "net/http" - "github.com/apache/incubator-answer-plugins/connector-apache/i18n" - "github.com/apache/incubator-answer/pkg/token" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer-plugins/connector-apache/i18n" + "github.com/apache/answer/pkg/token" + "github.com/apache/answer/plugin" "github.com/segmentfault/pacman/log" ) diff --git a/connector-apache/go.mod b/connector-apache/go.mod index 937b28e5..5b25a27a 100644 --- a/connector-apache/go.mod +++ b/connector-apache/go.mod @@ -1,10 +1,10 @@ -module github.com/apache/incubator-answer-plugins/connector-apache +module github.com/apache/answer-plugins/connector-apache go 1.22.0 require ( - github.com/apache/incubator-answer v1.4.1 - github.com/apache/incubator-answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.1 + github.com/apache/answer-plugins/util v1.0.2 github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f ) diff --git a/connector-apache/go.sum b/connector-apache/go.sum index 4ff14304..1c0762d0 100644 --- a/connector-apache/go.sum +++ b/connector-apache/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/incubator-answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/incubator-answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/incubator-answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/incubator-answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= +github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= +github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= +github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/connector-apache/info.yaml b/connector-apache/info.yaml index d6c8eb0d..7d376a87 100644 --- a/connector-apache/info.yaml +++ b/connector-apache/info.yaml @@ -19,4 +19,4 @@ slug_name: apache_connector type: connector version: 1.0.3 author: answerdev -link: https://github.com/apache/incubator-answer-plugins/tree/main/connector-apache +link: https://github.com/apache/answer-plugins/tree/main/connector-apache diff --git a/connector-basic/README.md b/connector-basic/README.md index 7b0f7019..8b0d63cc 100644 --- a/connector-basic/README.md +++ b/connector-basic/README.md @@ -4,7 +4,7 @@ ## How to use ```bash -./answer build --with github.com/apache/incubator-answer-plugins/connector-basic +./answer build --with github.com/apache/answer-plugins/connector-basic ``` ## How to config diff --git a/connector-basic/basic.go b/connector-basic/basic.go index 4ea5d720..3fd6a3b3 100644 --- a/connector-basic/basic.go +++ b/connector-basic/basic.go @@ -24,16 +24,16 @@ import ( "embed" "encoding/json" "fmt" - "github.com/apache/incubator-answer-plugins/util" + "github.com/apache/answer-plugins/util" "io" "regexp" "strings" "time" "unicode/utf8" - "github.com/apache/incubator-answer-plugins/connector-basic/i18n" - "github.com/apache/incubator-answer/pkg/checker" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer-plugins/connector-basic/i18n" + "github.com/apache/answer/pkg/checker" + "github.com/apache/answer/plugin" "github.com/segmentfault/pacman/log" "github.com/tidwall/gjson" "golang.org/x/oauth2" diff --git a/connector-basic/go.mod b/connector-basic/go.mod index 039d3b59..77e04be3 100644 --- a/connector-basic/go.mod +++ b/connector-basic/go.mod @@ -1,10 +1,10 @@ -module github.com/apache/incubator-answer-plugins/connector-basic +module github.com/apache/answer-plugins/connector-basic go 1.22.0 require ( - github.com/apache/incubator-answer v1.4.1 - github.com/apache/incubator-answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.1 + github.com/apache/answer-plugins/util v1.0.2 github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f github.com/tidwall/gjson v1.17.3 golang.org/x/oauth2 v0.4.0 diff --git a/connector-basic/go.sum b/connector-basic/go.sum index 4e1826d1..5fbc0989 100644 --- a/connector-basic/go.sum +++ b/connector-basic/go.sum @@ -22,10 +22,10 @@ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuy github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/apache/incubator-answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/incubator-answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/incubator-answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/incubator-answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= +github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= +github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= +github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= diff --git a/connector-basic/info.yaml b/connector-basic/info.yaml index efb9b02d..53475bd6 100644 --- a/connector-basic/info.yaml +++ b/connector-basic/info.yaml @@ -19,4 +19,4 @@ slug_name: basic_connector type: connector version: 1.2.8 author: answerdev -link: https://github.com/apache/incubator-answer-plugins/tree/main/connector-basic +link: https://github.com/apache/answer-plugins/tree/main/connector-basic diff --git a/connector-dingtalk/README.md b/connector-dingtalk/README.md index 4ea92628..feba5478 100644 --- a/connector-dingtalk/README.md +++ b/connector-dingtalk/README.md @@ -5,7 +5,7 @@ ### Build ```bash -./answer build --with github.com/apache/incubator-answer-plugins/connector-dingtalk +./answer build --with github.com/apache/answer-plugins/connector-dingtalk ``` ### Configuration @@ -30,7 +30,7 @@ RUN apk --no-cache add \ RUN go env -w GOPROXY=https://goproxy.cn,direct RUN answer build \ - --with github.com/apache/incubator-answer-plugins/connector-dingtalk \ + --with github.com/apache/answer-plugins/connector-dingtalk \ --output /usr/bin/new_answer FROM alpine diff --git a/connector-dingtalk/dingtalk.go b/connector-dingtalk/dingtalk.go index f19e70a1..9deb65f2 100644 --- a/connector-dingtalk/dingtalk.go +++ b/connector-dingtalk/dingtalk.go @@ -24,11 +24,11 @@ import ( "embed" "encoding/json" "fmt" - "github.com/apache/incubator-answer-plugins/util" + "github.com/apache/answer-plugins/util" "net/http" - "github.com/apache/incubator-answer-plugins/connector-dingtalk/i18n" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer-plugins/connector-dingtalk/i18n" + "github.com/apache/answer/plugin" "github.com/segmentfault/pacman/log" ) diff --git a/connector-dingtalk/go.mod b/connector-dingtalk/go.mod index c000477e..5330e698 100644 --- a/connector-dingtalk/go.mod +++ b/connector-dingtalk/go.mod @@ -1,10 +1,10 @@ -module github.com/apache/incubator-answer-plugins/connector-dingtalk +module github.com/apache/answer-plugins/connector-dingtalk go 1.22.0 require ( - github.com/apache/incubator-answer v1.4.1 - github.com/apache/incubator-answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.1 + github.com/apache/answer-plugins/util v1.0.2 github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f ) diff --git a/connector-dingtalk/go.sum b/connector-dingtalk/go.sum index b08ce5b9..144856eb 100644 --- a/connector-dingtalk/go.sum +++ b/connector-dingtalk/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/incubator-answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/incubator-answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/incubator-answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/incubator-answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= +github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= +github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= +github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/connector-dingtalk/info.yaml b/connector-dingtalk/info.yaml index 5d9b2d89..030079ae 100644 --- a/connector-dingtalk/info.yaml +++ b/connector-dingtalk/info.yaml @@ -19,4 +19,4 @@ slug_name: dingtalk_connector type: connector version: 1.0.3 author: xbmlz -link: https://github.com/apache/incubator-answer-plugins/tree/main/connector-dingtalk +link: https://github.com/apache/answer-plugins/tree/main/connector-dingtalk diff --git a/connector-github/README.md b/connector-github/README.md index 9cde6f65..0193c951 100644 --- a/connector-github/README.md +++ b/connector-github/README.md @@ -5,7 +5,7 @@ ### Build ```bash -./answer build --with github.com/apache/incubator-answer-plugins/connector-github +./answer build --with github.com/apache/answer-plugins/connector-github ``` ### Configuration diff --git a/connector-github/github.go b/connector-github/github.go index 3e5e6341..4d2bdd2f 100644 --- a/connector-github/github.go +++ b/connector-github/github.go @@ -24,11 +24,11 @@ import ( "embed" "encoding/json" "fmt" - "github.com/apache/incubator-answer-plugins/util" + "github.com/apache/answer-plugins/util" "time" - "github.com/apache/incubator-answer-plugins/connector-github/i18n" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer-plugins/connector-github/i18n" + "github.com/apache/answer/plugin" "github.com/google/go-github/v50/github" "github.com/segmentfault/pacman/log" "golang.org/x/oauth2" diff --git a/connector-github/go.mod b/connector-github/go.mod index 69c30059..6a75ae19 100644 --- a/connector-github/go.mod +++ b/connector-github/go.mod @@ -1,10 +1,10 @@ -module github.com/apache/incubator-answer-plugins/connector-github +module github.com/apache/answer-plugins/connector-github go 1.22.0 require ( - github.com/apache/incubator-answer v1.4.1 - github.com/apache/incubator-answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.1 + github.com/apache/answer-plugins/util v1.0.2 github.com/google/go-github/v50 v50.1.0 github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f golang.org/x/oauth2 v0.4.0 diff --git a/connector-github/go.sum b/connector-github/go.sum index 84ebcc08..f88527e4 100644 --- a/connector-github/go.sum +++ b/connector-github/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/incubator-answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/incubator-answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/incubator-answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/incubator-answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= +github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= +github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= +github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/connector-github/info.yaml b/connector-github/info.yaml index 67f1c48f..8c474a0c 100644 --- a/connector-github/info.yaml +++ b/connector-github/info.yaml @@ -19,4 +19,4 @@ slug_name: github_connector type: connector version: 1.2.9 author: answerdev -link: https://github.com/apache/incubator-answer-plugins/tree/main/connector-github +link: https://github.com/apache/answer-plugins/tree/main/connector-github diff --git a/connector-google/README.md b/connector-google/README.md index 025424be..81c7827a 100644 --- a/connector-google/README.md +++ b/connector-google/README.md @@ -5,7 +5,7 @@ ### Build ```bash -./answer build --with github.com/apache/incubator-answer-plugins/connector-google +./answer build --with github.com/apache/answer-plugins/connector-google ``` ### Configuration diff --git a/connector-google/go.mod b/connector-google/go.mod index 71098441..fed7f805 100644 --- a/connector-google/go.mod +++ b/connector-google/go.mod @@ -1,10 +1,10 @@ -module github.com/apache/incubator-answer-plugins/connector-google +module github.com/apache/answer-plugins/connector-google go 1.22.0 require ( - github.com/apache/incubator-answer v1.4.1 - github.com/apache/incubator-answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.1 + github.com/apache/answer-plugins/util v1.0.2 golang.org/x/oauth2 v0.4.0 ) diff --git a/connector-google/go.sum b/connector-google/go.sum index 740263f2..0b509d54 100644 --- a/connector-google/go.sum +++ b/connector-google/go.sum @@ -4,10 +4,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/incubator-answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/incubator-answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/incubator-answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/incubator-answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= +github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= +github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= +github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/connector-google/google.go b/connector-google/google.go index fdf623fe..9f5c3621 100644 --- a/connector-google/google.go +++ b/connector-google/google.go @@ -24,12 +24,12 @@ import ( "embed" "encoding/json" "fmt" - "github.com/apache/incubator-answer-plugins/util" + "github.com/apache/answer-plugins/util" "io" "time" - "github.com/apache/incubator-answer-plugins/connector-google/i18n" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer-plugins/connector-google/i18n" + "github.com/apache/answer/plugin" "golang.org/x/oauth2" oauth2Google "golang.org/x/oauth2/google" ) diff --git a/connector-google/info.yaml b/connector-google/info.yaml index e9bbbb9b..9dfc094b 100644 --- a/connector-google/info.yaml +++ b/connector-google/info.yaml @@ -19,4 +19,4 @@ slug_name: google_connector type: connector version: 1.2.9 author: answerdev -link: https://github.com/apache/incubator-answer-plugins/tree/main/connector-google +link: https://github.com/apache/answer-plugins/tree/main/connector-google diff --git a/connector-wallet/README.md b/connector-wallet/README.md index 16991996..29079b5b 100644 --- a/connector-wallet/README.md +++ b/connector-wallet/README.md @@ -5,7 +5,7 @@ ### Build ```bash -./answer build --with github.com/apache/incubator-answer-plugins/connector-wallet +./answer build --with github.com/apache/answer-plugins/connector-wallet ``` ### Use Case diff --git a/connector-wallet/go.mod b/connector-wallet/go.mod index 8aa8d20e..1f47d29b 100644 --- a/connector-wallet/go.mod +++ b/connector-wallet/go.mod @@ -1,10 +1,10 @@ -module github.com/apache/incubator-answer-plugins/connector-wallet +module github.com/apache/answer-plugins/connector-wallet go 1.22.0 require ( - github.com/apache/incubator-answer v1.4.1 - github.com/apache/incubator-answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.1 + github.com/apache/answer-plugins/util v1.0.2 github.com/i-lucifer/crypto v0.0.2 golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 ) diff --git a/connector-wallet/go.sum b/connector-wallet/go.sum index 486421bf..1dbdb2e8 100644 --- a/connector-wallet/go.sum +++ b/connector-wallet/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/incubator-answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/incubator-answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/incubator-answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/incubator-answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= +github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= +github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= +github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/connector-wallet/info.yaml b/connector-wallet/info.yaml index c6dc231f..fedf206f 100644 --- a/connector-wallet/info.yaml +++ b/connector-wallet/info.yaml @@ -19,5 +19,5 @@ slug_name: wallet_connector type: route version: 1.0.0 author: i-Lucifer,ourai -link: https://github.com/apache/incubator-answer-plugins/tree/main/connector-wallet +link: https://github.com/apache/answer-plugins/tree/main/connector-wallet route: /connector-wallet-auth diff --git a/connector-wallet/wallet.go b/connector-wallet/wallet.go index b8ba668e..d6e1b83c 100644 --- a/connector-wallet/wallet.go +++ b/connector-wallet/wallet.go @@ -25,9 +25,9 @@ import ( "strconv" "time" - "github.com/apache/incubator-answer-plugins/connector-wallet/i18n" - "github.com/apache/incubator-answer-plugins/util" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer-plugins/connector-wallet/i18n" + "github.com/apache/answer-plugins/util" + "github.com/apache/answer/plugin" "github.com/i-lucifer/crypto" "golang.org/x/exp/rand" ) diff --git a/editor-chart/chart.go b/editor-chart/chart.go index 3875664f..9c034e9b 100644 --- a/editor-chart/chart.go +++ b/editor-chart/chart.go @@ -21,9 +21,9 @@ package chart import ( "embed" - "github.com/apache/incubator-answer-plugins/editor-chart/i18n" - "github.com/apache/incubator-answer-plugins/util" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer-plugins/editor-chart/i18n" + "github.com/apache/answer-plugins/util" + "github.com/apache/answer/plugin" ) //go:embed info.yaml diff --git a/editor-chart/go.mod b/editor-chart/go.mod index c7dd531b..93b387ac 100644 --- a/editor-chart/go.mod +++ b/editor-chart/go.mod @@ -1,10 +1,10 @@ -module github.com/apache/incubator-answer-plugins/editor-chart +module github.com/apache/answer-plugins/editor-chart go 1.22.0 require ( - github.com/apache/incubator-answer v1.4.1 - github.com/apache/incubator-answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.1 + github.com/apache/answer-plugins/util v1.0.2 ) require ( diff --git a/editor-chart/go.sum b/editor-chart/go.sum index b08ce5b9..144856eb 100644 --- a/editor-chart/go.sum +++ b/editor-chart/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/incubator-answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/incubator-answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/incubator-answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/incubator-answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= +github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= +github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= +github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/editor-chart/info.yaml b/editor-chart/info.yaml index c9d7c324..9a401d40 100644 --- a/editor-chart/info.yaml +++ b/editor-chart/info.yaml @@ -19,4 +19,4 @@ slug_name: chart_editor type: editor version: 1.2.10 author: answerdev -link: https://github.com/apache/incubator-answer-plugins/tree/main/editor-chart +link: https://github.com/apache/answer-plugins/tree/main/editor-chart diff --git a/editor-formula/formula.go b/editor-formula/formula.go index b95b5321..17a3f919 100644 --- a/editor-formula/formula.go +++ b/editor-formula/formula.go @@ -21,9 +21,9 @@ package formula import ( "embed" - "github.com/apache/incubator-answer-plugins/editor-formula/i18n" - "github.com/apache/incubator-answer-plugins/util" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer-plugins/editor-formula/i18n" + "github.com/apache/answer-plugins/util" + "github.com/apache/answer/plugin" ) //go:embed info.yaml diff --git a/editor-formula/go.mod b/editor-formula/go.mod index 0df115e6..0ce1aef3 100644 --- a/editor-formula/go.mod +++ b/editor-formula/go.mod @@ -1,10 +1,10 @@ -module github.com/apache/incubator-answer-plugins/editor-formula +module github.com/apache/answer-plugins/editor-formula go 1.22.0 require ( - github.com/apache/incubator-answer v1.4.1 - github.com/apache/incubator-answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.1 + github.com/apache/answer-plugins/util v1.0.2 ) require ( diff --git a/editor-formula/go.sum b/editor-formula/go.sum index b08ce5b9..144856eb 100644 --- a/editor-formula/go.sum +++ b/editor-formula/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/incubator-answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/incubator-answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/incubator-answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/incubator-answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= +github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= +github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= +github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/editor-formula/info.yaml b/editor-formula/info.yaml index 8e1b1049..db162194 100644 --- a/editor-formula/info.yaml +++ b/editor-formula/info.yaml @@ -19,4 +19,4 @@ slug_name: formula_editor type: editor version: 1.2.13 author: answerdev -link: https://github.com/apache/incubator-answer-plugins/tree/main/editor-formula +link: https://github.com/apache/answer-plugins/tree/main/editor-formula diff --git a/embed-basic/basic.go b/embed-basic/basic.go index 3d81378a..44d9d0de 100644 --- a/embed-basic/basic.go +++ b/embed-basic/basic.go @@ -22,11 +22,11 @@ package embed_basic import ( "embed" "encoding/json" - "github.com/apache/incubator-answer-plugins/util" + "github.com/apache/answer-plugins/util" "github.com/gin-gonic/gin" - "github.com/apache/incubator-answer-plugins/embed-basic/i18n" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer-plugins/embed-basic/i18n" + "github.com/apache/answer/plugin" ) //go:embed info.yaml diff --git a/embed-basic/go.mod b/embed-basic/go.mod index c615a665..8ca2ae92 100644 --- a/embed-basic/go.mod +++ b/embed-basic/go.mod @@ -1,10 +1,10 @@ -module github.com/apache/incubator-answer-plugins/embed-basic +module github.com/apache/answer-plugins/embed-basic go 1.22.0 require ( - github.com/apache/incubator-answer v1.4.1 - github.com/apache/incubator-answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.1 + github.com/apache/answer-plugins/util v1.0.2 github.com/gin-gonic/gin v1.10.0 ) diff --git a/embed-basic/go.sum b/embed-basic/go.sum index b08ce5b9..144856eb 100644 --- a/embed-basic/go.sum +++ b/embed-basic/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/incubator-answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/incubator-answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/incubator-answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/incubator-answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= +github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= +github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= +github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/embed-basic/info.yaml b/embed-basic/info.yaml index 0d39f734..78fefb16 100644 --- a/embed-basic/info.yaml +++ b/embed-basic/info.yaml @@ -19,4 +19,4 @@ slug_name: basic_embed type: editor version: 1.1.3 author: answerdev -link: https://github.com/apache/incubator-answer-plugins/tree/main/embed-basic +link: https://github.com/apache/answer-plugins/tree/main/embed-basic diff --git a/notification-dingtalk/README.md b/notification-dingtalk/README.md index 01841610..b805b117 100644 --- a/notification-dingtalk/README.md +++ b/notification-dingtalk/README.md @@ -5,7 +5,7 @@ To use the notification-dingtalk plugin with your application, install it using the following command: ```bash -./answer build --with github.com/apache/incubator-answer-plugins/notification-dingtalk +./answer build --with github.com/apache/answer-plugins/notification-dingtalk ``` diff --git a/notification-dingtalk/config.go b/notification-dingtalk/config.go index 0bad4007..a9395129 100644 --- a/notification-dingtalk/config.go +++ b/notification-dingtalk/config.go @@ -22,8 +22,8 @@ package dingtalk import ( "encoding/json" - "github.com/apache/incubator-answer-plugins/notification-dingtalk/i18n" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer-plugins/notification-dingtalk/i18n" + "github.com/apache/answer/plugin" ) type NotificationConfig struct { diff --git a/notification-dingtalk/dingtalk_notification.go b/notification-dingtalk/dingtalk_notification.go index 360a941d..33646544 100644 --- a/notification-dingtalk/dingtalk_notification.go +++ b/notification-dingtalk/dingtalk_notification.go @@ -21,12 +21,11 @@ package dingtalk import ( "embed" - "github.com/apache/incubator-answer-plugins/util" - "github.com/go-resty/resty/v2" + "github.com/apache/answer-plugins/util" "strings" - dingtalkI18n "github.com/apache/incubator-answer-plugins/notification-dingtalk/i18n" - "github.com/apache/incubator-answer/plugin" + dingtalkI18n "github.com/apache/answer-plugins/notification-dingtalk/i18n" + "github.com/apache/answer/plugin" "github.com/segmentfault/pacman/i18n" "github.com/segmentfault/pacman/log" ) diff --git a/notification-dingtalk/go.mod b/notification-dingtalk/go.mod index 31cde7d8..56fe7b7e 100644 --- a/notification-dingtalk/go.mod +++ b/notification-dingtalk/go.mod @@ -1,10 +1,10 @@ -module github.com/apache/incubator-answer-plugins/notification-dingtalk +module github.com/apache/answer-plugins/notification-dingtalk go 1.22.0 require ( - github.com/apache/incubator-answer v1.4.1 - github.com/apache/incubator-answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.1 + github.com/apache/answer-plugins/util v1.0.2 github.com/go-resty/resty/v2 v2.15.3 github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f ) diff --git a/notification-dingtalk/go.sum b/notification-dingtalk/go.sum index b7623973..39477f97 100644 --- a/notification-dingtalk/go.sum +++ b/notification-dingtalk/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/incubator-answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/incubator-answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/incubator-answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/incubator-answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= +github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= +github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= +github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/notification-dingtalk/info.yaml b/notification-dingtalk/info.yaml index c972d985..6bba42b7 100644 --- a/notification-dingtalk/info.yaml +++ b/notification-dingtalk/info.yaml @@ -19,4 +19,4 @@ slug_name: dingtalk_notification type: notification version: 1.0.1 author: Luffy -link: https://github.com/apache/incubator-answer-plugins/tree/main/notification-dingtalk +link: https://github.com/apache/answer-plugins/tree/main/notification-dingtalk diff --git a/notification-dingtalk/user_config.go b/notification-dingtalk/user_config.go index 2dbdba6e..5cfdad4b 100644 --- a/notification-dingtalk/user_config.go +++ b/notification-dingtalk/user_config.go @@ -24,8 +24,8 @@ import ( "fmt" "sync" - "github.com/apache/incubator-answer-plugins/notification-dingtalk/i18n" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer-plugins/notification-dingtalk/i18n" + "github.com/apache/answer/plugin" "github.com/segmentfault/pacman/log" ) diff --git a/notification-lark/README.md b/notification-lark/README.md index 42dedcf8..00bc6629 100644 --- a/notification-lark/README.md +++ b/notification-lark/README.md @@ -7,7 +7,7 @@ To use the NotificationLark plugin with your application, install it using the following command: ```bash -./answer build --with github.com/apache/incubator-answer-plugins/notification-lark +./answer build --with github.com/apache/answer-plugins/notification-lark ``` ## How to config diff --git a/notification-lark/README_CN.md b/notification-lark/README_CN.md index 69528455..583a1477 100644 --- a/notification-lark/README_CN.md +++ b/notification-lark/README_CN.md @@ -7,7 +7,7 @@ 要在应用程序中使用飞书通知插件，请使用以下命令进行安装： ```bash -./answer build --with github.com/apache/incubator-answer-plugins/notification-lark +./answer build --with github.com/apache/answer-plugins/notification-lark ``` ## 如何配置 diff --git a/notification-lark/config.go b/notification-lark/config.go index b1646d0a..f3b6004c 100644 --- a/notification-lark/config.go +++ b/notification-lark/config.go @@ -23,8 +23,8 @@ import ( "context" "encoding/json" - "github.com/apache/incubator-answer-plugins/notification-lark/i18n" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer-plugins/notification-lark/i18n" + "github.com/apache/answer/plugin" lark "github.com/larksuite/oapi-sdk-go/v3" larkCore "github.com/larksuite/oapi-sdk-go/v3/core" larkWebSocket "github.com/larksuite/oapi-sdk-go/v3/ws" diff --git a/notification-lark/go.mod b/notification-lark/go.mod index 71a8e07b..0d16a008 100644 --- a/notification-lark/go.mod +++ b/notification-lark/go.mod @@ -1,10 +1,10 @@ -module github.com/apache/incubator-answer-plugins/notification-lark +module github.com/apache/answer-plugins/notification-lark go 1.22.0 require ( - github.com/apache/incubator-answer v1.4.1 - github.com/apache/incubator-answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.1 + github.com/apache/answer-plugins/util v1.0.2 github.com/larksuite/oapi-sdk-go/v3 v3.3.1 github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f ) diff --git a/notification-lark/go.sum b/notification-lark/go.sum index 2343bd68..473f7c07 100644 --- a/notification-lark/go.sum +++ b/notification-lark/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/incubator-answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/incubator-answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/incubator-answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/incubator-answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= +github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= +github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= +github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/notification-lark/info.yaml b/notification-lark/info.yaml index 1796a458..98415c6e 100644 --- a/notification-lark/info.yaml +++ b/notification-lark/info.yaml @@ -19,4 +19,4 @@ slug_name: lark_notification type: notification version: 1.0.2 author: sonui -link: https://apache.com/apache/incubator-answer-plugins/tree/main/notification-lark +link: https://github.com/apache/answer-plugins/tree/main/notification-lark diff --git a/notification-lark/lark_card_test.go b/notification-lark/lark_card_test.go index 0c8dd05c..d1d28805 100644 --- a/notification-lark/lark_card_test.go +++ b/notification-lark/lark_card_test.go @@ -25,7 +25,7 @@ import ( "os" "testing" - answer "github.com/apache/incubator-answer-plugins/notification-lark" + answer "github.com/apache/answer-plugins/notification-lark" lark "github.com/larksuite/oapi-sdk-go/v3" larkIM "github.com/larksuite/oapi-sdk-go/v3/service/im/v1" ) diff --git a/notification-lark/notification.go b/notification-lark/notification.go index 9ae5b32a..c9954cb7 100644 --- a/notification-lark/notification.go +++ b/notification-lark/notification.go @@ -26,9 +26,9 @@ import ( "fmt" "strings" - lark_i18n "github.com/apache/incubator-answer-plugins/notification-lark/i18n" - "github.com/apache/incubator-answer-plugins/util" - "github.com/apache/incubator-answer/plugin" + lark_i18n "github.com/apache/answer-plugins/notification-lark/i18n" + "github.com/apache/answer-plugins/util" + "github.com/apache/answer/plugin" "github.com/segmentfault/pacman/i18n" "github.com/segmentfault/pacman/log" diff --git a/notification-lark/user_config.go b/notification-lark/user_config.go index 62d4ca05..2a624686 100644 --- a/notification-lark/user_config.go +++ b/notification-lark/user_config.go @@ -24,8 +24,8 @@ import ( "fmt" "sync" - "github.com/apache/incubator-answer-plugins/notification-lark/i18n" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer-plugins/notification-lark/i18n" + "github.com/apache/answer/plugin" "github.com/segmentfault/pacman/log" ) diff --git a/notification-lark/utils_test.go b/notification-lark/utils_test.go index c0ac6184..537c2de8 100644 --- a/notification-lark/utils_test.go +++ b/notification-lark/utils_test.go @@ -22,7 +22,7 @@ package lark_test import ( "testing" - answer "github.com/apache/incubator-answer-plugins/notification-lark" + answer "github.com/apache/answer-plugins/notification-lark" ) func TestGenRandomStr(t *testing.T) { diff --git a/notification-slack/config.go b/notification-slack/config.go index de3a9cd1..5677c74c 100644 --- a/notification-slack/config.go +++ b/notification-slack/config.go @@ -22,8 +22,8 @@ package slack_notification import ( "encoding/json" - "github.com/apache/incubator-answer-plugins/notification-slack/i18n" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer-plugins/notification-slack/i18n" + "github.com/apache/answer/plugin" ) type NotificationConfig struct { diff --git a/notification-slack/go.mod b/notification-slack/go.mod index c2a09f1a..6f2e2e71 100644 --- a/notification-slack/go.mod +++ b/notification-slack/go.mod @@ -1,10 +1,10 @@ -module github.com/apache/incubator-answer-plugins/notification-slack +module github.com/apache/answer-plugins/notification-slack go 1.22.0 require ( - github.com/apache/incubator-answer v1.4.1 - github.com/apache/incubator-answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.1 + github.com/apache/answer-plugins/util v1.0.2 github.com/go-resty/resty/v2 v2.15.0 github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f ) diff --git a/notification-slack/go.sum b/notification-slack/go.sum index 4ec73d21..89373923 100644 --- a/notification-slack/go.sum +++ b/notification-slack/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/incubator-answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/incubator-answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/incubator-answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/incubator-answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= +github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= +github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= +github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/notification-slack/info.yaml b/notification-slack/info.yaml index 0ebac1c1..96aa9d3f 100644 --- a/notification-slack/info.yaml +++ b/notification-slack/info.yaml @@ -19,4 +19,4 @@ slug_name: slack_notification type: notification version: 1.0.3 author: answerdev -link: https://github.com/apache/incubator-answer-plugins/tree/main/notification-slack +link: https://github.com/apache/answer-plugins/tree/main/notification-slack diff --git a/notification-slack/slack_notification.go b/notification-slack/slack_notification.go index 0cd28e47..0f5c74f9 100644 --- a/notification-slack/slack_notification.go +++ b/notification-slack/slack_notification.go @@ -23,11 +23,9 @@ import ( "embed" "strings" - "github.com/apache/incubator-answer-plugins/util" - "github.com/go-resty/resty/v2" - - slackI18n "github.com/apache/incubator-answer-plugins/notification-slack/i18n" - "github.com/apache/incubator-answer/plugin" + slackI18n "github.com/apache/answer-plugins/notification-slack/i18n" + "github.com/apache/answer-plugins/util" + "github.com/apache/answer/plugin" "github.com/segmentfault/pacman/i18n" "github.com/segmentfault/pacman/log" ) diff --git a/notification-slack/user_config.go b/notification-slack/user_config.go index f657b148..7ea077ef 100644 --- a/notification-slack/user_config.go +++ b/notification-slack/user_config.go @@ -24,8 +24,8 @@ import ( "fmt" "sync" - "github.com/apache/incubator-answer-plugins/notification-slack/i18n" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer-plugins/notification-slack/i18n" + "github.com/apache/answer/plugin" "github.com/segmentfault/pacman/log" ) diff --git a/notification-wecom/README.md b/notification-wecom/README.md index 53b3b344..d92dfa88 100644 --- a/notification-wecom/README.md +++ b/notification-wecom/README.md @@ -7,7 +7,7 @@ To use the notification-wecom plugin with your application, install it using the following command: ```bash -./answer build --with github.com/apache/incubator-answer-plugins/notification-wecom +./answer build --with github.com/apache/answer-plugins/notification-wecom ``` diff --git a/notification-wecom/README_CN.md b/notification-wecom/README_CN.md index 926ba357..25effe10 100644 --- a/notification-wecom/README_CN.md +++ b/notification-wecom/README_CN.md @@ -7,7 +7,7 @@ 要使用通知企业微信通知插件，请使用以下命令进行安装： ```bash -./answer build --with github.com/apache/incubator-answer-plugins/notification-wecom +./answer build --with github.com/apache/answer-plugins/notification-wecom ``` diff --git a/notification-wecom/config.go b/notification-wecom/config.go index 0bdcc81c..751c0306 100644 --- a/notification-wecom/config.go +++ b/notification-wecom/config.go @@ -22,8 +22,8 @@ package wecom import ( "encoding/json" - "github.com/apache/incubator-answer-plugins/notification-wecom/i18n" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer-plugins/notification-wecom/i18n" + "github.com/apache/answer/plugin" ) type NotificationConfig struct { diff --git a/notification-wecom/go.mod b/notification-wecom/go.mod index 1e191c73..e8c7ddb0 100644 --- a/notification-wecom/go.mod +++ b/notification-wecom/go.mod @@ -1,10 +1,10 @@ -module github.com/apache/incubator-answer-plugins/notification-wecom +module github.com/apache/answer-plugins/notification-wecom go 1.22.0 require ( - github.com/apache/incubator-answer v1.4.1 - github.com/apache/incubator-answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.1 + github.com/apache/answer-plugins/util v1.0.2 github.com/go-resty/resty/v2 v2.16.2 github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f ) diff --git a/notification-wecom/go.sum b/notification-wecom/go.sum index 1bd7f183..70faf436 100644 --- a/notification-wecom/go.sum +++ b/notification-wecom/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/incubator-answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/incubator-answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/incubator-answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/incubator-answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= +github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= +github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= +github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/notification-wecom/info.yaml b/notification-wecom/info.yaml index a1f05e45..380dd11b 100644 --- a/notification-wecom/info.yaml +++ b/notification-wecom/info.yaml @@ -19,4 +19,4 @@ slug_name: notification_wecom type: notification version: 1.0.0 author: lihui -link: https://github.com/apache/incubator-answer-plugins/tree/main/notification-wecom +link: https://github.com/apache/answer-plugins/tree/main/notification-wecom diff --git a/notification-wecom/notification_wecom.go b/notification-wecom/notification_wecom.go index 9b01256c..b5506d26 100644 --- a/notification-wecom/notification_wecom.go +++ b/notification-wecom/notification_wecom.go @@ -21,12 +21,11 @@ package wecom import ( "embed" - "github.com/apache/incubator-answer/plugin" - "github.com/go-resty/resty/v2" + "github.com/apache/answer/plugin" "strings" - wecomI18n "github.com/apache/incubator-answer-plugins/notification-wecom/i18n" - "github.com/apache/incubator-answer-plugins/util" + wecomI18n "github.com/apache/answer-plugins/notification-wecom/i18n" + "github.com/apache/answer-plugins/util" "github.com/segmentfault/pacman/i18n" "github.com/segmentfault/pacman/log" ) diff --git a/notification-wecom/user_config.go b/notification-wecom/user_config.go index bb294a8f..f61e2492 100644 --- a/notification-wecom/user_config.go +++ b/notification-wecom/user_config.go @@ -24,8 +24,8 @@ import ( "fmt" "sync" - "github.com/apache/incubator-answer-plugins/notification-wecom/i18n" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer-plugins/notification-wecom/i18n" + "github.com/apache/answer/plugin" "github.com/segmentfault/pacman/log" ) diff --git a/plugins_desc.json b/plugins_desc.json index 13487cd5..51e68295 100644 --- a/plugins_desc.json +++ b/plugins_desc.json @@ -3,274 +3,274 @@ { "name": "Redis Cache", "desc": "Use Redis as cache", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/cache-redis" + "link": "https://github.com/apache/answer-plugins/tree/main/cache-redis" }, { "name": "Basic Captcha", "desc": "Default graphic verification code", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/captcha-basic" + "link": "https://github.com/apache/answer-plugins/tree/main/captcha-basic" }, { "name": "Google reCAPTCHA v2", "desc": "Google reCAPTCHA v2 plugin", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/captcha-google-v2" + "link": "https://github.com/apache/answer-plugins/tree/main/captcha-google-v2" }, { "name": "Aliyun CDN", "desc": "Speed up your website and enjoy greatly improved loading times around the world.", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/cdn-aliyun" + "link": "https://github.com/apache/answer-plugins/tree/main/cdn-aliyun" }, { "name": "Amazon CloudFront", "desc": "Speed up your website and enjoy greatly improved loading times around the world.", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/cdn-s3" + "link": "https://github.com/apache/answer-plugins/tree/main/cdn-s3" }, { "name": "Apache Connector", "desc": "Connect to Apache Oauth", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/connector-apache" + "link": "https://github.com/apache/answer-plugins/tree/main/connector-apache" }, { "name": "OAuth2 Basic", "desc": "Generic OAuth2 Plugin", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/connector-basic" + "link": "https://github.com/apache/answer-plugins/tree/main/connector-basic" }, { "name": "Dingtalk Connector", "desc": "Connect to Dingtalk for third-party login", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/connector-dingtalk" + "link": "https://github.com/apache/answer-plugins/tree/main/connector-dingtalk" }, { "name": "Google Connector", "desc": "Connect to Google for third-party login", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/connector-google" + "link": "https://github.com/apache/answer-plugins/tree/main/connector-google" }, { "name": "Wallet Connector", "desc": "Connect to Wallet for third-party login", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/connector-wallet" + "link": "https://github.com/apache/answer-plugins/tree/main/connector-wallet" }, { "name": "Chart Editor", "desc": "Render chart in editor", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/editor-chart" + "link": "https://github.com/apache/answer-plugins/tree/main/editor-chart" }, { "name": "Formula Editor", "desc": "Render formula in editor", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/editor-formula" + "link": "https://github.com/apache/answer-plugins/tree/main/editor-formula" }, { "name": "Embed", "desc": "Embed content from other sites", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/embed-basic" + "link": "https://github.com/apache/answer-plugins/tree/main/embed-basic" }, { "name": "Ding talk Notification", "desc": "Send notifications to Ding Talk", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/notification-dingtalk" + "link": "https://github.com/apache/answer-plugins/tree/main/notification-dingtalk" }, { "name": "Slack Notification", "desc": "Send notifications to Slack", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/notification-slack" + "link": "https://github.com/apache/answer-plugins/tree/main/notification-slack" }, { "name": "Code Highlight", "desc": "Highlight code blocks in Markdown content", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/render-markdown-codehighlight" + "link": "https://github.com/apache/answer-plugins/tree/main/render-markdown-codehighlight" }, { "name": "Akismet Anti-Spam", "desc": "Akismet Anti-Spam is used to check the content of posts and comments against the Akismet web service to see if they look like spam.", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/reviewer-akismet" + "link": "https://github.com/apache/answer-plugins/tree/main/reviewer-akismet" }, { "name": "Baidu Anti-Spam", "desc": "Baidu Anti-Spam is used to check the content of posts and comments against the Baidu web service to see if they look like spam.", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/reviewer-baidu" + "link": "https://github.com/apache/answer-plugins/tree/main/reviewer-baidu" }, { "name": "Review Basic", "desc": "Generic review rule plugin", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/reviewer-basic" + "link": "https://github.com/apache/answer-plugins/tree/main/reviewer-basic" }, { "name": "Algolia Search", "desc": "Use Algolia as a search engine.", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/search-algolia" + "link": "https://github.com/apache/answer-plugins/tree/main/search-algolia" }, { "name": "Elasticsearch Engine", "desc": "Use Elasticsearch as search engine", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/search-elasticsearch" + "link": "https://github.com/apache/answer-plugins/tree/main/search-elasticsearch" }, { "name": "MeiliSearch", "desc": "MeiliSearch is a powerful, fast, open-source, easy to use and deploy search engine.", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/search-meilisearch" + "link": "https://github.com/apache/answer-plugins/tree/main/search-meilisearch" }, { "name": "Aliyun OSS storage", "desc": "Upload files to AliCloud OSS storage", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/storage-aliyunoss" + "link": "https://github.com/apache/answer-plugins/tree/main/storage-aliyunoss" }, { "name": "S3 storage", "desc": "Upload files to S3 storage", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/storage-s3" + "link": "https://github.com/apache/answer-plugins/tree/main/storage-s3" }, { "name": "Tencent COS storage", "desc": "Upload files to Tencent COS storage", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/storage-tencentyuncos" + "link": "https://github.com/apache/answer-plugins/tree/main/storage-tencentyuncos" }, { "name": "Slack User Center", "desc": "A plugin for integrating Slack user management", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/user-center-slack" + "link": "https://github.com/apache/answer-plugins/tree/main/user-center-slack" }, { "name": "WeCom", "desc": "Get user info from WeCom and sync to User Center", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/user-center-wecom" + "link": "https://github.com/apache/answer-plugins/tree/main/user-center-wecom" } ], "zh_CN": [ { "name": "Redis缓存", "desc": "使用Redis作为缓存", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/cache-redis" + "link": "https://github.com/apache/answer-plugins/tree/main/cache-redis" }, { "name": "基础验证码", "desc": "默认图形验证码", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/captcha-basic" + "link": "https://github.com/apache/answer-plugins/tree/main/captcha-basic" }, { "name": "Google reCAPTCHA v2", "desc": "Google reCAPTCHA v2 插件", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/captcha-google-v2" + "link": "https://github.com/apache/answer-plugins/tree/main/captcha-google-v2" }, { "name": "阿里云CDN", "desc": "通过阿里云CDN提升静态资源加速", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/cdn-aliyun" + "link": "https://github.com/apache/answer-plugins/tree/main/cdn-aliyun" }, { "name": "Amazon CloudFront", "desc": "通过AWS CDN提升静态资源加速", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/cdn-s3" + "link": "https://github.com/apache/answer-plugins/tree/main/cdn-s3" }, { "name": "Apache 连接器", "desc": "用于接入 Apache Oauth", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/connector-apache" + "link": "https://github.com/apache/answer-plugins/tree/main/connector-apache" }, { "name": "通用连接器", "desc": "适用于各种 OAuth 登录的通用插件", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/connector-basic" + "link": "https://github.com/apache/answer-plugins/tree/main/connector-basic" }, { "name": "钉钉连接器", "desc": "用于接入钉钉第三方登录", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/connector-dingtalk" + "link": "https://github.com/apache/answer-plugins/tree/main/connector-dingtalk" }, { "name": "Google 连接器", "desc": "用于接入 Google 第三方登录", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/connector-google" + "link": "https://github.com/apache/answer-plugins/tree/main/connector-google" }, { "name": "Wallet 连接器", "desc": "用于接入 Wallet 第三方登录", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/connector-wallet" + "link": "https://github.com/apache/answer-plugins/tree/main/connector-wallet" }, { "name": "图表编辑器", "desc": "在编辑器中渲染图表", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/editor-chart" + "link": "https://github.com/apache/answer-plugins/tree/main/editor-chart" }, { "name": "公式编辑器", "desc": "在编辑器中渲染公式", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/editor-formula" + "link": "https://github.com/apache/answer-plugins/tree/main/editor-formula" }, { "name": "内容嵌入", "desc": "在内容中嵌入其他网站", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/embed-basic" + "link": "https://github.com/apache/answer-plugins/tree/main/embed-basic" }, { "name": "钉钉通知", "desc": "发送通知到钉钉", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/notification-dingtalk" + "link": "https://github.com/apache/answer-plugins/tree/main/notification-dingtalk" }, { "name": "Slack 通知", "desc": "发送通知到 Slack", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/notification-slack" + "link": "https://github.com/apache/answer-plugins/tree/main/notification-slack" }, { "name": "代码高亮", "desc": "高亮显示 Markdown 内容中的代码块", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/render-markdown-codehighlight" + "link": "https://github.com/apache/answer-plugins/tree/main/render-markdown-codehighlight" }, { "name": "Akismet Anti-Spam", "desc": "Akismet Anti-Spam is used to check the content of posts and comments against the Akismet web service to see if they look like spam.", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/reviewer-akismet" + "link": "https://github.com/apache/answer-plugins/tree/main/reviewer-akismet" }, { "name": "百度反垃圾", "desc": "百度反垃圾用于检查帖子和评论内容，通过百度内容审核平台查看它们是否像垃圾内容。", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/reviewer-baidu" + "link": "https://github.com/apache/answer-plugins/tree/main/reviewer-baidu" }, { "name": "基础审核插件", "desc": "基础的通用审核插件", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/reviewer-basic" + "link": "https://github.com/apache/answer-plugins/tree/main/reviewer-basic" }, { "name": "Algolia 搜索", "desc": "使用 Algolia 作为搜索引擎.", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/search-algolia" + "link": "https://github.com/apache/answer-plugins/tree/main/search-algolia" }, { "name": "Elasticsearch 引擎", "desc": "使用 Elasticsearch 作为搜索引擎", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/search-elasticsearch" + "link": "https://github.com/apache/answer-plugins/tree/main/search-elasticsearch" }, { "name": "MeiliSearch", "desc": "MeiliSearch 是一个强大、快速、开源、易于使用和部署的搜索引擎。", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/search-meilisearch" + "link": "https://github.com/apache/answer-plugins/tree/main/search-meilisearch" }, { "name": "阿里云OSS存储", "desc": "上传文件到阿里云OSS存储", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/storage-aliyunoss" + "link": "https://github.com/apache/answer-plugins/tree/main/storage-aliyunoss" }, { "name": "S3 存储", "desc": "上传文件到S3存储", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/storage-s3" + "link": "https://github.com/apache/answer-plugins/tree/main/storage-s3" }, { "name": "腾讯云COS对象存储", "desc": "上传文件到腾讯云COS对象存储", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/storage-tencentyuncos" + "link": "https://github.com/apache/answer-plugins/tree/main/storage-tencentyuncos" }, { "name": "Slack", "desc": "通过Slack进行登录", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/user-center-slack" + "link": "https://github.com/apache/answer-plugins/tree/main/user-center-slack" }, { "name": "企业微信", "desc": "从企业微信获取用户信息并同步到用户中心", - "link": "https://github.com/apache/incubator-answer-plugins/tree/main/user-center-wecom" + "link": "https://github.com/apache/answer-plugins/tree/main/user-center-wecom" } ] } diff --git a/render-markdown-codehighlight/go.mod b/render-markdown-codehighlight/go.mod index c8776b06..edaf6c5a 100644 --- a/render-markdown-codehighlight/go.mod +++ b/render-markdown-codehighlight/go.mod @@ -1,10 +1,10 @@ -module github.com/apache/incubator-answer-plugins/render-markdown-codehighlight +module github.com/apache/answer-plugins/render-markdown-codehighlight go 1.22.0 require ( - github.com/apache/incubator-answer v1.4.1 - github.com/apache/incubator-answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.1 + github.com/apache/answer-plugins/util v1.0.2 github.com/gin-gonic/gin v1.10.0 ) diff --git a/render-markdown-codehighlight/go.sum b/render-markdown-codehighlight/go.sum index b08ce5b9..144856eb 100644 --- a/render-markdown-codehighlight/go.sum +++ b/render-markdown-codehighlight/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/incubator-answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/incubator-answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/incubator-answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/incubator-answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= +github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= +github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= +github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/render-markdown-codehighlight/info.yaml b/render-markdown-codehighlight/info.yaml index be82141a..f518138a 100644 --- a/render-markdown-codehighlight/info.yaml +++ b/render-markdown-codehighlight/info.yaml @@ -19,4 +19,4 @@ slug_name: render_markdown_codehighlight type: render version: 0.2.2 author: Chen Jiaji, Zhu Xuanlyu -link: https://github.com/apache/incubator-answer-plugins/tree/main/render-markdown-codehighlight +link: https://github.com/apache/answer-plugins/tree/main/render-markdown-codehighlight diff --git a/render-markdown-codehighlight/renderMarkdownCodehighlight.go b/render-markdown-codehighlight/renderMarkdownCodehighlight.go index c1ca809a..3f8fb8bf 100644 --- a/render-markdown-codehighlight/renderMarkdownCodehighlight.go +++ b/render-markdown-codehighlight/renderMarkdownCodehighlight.go @@ -22,9 +22,9 @@ package render_markdown_codehighlight import ( "embed" "encoding/json" - "github.com/apache/incubator-answer-plugins/render-markdown-codehighlight/i18n" - "github.com/apache/incubator-answer-plugins/util" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer-plugins/render-markdown-codehighlight/i18n" + "github.com/apache/answer-plugins/util" + "github.com/apache/answer/plugin" "github.com/gin-gonic/gin" "strings" ) diff --git a/reviewer-akismet/akismet.go b/reviewer-akismet/akismet.go index 3df6f768..10a3b7e3 100644 --- a/reviewer-akismet/akismet.go +++ b/reviewer-akismet/akismet.go @@ -20,8 +20,7 @@ package basic import ( - "github.com/apache/incubator-answer/plugin" - "github.com/go-resty/resty/v2" + "github.com/apache/answer/plugin" "github.com/segmentfault/pacman/log" ) diff --git a/reviewer-akismet/basic.go b/reviewer-akismet/basic.go index 6de7b423..f6d15fd5 100644 --- a/reviewer-akismet/basic.go +++ b/reviewer-akismet/basic.go @@ -22,10 +22,10 @@ package basic import ( "embed" "encoding/json" - "github.com/apache/incubator-answer-plugins/util" + "github.com/apache/answer-plugins/util" - "github.com/apache/incubator-answer-plugins/reviewer-akismet/i18n" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer-plugins/reviewer-akismet/i18n" + "github.com/apache/answer/plugin" myI18n "github.com/segmentfault/pacman/i18n" "github.com/segmentfault/pacman/log" ) diff --git a/reviewer-akismet/go.mod b/reviewer-akismet/go.mod index ae56af50..dc9e27ee 100644 --- a/reviewer-akismet/go.mod +++ b/reviewer-akismet/go.mod @@ -1,10 +1,10 @@ -module github.com/apache/incubator-answer-plugins/reviewer-akismet +module github.com/apache/answer-plugins/reviewer-akismet go 1.22.0 require ( - github.com/apache/incubator-answer v1.4.1 - github.com/apache/incubator-answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.1 + github.com/apache/answer-plugins/util v1.0.2 github.com/go-resty/resty/v2 v2.12.0 github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f ) diff --git a/reviewer-akismet/go.sum b/reviewer-akismet/go.sum index e7f1caee..042580ca 100644 --- a/reviewer-akismet/go.sum +++ b/reviewer-akismet/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/incubator-answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/incubator-answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/incubator-answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/incubator-answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= +github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= +github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= +github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/reviewer-akismet/info.yaml b/reviewer-akismet/info.yaml index 75b31124..3d0094d5 100644 --- a/reviewer-akismet/info.yaml +++ b/reviewer-akismet/info.yaml @@ -19,4 +19,4 @@ slug_name: akismet_reviewer type: reviewer version: 1.0.3 author: answerdev -link: https://github.com/apache/incubator-answer-plugins/tree/main/reviewer-akismet +link: https://github.com/apache/answer-plugins/tree/main/reviewer-akismet diff --git a/reviewer-baidu/basic.go b/reviewer-baidu/basic.go index 1baf3935..7e92d178 100644 --- a/reviewer-baidu/basic.go +++ b/reviewer-baidu/basic.go @@ -22,10 +22,10 @@ package basic import ( "embed" "encoding/json" - "github.com/apache/incubator-answer-plugins/util" + "github.com/apache/answer-plugins/util" - "github.com/apache/incubator-answer-plugins/reviewer-baidu/i18n" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer-plugins/reviewer-baidu/i18n" + "github.com/apache/answer/plugin" "github.com/lufei/baidu-golang-sdk/aip/censor" myI18n "github.com/segmentfault/pacman/i18n" "github.com/segmentfault/pacman/log" diff --git a/reviewer-baidu/go.mod b/reviewer-baidu/go.mod index 521fd2bd..b1a37a62 100644 --- a/reviewer-baidu/go.mod +++ b/reviewer-baidu/go.mod @@ -1,10 +1,10 @@ -module github.com/apache/incubator-answer-plugins/reviewer-baidu +module github.com/apache/answer-plugins/reviewer-baidu go 1.22.0 require ( - github.com/apache/incubator-answer v1.4.1 - github.com/apache/incubator-answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.1 + github.com/apache/answer-plugins/util v1.0.2 github.com/lufei/baidu-golang-sdk v0.0.0-20241007032158-d85deddc0d61 github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f ) diff --git a/reviewer-baidu/go.sum b/reviewer-baidu/go.sum index 31947edc..40e9fd76 100644 --- a/reviewer-baidu/go.sum +++ b/reviewer-baidu/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/incubator-answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/incubator-answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/incubator-answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/incubator-answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= +github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= +github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= +github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/reviewer-baidu/info.yaml b/reviewer-baidu/info.yaml index 7f00dc93..3e218128 100644 --- a/reviewer-baidu/info.yaml +++ b/reviewer-baidu/info.yaml @@ -19,4 +19,4 @@ slug_name: baidu_reviewer type: reviewer version: 1.0.1 author: Luffy -link: https://github.com/apache/incubator-answer-plugins/tree/main/reviewer-baidu +link: https://github.com/apache/answer-plugins/tree/main/reviewer-baidu diff --git a/reviewer-basic/basic.go b/reviewer-basic/basic.go index b0a87c0e..d12d6338 100644 --- a/reviewer-basic/basic.go +++ b/reviewer-basic/basic.go @@ -23,11 +23,11 @@ import ( "embed" "encoding/json" "fmt" - "github.com/apache/incubator-answer-plugins/util" + "github.com/apache/answer-plugins/util" "strings" - "github.com/apache/incubator-answer-plugins/reviewer-basic/i18n" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer-plugins/reviewer-basic/i18n" + "github.com/apache/answer/plugin" myI18n "github.com/segmentfault/pacman/i18n" ) diff --git a/reviewer-basic/go.mod b/reviewer-basic/go.mod index 844ae605..983a0d47 100644 --- a/reviewer-basic/go.mod +++ b/reviewer-basic/go.mod @@ -1,10 +1,10 @@ -module github.com/apache/incubator-answer-plugins/reviewer-basic +module github.com/apache/answer-plugins/reviewer-basic go 1.22.0 require ( - github.com/apache/incubator-answer v1.4.1 - github.com/apache/incubator-answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.1 + github.com/apache/answer-plugins/util v1.0.2 github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f ) diff --git a/reviewer-basic/go.sum b/reviewer-basic/go.sum index 142206c8..64aa05d7 100644 --- a/reviewer-basic/go.sum +++ b/reviewer-basic/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/incubator-answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/incubator-answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/incubator-answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/incubator-answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= +github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= +github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= +github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/reviewer-basic/info.yaml b/reviewer-basic/info.yaml index 9cfcc0d4..9dc75f8a 100644 --- a/reviewer-basic/info.yaml +++ b/reviewer-basic/info.yaml @@ -19,4 +19,4 @@ slug_name: basic_reviewer type: reviewer version: 1.0.5 author: answerdev -link: https://github.com/apache/incubator-answer-plugins/tree/main/reviewer-basic +link: https://github.com/apache/answer-plugins/tree/main/reviewer-basic diff --git a/search-algolia/README.md b/search-algolia/README.md index 6f4c2998..2f500df9 100644 --- a/search-algolia/README.md +++ b/search-algolia/README.md @@ -11,7 +11,7 @@ ### Build ```bash -./answer build --with github.com/apache/incubator-answer-plugins/search-algolia +./answer build --with github.com/apache/answer-plugins/search-algolia ``` ### Configuration diff --git a/search-algolia/algolia.go b/search-algolia/algolia.go index 9d18b64b..d3069492 100644 --- a/search-algolia/algolia.go +++ b/search-algolia/algolia.go @@ -22,14 +22,14 @@ package algolia import ( "context" "embed" - "github.com/apache/incubator-answer-plugins/util" + "github.com/apache/answer-plugins/util" "strconv" "strings" "github.com/algolia/algoliasearch-client-go/v3/algolia/opt" "github.com/algolia/algoliasearch-client-go/v3/algolia/search" - "github.com/apache/incubator-answer-plugins/search-algolia/i18n" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer-plugins/search-algolia/i18n" + "github.com/apache/answer/plugin" ) //go:embed info.yaml diff --git a/search-algolia/config.go b/search-algolia/config.go index 0b9f2fb7..62606655 100644 --- a/search-algolia/config.go +++ b/search-algolia/config.go @@ -22,9 +22,9 @@ package algolia import ( _ "embed" "encoding/json" - "github.com/apache/incubator-answer-plugins/search-algolia/i18n" + "github.com/apache/answer-plugins/search-algolia/i18n" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer/plugin" ) var ( diff --git a/search-algolia/go.mod b/search-algolia/go.mod index 6b1487cb..31f406d3 100644 --- a/search-algolia/go.mod +++ b/search-algolia/go.mod @@ -1,11 +1,11 @@ -module github.com/apache/incubator-answer-plugins/search-algolia +module github.com/apache/answer-plugins/search-algolia go 1.22.0 require ( github.com/algolia/algoliasearch-client-go/v3 v3.29.2 - github.com/apache/incubator-answer v1.4.1 - github.com/apache/incubator-answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.1 + github.com/apache/answer-plugins/util v1.0.2 github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f ) diff --git a/search-algolia/go.sum b/search-algolia/go.sum index b3f764dc..e6bb06e7 100644 --- a/search-algolia/go.sum +++ b/search-algolia/go.sum @@ -4,10 +4,10 @@ github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2Q github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= github.com/algolia/algoliasearch-client-go/v3 v3.29.2 h1:lmAD/gNui2TLoT8az22ECr056EjoBR0RJQssNezyniQ= github.com/algolia/algoliasearch-client-go/v3 v3.29.2/go.mod h1:i7tLoP7TYDmHX3Q7vkIOL4syVse/k5VJ+k0i8WqFiJk= -github.com/apache/incubator-answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/incubator-answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/incubator-answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/incubator-answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= +github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= +github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= +github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/search-algolia/info.yaml b/search-algolia/info.yaml index 05d05f60..2ba4ae5d 100644 --- a/search-algolia/info.yaml +++ b/search-algolia/info.yaml @@ -19,4 +19,4 @@ slug_name: algolia-search type: search version: 1.2.10 author: answerdev -link: https://github.com/apache/incubator-answer-plugins/tree/main/search-algolia +link: https://github.com/apache/answer-plugins/tree/main/search-algolia diff --git a/search-algolia/sync.go b/search-algolia/sync.go index 60ce4fd0..04b4202a 100644 --- a/search-algolia/sync.go +++ b/search-algolia/sync.go @@ -21,7 +21,7 @@ package algolia import ( "context" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer/plugin" "github.com/segmentfault/pacman/log" ) diff --git a/search-elasticsearch/README.md b/search-elasticsearch/README.md index 0a63068d..59a729ee 100644 --- a/search-elasticsearch/README.md +++ b/search-elasticsearch/README.md @@ -7,7 +7,7 @@ ### Build ```bash -./answer build --with github.com/apache/incubator-answer-plugins/search-elasticsearch +./answer build --with github.com/apache/answer-plugins/search-elasticsearch ``` ### Configuration diff --git a/search-elasticsearch/es.go b/search-elasticsearch/es.go index ea2d0b3a..64393a19 100644 --- a/search-elasticsearch/es.go +++ b/search-elasticsearch/es.go @@ -24,13 +24,12 @@ import ( "embed" "encoding/json" "fmt" - "github.com/apache/incubator-answer-plugins/util" + "github.com/apache/answer-plugins/util" "strings" "sync" - "github.com/apache/incubator-answer-plugins/search-elasticsearch/i18n" - "github.com/apache/incubator-answer/plugin" - "github.com/olivere/elastic/v7" + "github.com/apache/answer-plugins/search-elasticsearch/i18n" + "github.com/apache/answer/plugin" "github.com/segmentfault/pacman/log" ) diff --git a/search-elasticsearch/es_index.go b/search-elasticsearch/es_index.go index e159204e..7234c8eb 100644 --- a/search-elasticsearch/es_index.go +++ b/search-elasticsearch/es_index.go @@ -19,7 +19,7 @@ package es -import "github.com/apache/incubator-answer/plugin" +import "github.com/apache/answer/plugin" var indexJson = ` { diff --git a/search-elasticsearch/go.mod b/search-elasticsearch/go.mod index 44826859..c56a2c0f 100644 --- a/search-elasticsearch/go.mod +++ b/search-elasticsearch/go.mod @@ -1,10 +1,10 @@ -module github.com/apache/incubator-answer-plugins/search-elasticsearch +module github.com/apache/answer-plugins/search-elasticsearch go 1.22.0 require ( - github.com/apache/incubator-answer v1.4.1 - github.com/apache/incubator-answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.1 + github.com/apache/answer-plugins/util v1.0.2 github.com/olivere/elastic/v7 v7.0.32 github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f ) diff --git a/search-elasticsearch/go.sum b/search-elasticsearch/go.sum index b6d5aa1b..de3dfda0 100644 --- a/search-elasticsearch/go.sum +++ b/search-elasticsearch/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/incubator-answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/incubator-answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/incubator-answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/incubator-answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= +github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= +github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= +github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/search-elasticsearch/info.yaml b/search-elasticsearch/info.yaml index 49642b07..21109ada 100644 --- a/search-elasticsearch/info.yaml +++ b/search-elasticsearch/info.yaml @@ -19,4 +19,4 @@ slug_name: es_search type: search version: 1.2.9 author: answerdev -link: https://github.com/apache/incubator-answer-plugins/tree/main/search-elasticsearch +link: https://github.com/apache/answer-plugins/tree/main/search-elasticsearch diff --git a/search-elasticsearch/sync.go b/search-elasticsearch/sync.go index 13b6e335..00e6fa08 100644 --- a/search-elasticsearch/sync.go +++ b/search-elasticsearch/sync.go @@ -21,7 +21,7 @@ package es import ( "context" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer/plugin" "github.com/segmentfault/pacman/log" ) diff --git a/search-meilisearch/README.md b/search-meilisearch/README.md index 326e3cb5..fc9953f3 100644 --- a/search-meilisearch/README.md +++ b/search-meilisearch/README.md @@ -5,7 +5,7 @@ ### Build ```bash -./answer build --with github.com/apache/incubator-answer-plugins/search-meilisearch +./answer build --with github.com/apache/answer-plugins/search-meilisearch ``` ### Configuration diff --git a/search-meilisearch/go.mod b/search-meilisearch/go.mod index b9800970..66e6b0d0 100644 --- a/search-meilisearch/go.mod +++ b/search-meilisearch/go.mod @@ -1,10 +1,10 @@ -module github.com/apache/incubator-answer-plugins/search-meilisearch +module github.com/apache/answer-plugins/search-meilisearch go 1.22.0 require ( - github.com/apache/incubator-answer v1.4.1 - github.com/apache/incubator-answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.1 + github.com/apache/answer-plugins/util v1.0.2 github.com/meilisearch/meilisearch-go v0.25.0 github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f ) diff --git a/search-meilisearch/go.sum b/search-meilisearch/go.sum index 0154a8a7..7c246a6a 100644 --- a/search-meilisearch/go.sum +++ b/search-meilisearch/go.sum @@ -5,10 +5,10 @@ github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHC github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= -github.com/apache/incubator-answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/incubator-answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/incubator-answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/incubator-answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= +github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= +github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= +github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/search-meilisearch/info.yaml b/search-meilisearch/info.yaml index b3800864..3d5e50a7 100644 --- a/search-meilisearch/info.yaml +++ b/search-meilisearch/info.yaml @@ -19,4 +19,4 @@ slug_name: meilisearch_search type: search version: 1.2.8 author: sivdead -link: https://github.com/apache/incubator-answer-plugins/tree/main/search-meilisearch +link: https://github.com/apache/answer-plugins/tree/main/search-meilisearch diff --git a/search-meilisearch/meilisearch.go b/search-meilisearch/meilisearch.go index 57b7e176..ce7c14f4 100644 --- a/search-meilisearch/meilisearch.go +++ b/search-meilisearch/meilisearch.go @@ -24,13 +24,12 @@ import ( "embed" "encoding/json" "fmt" - "github.com/apache/incubator-answer-plugins/util" + "github.com/apache/answer-plugins/util" "strings" "sync" - "github.com/apache/incubator-answer-plugins/search-meilisearch/i18n" - "github.com/apache/incubator-answer/plugin" - "github.com/meilisearch/meilisearch-go" + "github.com/apache/answer-plugins/search-meilisearch/i18n" + "github.com/apache/answer/plugin" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" ) diff --git a/search-meilisearch/sync.go b/search-meilisearch/sync.go index 3254ed5e..f289dce9 100644 --- a/search-meilisearch/sync.go +++ b/search-meilisearch/sync.go @@ -21,7 +21,7 @@ package meilisearch import ( "context" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer/plugin" "github.com/segmentfault/pacman/log" ) diff --git a/storage-aliyunoss/README.md b/storage-aliyunoss/README.md index e98a7d59..7516190e 100644 --- a/storage-aliyunoss/README.md +++ b/storage-aliyunoss/README.md @@ -5,7 +5,7 @@ ### Build ```bash -./answer build --with github.com/apache/incubator-answer-plugins/storage-aliyunoss +./answer build --with github.com/apache/answer-plugins/storage-aliyunoss ``` ### Configuration diff --git a/storage-aliyunoss/aliyunoss.go b/storage-aliyunoss/aliyunoss.go index af132ca3..4fc41e56 100644 --- a/storage-aliyunoss/aliyunoss.go +++ b/storage-aliyunoss/aliyunoss.go @@ -25,15 +25,15 @@ import ( "encoding/hex" "encoding/json" "fmt" - "github.com/apache/incubator-answer-plugins/util" + "github.com/apache/answer-plugins/util" "path/filepath" "strconv" "strings" "time" "github.com/aliyun/aliyun-oss-go-sdk/oss" - "github.com/apache/incubator-answer-plugins/storage-aliyunoss/i18n" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer-plugins/storage-aliyunoss/i18n" + "github.com/apache/answer/plugin" ) //go:embed info.yaml diff --git a/storage-aliyunoss/go.mod b/storage-aliyunoss/go.mod index e58b421b..d84224d3 100644 --- a/storage-aliyunoss/go.mod +++ b/storage-aliyunoss/go.mod @@ -1,11 +1,11 @@ -module github.com/apache/incubator-answer-plugins/storage-aliyunoss +module github.com/apache/answer-plugins/storage-aliyunoss go 1.22.0 require ( github.com/aliyun/aliyun-oss-go-sdk v2.2.6+incompatible - github.com/apache/incubator-answer v1.4.1 - github.com/apache/incubator-answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.1 + github.com/apache/answer-plugins/util v1.0.2 ) require ( diff --git a/storage-aliyunoss/go.sum b/storage-aliyunoss/go.sum index a5ac701a..fd0b2c84 100644 --- a/storage-aliyunoss/go.sum +++ b/storage-aliyunoss/go.sum @@ -4,10 +4,10 @@ github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2Q github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= github.com/aliyun/aliyun-oss-go-sdk v2.2.6+incompatible h1:KXeJoM1wo9I/6xPTyt6qCxoSZnmASiAjlrr0dyTUKt8= github.com/aliyun/aliyun-oss-go-sdk v2.2.6+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8= -github.com/apache/incubator-answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/incubator-answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/incubator-answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/incubator-answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= +github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= +github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= +github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/storage-aliyunoss/info.yaml b/storage-aliyunoss/info.yaml index f7567f32..3ea1cdf4 100644 --- a/storage-aliyunoss/info.yaml +++ b/storage-aliyunoss/info.yaml @@ -19,4 +19,4 @@ slug_name: aliyunoss_storage type: storage version: 1.2.9 author: answerdev -link: https://github.com/apache/incubator-answer-plugins/tree/main/storage-aliyunoss +link: https://github.com/apache/answer-plugins/tree/main/storage-aliyunoss diff --git a/storage-s3/README.md b/storage-s3/README.md index a55d3863..0fb39b28 100644 --- a/storage-s3/README.md +++ b/storage-s3/README.md @@ -5,7 +5,7 @@ ### Build ```bash -./answer build --with github.com/apache/incubator-answer-plugins/storage-s3 +./answer build --with github.com/apache/answer-plugins/storage-s3 ``` ### Configuration diff --git a/storage-s3/go.mod b/storage-s3/go.mod index 897aae45..6f952cf5 100644 --- a/storage-s3/go.mod +++ b/storage-s3/go.mod @@ -1,10 +1,10 @@ -module github.com/apache/incubator-answer-plugins/storage-s3 +module github.com/apache/answer-plugins/storage-s3 go 1.22.0 require ( - github.com/apache/incubator-answer v1.4.1 - github.com/apache/incubator-answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.1 + github.com/apache/answer-plugins/util v1.0.2 github.com/aws/aws-sdk-go v1.44.314 ) diff --git a/storage-s3/go.sum b/storage-s3/go.sum index 6a910aae..cdc538b8 100644 --- a/storage-s3/go.sum +++ b/storage-s3/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/incubator-answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/incubator-answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/incubator-answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/incubator-answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= +github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= +github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= +github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= github.com/aws/aws-sdk-go v1.44.314 h1:d/5Jyk/Fb+PBd/4nzQg0JuC2W4A0knrDIzBgK/ggAow= github.com/aws/aws-sdk-go v1.44.314/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= diff --git a/storage-s3/info.yaml b/storage-s3/info.yaml index b3e91e8b..9ccae7fb 100644 --- a/storage-s3/info.yaml +++ b/storage-s3/info.yaml @@ -19,4 +19,4 @@ slug_name: s3_storage type: storage version: 1.2.9 author: answerdev -link: https://github.com/apache/incubator-answer-plugins/tree/main/storage-s3 +link: https://github.com/apache/answer-plugins/tree/main/storage-s3 diff --git a/storage-s3/s3.go b/storage-s3/s3.go index 93b0e428..f47b1177 100644 --- a/storage-s3/s3.go +++ b/storage-s3/s3.go @@ -25,14 +25,14 @@ import ( "encoding/hex" "encoding/json" "fmt" - "github.com/apache/incubator-answer-plugins/util" + "github.com/apache/answer-plugins/util" "path/filepath" "strconv" "strings" "time" - "github.com/apache/incubator-answer-plugins/storage-s3/i18n" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer-plugins/storage-s3/i18n" + "github.com/apache/answer/plugin" ) //go:embed info.yaml diff --git a/storage-s3/s3_client.go b/storage-s3/s3_client.go index 6931bfc3..07a372f2 100644 --- a/storage-s3/s3_client.go +++ b/storage-s3/s3_client.go @@ -71,7 +71,7 @@ func (s *Client) PutObject(key, ext string, file io.ReadSeeker) (err error) { var ( // aclPublicRead is the environment variable for some special platforms such as digital ocean - // https://github.com/apache/incubator-answer-plugins/issues/97 + // https://github.com/apache/answer-plugins/issues/97 aclPublicRead = os.Getenv("ACL_PUBLIC_READ") ) diff --git a/storage-tencentyuncos/README.md b/storage-tencentyuncos/README.md index 013fc10e..f56e2f98 100644 --- a/storage-tencentyuncos/README.md +++ b/storage-tencentyuncos/README.md @@ -7,7 +7,7 @@ ### Build ```bash -./answer build --with github.com/apache/incubator-answer-plugins/storage-tencentyuncos +./answer build --with github.com/apache/answer-plugins/storage-tencentyuncos ``` ### Configuration diff --git a/storage-tencentyuncos/go.mod b/storage-tencentyuncos/go.mod index 98b93d7c..1006cbab 100644 --- a/storage-tencentyuncos/go.mod +++ b/storage-tencentyuncos/go.mod @@ -1,10 +1,10 @@ -module github.com/apache/incubator-answer-plugins/storage-tencentyuncos +module github.com/apache/answer-plugins/storage-tencentyuncos go 1.22.0 require ( - github.com/apache/incubator-answer v1.4.1 - github.com/apache/incubator-answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.1 + github.com/apache/answer-plugins/util v1.0.2 github.com/tencentyun/cos-go-sdk-v5 v0.7.55 ) diff --git a/storage-tencentyuncos/go.sum b/storage-tencentyuncos/go.sum index 40b49732..282bc356 100644 --- a/storage-tencentyuncos/go.sum +++ b/storage-tencentyuncos/go.sum @@ -3,10 +3,10 @@ github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbi github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod h1:1pk82RBxDY/JZnPQrtqHlUFfCctgdorsd9M06fMynOM= -github.com/apache/incubator-answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/incubator-answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/incubator-answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/incubator-answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= +github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= +github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= +github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/storage-tencentyuncos/info.yaml b/storage-tencentyuncos/info.yaml index 0bd0e165..d662e0f0 100644 --- a/storage-tencentyuncos/info.yaml +++ b/storage-tencentyuncos/info.yaml @@ -19,4 +19,4 @@ slug_name: tencentyuncos_storage type: storage version: 1.0.1 author: Luffy -link: https://github.com/apache/incubator-answer-plugins/tree/main/storage-tencentyuncos +link: https://github.com/apache/answer-plugins/tree/main/storage-tencentyuncos diff --git a/storage-tencentyuncos/tencentyuncos.go b/storage-tencentyuncos/tencentyuncos.go index f2273eef..353da838 100644 --- a/storage-tencentyuncos/tencentyuncos.go +++ b/storage-tencentyuncos/tencentyuncos.go @@ -25,7 +25,7 @@ import ( "encoding/hex" "encoding/json" "fmt" - "github.com/apache/incubator-answer-plugins/util" + "github.com/apache/answer-plugins/util" "net/http" "net/url" "path/filepath" @@ -33,9 +33,8 @@ import ( "strings" "time" - "github.com/apache/incubator-answer-plugins/storage-tencentyuncos/i18n" - "github.com/apache/incubator-answer/plugin" - "github.com/tencentyun/cos-go-sdk-v5" + "github.com/apache/answer-plugins/storage-tencentyuncos/i18n" + "github.com/apache/answer/plugin" ) //go:embed info.yaml diff --git a/user-center-slack/client.go b/user-center-slack/client.go index 4ff54c3d..32adb8a1 100644 --- a/user-center-slack/client.go +++ b/user-center-slack/client.go @@ -26,8 +26,7 @@ import ( "net/http" "net/url" - "github.com/apache/incubator-answer/plugin" - "github.com/go-resty/resty/v2" + "github.com/apache/answer/plugin" "github.com/segmentfault/pacman/log" ) diff --git a/user-center-slack/config.go b/user-center-slack/config.go index f1be5e67..2caa40f8 100644 --- a/user-center-slack/config.go +++ b/user-center-slack/config.go @@ -23,8 +23,8 @@ import ( "encoding/json" "time" - "github.com/apache/incubator-answer-plugins/user-center-slack/i18n" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer-plugins/user-center-slack/i18n" + "github.com/apache/answer/plugin" ) type UserCenterConfig struct { diff --git a/user-center-slack/go.mod b/user-center-slack/go.mod index 761e3156..2199e668 100644 --- a/user-center-slack/go.mod +++ b/user-center-slack/go.mod @@ -1,10 +1,10 @@ -module github.com/apache/incubator-answer-plugins/user-center-slack +module github.com/apache/answer-plugins/user-center-slack go 1.22.0 require ( - github.com/apache/incubator-answer v1.4.1 - github.com/apache/incubator-answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.1 + github.com/apache/answer-plugins/util v1.0.2 github.com/gin-gonic/gin v1.10.0 github.com/go-resty/resty/v2 v2.15.1 github.com/patrickmn/go-cache v2.1.0+incompatible diff --git a/user-center-slack/go.sum b/user-center-slack/go.sum index 1a0e7c10..5f92ec43 100644 --- a/user-center-slack/go.sum +++ b/user-center-slack/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/incubator-answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/incubator-answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/incubator-answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/incubator-answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= +github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= +github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= +github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/user-center-slack/handler.go b/user-center-slack/handler.go index e4268471..6ced931f 100644 --- a/user-center-slack/handler.go +++ b/user-center-slack/handler.go @@ -28,7 +28,7 @@ import ( "net/http" "time" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer/plugin" "github.com/gin-gonic/gin" "github.com/segmentfault/pacman/log" ) diff --git a/user-center-slack/importer.go b/user-center-slack/importer.go index 8f2d19ca..de703e8b 100644 --- a/user-center-slack/importer.go +++ b/user-center-slack/importer.go @@ -35,7 +35,7 @@ import ( "strings" "time" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer/plugin" "github.com/gin-gonic/gin" "github.com/segmentfault/pacman/log" ) diff --git a/user-center-slack/info.yaml b/user-center-slack/info.yaml index cd716d9b..9a948c49 100644 --- a/user-center-slack/info.yaml +++ b/user-center-slack/info.yaml @@ -19,4 +19,4 @@ slug_name: slack_user_center type: user_center version: 1.0.3 author: AnanChen -link: https://github.com/apache/incubator-answer-plugins/tree/main/user-center-slack +link: https://github.com/apache/answer-plugins/tree/main/user-center-slack diff --git a/user-center-slack/notification.go b/user-center-slack/notification.go index 94fa8ac2..6c58d32d 100644 --- a/user-center-slack/notification.go +++ b/user-center-slack/notification.go @@ -22,9 +22,8 @@ package slack_user_center import ( "strings" - slackI18n "github.com/apache/incubator-answer-plugins/user-center-slack/i18n" - "github.com/apache/incubator-answer/plugin" - "github.com/go-resty/resty/v2" + slackI18n "github.com/apache/answer-plugins/user-center-slack/i18n" + "github.com/apache/answer/plugin" "github.com/segmentfault/pacman/i18n" "github.com/segmentfault/pacman/log" ) diff --git a/user-center-slack/slack_user_center.go b/user-center-slack/slack_user_center.go index 63da5c44..b7db71e5 100644 --- a/user-center-slack/slack_user_center.go +++ b/user-center-slack/slack_user_center.go @@ -26,12 +26,11 @@ import ( "sync" "time" - "github.com/apache/incubator-answer-plugins/util" + "github.com/apache/answer-plugins/util" - "github.com/apache/incubator-answer-plugins/user-center-slack/i18n" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer-plugins/user-center-slack/i18n" + "github.com/apache/answer/plugin" "github.com/gin-gonic/gin" - "github.com/patrickmn/go-cache" "github.com/segmentfault/pacman/log" ) diff --git a/user-center-slack/user_config.go b/user-center-slack/user_config.go index b39eebc4..5f254343 100644 --- a/user-center-slack/user_config.go +++ b/user-center-slack/user_config.go @@ -24,8 +24,8 @@ import ( "fmt" "sync" - "github.com/apache/incubator-answer-plugins/user-center-slack/i18n" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer-plugins/user-center-slack/i18n" + "github.com/apache/answer/plugin" "github.com/segmentfault/pacman/log" ) diff --git a/user-center-wecom/config.go b/user-center-wecom/config.go index 5126808a..6ea8401a 100644 --- a/user-center-wecom/config.go +++ b/user-center-wecom/config.go @@ -23,8 +23,8 @@ import ( "encoding/json" "time" - "github.com/apache/incubator-answer-plugins/user-center-wecom/i18n" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer-plugins/user-center-wecom/i18n" + "github.com/apache/answer/plugin" ) type UserCenterConfig struct { diff --git a/user-center-wecom/go.mod b/user-center-wecom/go.mod index cc368372..7036fbb0 100644 --- a/user-center-wecom/go.mod +++ b/user-center-wecom/go.mod @@ -1,10 +1,10 @@ -module github.com/apache/incubator-answer-plugins/user-center-wecom +module github.com/apache/answer-plugins/user-center-wecom go 1.22.0 require ( - github.com/apache/incubator-answer v1.4.1 - github.com/apache/incubator-answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.1 + github.com/apache/answer-plugins/util v1.0.2 github.com/gin-gonic/gin v1.10.0 github.com/go-resty/resty/v2 v2.12.0 github.com/patrickmn/go-cache v2.1.0+incompatible diff --git a/user-center-wecom/go.sum b/user-center-wecom/go.sum index 7221a91c..cd4bb044 100644 --- a/user-center-wecom/go.sum +++ b/user-center-wecom/go.sum @@ -6,10 +6,10 @@ github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a h1:HbKu58rmZp github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc= github.com/alicebob/miniredis/v2 v2.30.0 h1:uA3uhDbCxfO9+DI/DuGeAMr9qI+noVWwGPNTFuKID5M= github.com/alicebob/miniredis/v2 v2.30.0/go.mod h1:84TWKZlxYkfgMucPBf5SOQBYJceZeQRFIaQgNMiCX6Q= -github.com/apache/incubator-answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/incubator-answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/incubator-answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/incubator-answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= +github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= +github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= +github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d h1:pVrfxiGfwelyab6n21ZBkbkmbevaf+WvMIiR7sr97hw= diff --git a/user-center-wecom/handler.go b/user-center-wecom/handler.go index 8d5ed17b..109df46e 100644 --- a/user-center-wecom/handler.go +++ b/user-center-wecom/handler.go @@ -26,8 +26,8 @@ import ( "net/http" "strings" - "github.com/apache/incubator-answer-plugins/user-center-wecom/i18n" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer-plugins/user-center-wecom/i18n" + "github.com/apache/answer/plugin" "github.com/gin-gonic/gin" ) diff --git a/user-center-wecom/info.yaml b/user-center-wecom/info.yaml index 2207c76a..104a142a 100644 --- a/user-center-wecom/info.yaml +++ b/user-center-wecom/info.yaml @@ -19,4 +19,4 @@ slug_name: wecom_user_center type: user_center version: 1.2.8 author: answerdev -link: https://github.com/apache/incubator-answer-plugins/tree/main/user-center-wecom +link: https://github.com/apache/answer-plugins/tree/main/user-center-wecom diff --git a/user-center-wecom/notification.go b/user-center-wecom/notification.go index b4fb0fdf..d22f0421 100644 --- a/user-center-wecom/notification.go +++ b/user-center-wecom/notification.go @@ -22,8 +22,8 @@ package wecom import ( "strings" - wecomI18n "github.com/apache/incubator-answer-plugins/user-center-wecom/i18n" - "github.com/apache/incubator-answer/plugin" + wecomI18n "github.com/apache/answer-plugins/user-center-wecom/i18n" + "github.com/apache/answer/plugin" "github.com/segmentfault/pacman/i18n" "github.com/segmentfault/pacman/log" "github.com/silenceper/wechat/v2/work/message" diff --git a/user-center-wecom/user_config.go b/user-center-wecom/user_config.go index 06497c6a..2a7cabec 100644 --- a/user-center-wecom/user_config.go +++ b/user-center-wecom/user_config.go @@ -24,8 +24,8 @@ import ( "fmt" "sync" - "github.com/apache/incubator-answer-plugins/user-center-wecom/i18n" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer-plugins/user-center-wecom/i18n" + "github.com/apache/answer/plugin" "github.com/segmentfault/pacman/log" ) diff --git a/user-center-wecom/wecom_user_center.go b/user-center-wecom/wecom_user_center.go index 594d3bee..899a7517 100644 --- a/user-center-wecom/wecom_user_center.go +++ b/user-center-wecom/wecom_user_center.go @@ -22,15 +22,14 @@ package wecom import ( "embed" "fmt" - "github.com/apache/incubator-answer-plugins/util" + "github.com/apache/answer-plugins/util" "net/http" "sync" "time" - "github.com/apache/incubator-answer-plugins/user-center-wecom/i18n" - "github.com/apache/incubator-answer/plugin" + "github.com/apache/answer-plugins/user-center-wecom/i18n" + "github.com/apache/answer/plugin" "github.com/gin-gonic/gin" - "github.com/patrickmn/go-cache" "github.com/segmentfault/pacman/log" ) diff --git a/util/go.mod b/util/go.mod index f7cc0a37..b236b63b 100644 --- a/util/go.mod +++ b/util/go.mod @@ -1,4 +1,4 @@ -module github.com/apache/incubator-answer-plugins/util +module github.com/apache/answer-plugins/util go 1.22.0 From de296b39f8f18f2b3d4226badc1b26bcd1e8e1c5 Mon Sep 17 00:00:00 2001 From: LinkinStars Date: Tue, 7 Jan 2025 11:37:26 +0800 Subject: [PATCH 18/20] refactor(gomod): rename incubator-answer --- cache-redis/go.mod | 4 +-- cache-redis/go.sum | 8 ++--- cache-redis/redis.go | 3 +- captcha-basic/go.mod | 4 +-- captcha-basic/go.sum | 8 ++--- captcha-google-v2/go.mod | 4 +-- captcha-google-v2/go.sum | 8 ++--- cdn-aliyun/aliyun.go | 13 ++++---- cdn-aliyun/go.mod | 4 +-- cdn-aliyun/go.sum | 8 ++--- cdn-s3/go.mod | 4 +-- cdn-s3/go.sum | 8 ++--- cdn-s3/s3.go | 8 ++--- cdn-s3/s3_client.go | 5 +-- connector-apache/apache.go | 2 +- connector-apache/go.mod | 4 +-- connector-apache/go.sum | 8 ++--- connector-basic/basic.go | 2 +- connector-basic/go.mod | 4 +-- connector-basic/go.sum | 8 ++--- connector-dingtalk/dingtalk.go | 2 +- connector-dingtalk/go.mod | 4 +-- connector-dingtalk/go.sum | 8 ++--- connector-github/github.go | 2 +- connector-github/go.mod | 4 +-- connector-github/go.sum | 8 ++--- connector-google/go.mod | 4 +-- connector-google/go.sum | 8 ++--- connector-google/google.go | 2 +- connector-wallet/go.mod | 4 +-- connector-wallet/go.sum | 8 ++--- editor-chart/go.mod | 4 +-- editor-chart/go.sum | 8 ++--- editor-formula/go.mod | 4 +-- editor-formula/go.sum | 8 ++--- embed-basic/go.mod | 4 +-- embed-basic/go.sum | 8 ++--- .../dingtalk_notification.go | 3 +- notification-dingtalk/go.mod | 7 +++-- notification-dingtalk/go.sum | 15 +++++---- notification-lark/go.mod | 4 +-- notification-lark/go.sum | 8 ++--- notification-slack/go.mod | 6 ++-- notification-slack/go.sum | 12 +++---- notification-slack/slack_notification.go | 1 + notification-wecom/go.mod | 5 +-- notification-wecom/go.sum | 11 ++++--- notification-wecom/notification_wecom.go | 3 +- render-markdown-codehighlight/go.mod | 4 +-- render-markdown-codehighlight/go.sum | 8 ++--- .../renderMarkdownCodehighlight.go | 3 +- reviewer-akismet/basic.go | 2 +- reviewer-akismet/go.mod | 5 ++- reviewer-akismet/go.sum | 31 +++---------------- reviewer-baidu/basic.go | 2 +- reviewer-baidu/go.mod | 4 +-- reviewer-baidu/go.sum | 8 ++--- reviewer-basic/basic.go | 2 +- reviewer-basic/go.mod | 4 +-- reviewer-basic/go.sum | 8 ++--- search-algolia/algolia.go | 2 +- search-algolia/go.mod | 4 +-- search-algolia/go.sum | 8 ++--- search-elasticsearch/es.go | 3 +- search-elasticsearch/go.mod | 4 +-- search-elasticsearch/go.sum | 8 ++--- search-elasticsearch/sync.go | 1 + search-meilisearch/go.mod | 4 +-- search-meilisearch/go.sum | 8 ++--- search-meilisearch/meilisearch.go | 3 +- storage-aliyunoss/aliyunoss.go | 2 +- storage-aliyunoss/go.mod | 4 +-- storage-aliyunoss/go.sum | 8 ++--- storage-s3/go.mod | 4 +-- storage-s3/go.sum | 8 ++--- storage-s3/s3.go | 2 +- storage-tencentyuncos/go.mod | 4 +-- storage-tencentyuncos/go.sum | 8 ++--- storage-tencentyuncos/tencentyuncos.go | 3 +- user-center-slack/client.go | 1 + user-center-slack/go.mod | 4 +-- user-center-slack/go.sum | 8 ++--- user-center-slack/slack_user_center.go | 4 +-- user-center-wecom/go.mod | 4 +-- user-center-wecom/go.sum | 8 ++--- user-center-wecom/wecom_user_center.go | 3 +- 86 files changed, 240 insertions(+), 243 deletions(-) diff --git a/cache-redis/go.mod b/cache-redis/go.mod index 7179ae4c..ed70a027 100644 --- a/cache-redis/go.mod +++ b/cache-redis/go.mod @@ -3,8 +3,8 @@ module github.com/apache/answer-plugins/cache-redis go 1.22.0 require ( - github.com/apache/answer v1.4.1 - github.com/apache/answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 + github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 github.com/go-redis/redis/v8 v8.11.5 ) diff --git a/cache-redis/go.sum b/cache-redis/go.sum index fa139774..9c62ab63 100644 --- a/cache-redis/go.sum +++ b/cache-redis/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 h1:TmUPU0tX3VzbUO7rCBW3hJDUGO/WOI343zcbymIWQSM= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091/go.mod h1:ehAJmrP4X9kBJKlYzTtRrwRbKeRqjnHxyYlhf11yzfw= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 h1:jVqxzyeHvYxAT30vGfHXtZLNoi9qAWnvTtuMSj6pFys= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954/go.mod h1:wQEKNXVa/BKKq5yro9qo5bFiO3/SW1noORabxEndk3o= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/cache-redis/redis.go b/cache-redis/redis.go index 29b3cf4d..f62b048d 100644 --- a/cache-redis/redis.go +++ b/cache-redis/redis.go @@ -25,11 +25,12 @@ import ( _ "embed" "encoding/json" "fmt" - "github.com/apache/answer-plugins/util" "time" "github.com/apache/answer-plugins/cache-redis/i18n" + "github.com/apache/answer-plugins/util" "github.com/apache/answer/plugin" + "github.com/go-redis/redis/v8" ) var ( diff --git a/captcha-basic/go.mod b/captcha-basic/go.mod index b9ab7a1e..4aee3b9f 100644 --- a/captcha-basic/go.mod +++ b/captcha-basic/go.mod @@ -3,8 +3,8 @@ module github.com/apache/answer-plugins/captcha-basic go 1.22.0 require ( - github.com/apache/answer v1.4.1 - github.com/apache/answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 + github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 github.com/mojocn/base64Captcha v1.3.6 ) diff --git a/captcha-basic/go.sum b/captcha-basic/go.sum index bb4b977f..50685740 100644 --- a/captcha-basic/go.sum +++ b/captcha-basic/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 h1:TmUPU0tX3VzbUO7rCBW3hJDUGO/WOI343zcbymIWQSM= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091/go.mod h1:ehAJmrP4X9kBJKlYzTtRrwRbKeRqjnHxyYlhf11yzfw= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 h1:jVqxzyeHvYxAT30vGfHXtZLNoi9qAWnvTtuMSj6pFys= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954/go.mod h1:wQEKNXVa/BKKq5yro9qo5bFiO3/SW1noORabxEndk3o= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/captcha-google-v2/go.mod b/captcha-google-v2/go.mod index cee9da6e..306ba317 100644 --- a/captcha-google-v2/go.mod +++ b/captcha-google-v2/go.mod @@ -3,8 +3,8 @@ module github.com/apache/answer-plugins/captcha-google-v2 go 1.22.0 require ( - github.com/apache/answer v1.4.1 - github.com/apache/answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 + github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f ) diff --git a/captcha-google-v2/go.sum b/captcha-google-v2/go.sum index 64aa05d7..ef8d1554 100644 --- a/captcha-google-v2/go.sum +++ b/captcha-google-v2/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 h1:TmUPU0tX3VzbUO7rCBW3hJDUGO/WOI343zcbymIWQSM= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091/go.mod h1:ehAJmrP4X9kBJKlYzTtRrwRbKeRqjnHxyYlhf11yzfw= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 h1:jVqxzyeHvYxAT30vGfHXtZLNoi9qAWnvTtuMSj6pFys= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954/go.mod h1:wQEKNXVa/BKKq5yro9qo5bFiO3/SW1noORabxEndk3o= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/cdn-aliyun/aliyun.go b/cdn-aliyun/aliyun.go index cdab85cd..e680348b 100644 --- a/cdn-aliyun/aliyun.go +++ b/cdn-aliyun/aliyun.go @@ -23,12 +23,6 @@ import ( "embed" "encoding/json" "fmt" - "github.com/aliyun/aliyun-oss-go-sdk/oss" - "github.com/apache/answer-plugins/cdn-aliyun/i18n" - "github.com/apache/answer-plugins/util" - "github.com/apache/answer/plugin" - "github.com/apache/answer/ui" - "github.com/segmentfault/pacman/log" "io" "io/fs" "net/http" @@ -36,6 +30,13 @@ import ( "path/filepath" "strconv" "strings" + + "github.com/aliyun/aliyun-oss-go-sdk/oss" + "github.com/apache/answer-plugins/cdn-aliyun/i18n" + "github.com/apache/answer-plugins/util" + "github.com/apache/answer/plugin" + "github.com/apache/answer/ui" + "github.com/segmentfault/pacman/log" ) var ( diff --git a/cdn-aliyun/go.mod b/cdn-aliyun/go.mod index 884a7029..df8c8aef 100644 --- a/cdn-aliyun/go.mod +++ b/cdn-aliyun/go.mod @@ -4,8 +4,8 @@ go 1.22.0 require ( github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible - github.com/apache/answer v1.4.1 - github.com/apache/answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 + github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f ) diff --git a/cdn-aliyun/go.sum b/cdn-aliyun/go.sum index 01a27fb3..34dbf76f 100644 --- a/cdn-aliyun/go.sum +++ b/cdn-aliyun/go.sum @@ -4,10 +4,10 @@ github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2Q github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible h1:8psS8a+wKfiLt1iVDX79F7Y6wUM49Lcha2FMXt4UM8g= github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8= -github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 h1:TmUPU0tX3VzbUO7rCBW3hJDUGO/WOI343zcbymIWQSM= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091/go.mod h1:ehAJmrP4X9kBJKlYzTtRrwRbKeRqjnHxyYlhf11yzfw= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 h1:jVqxzyeHvYxAT30vGfHXtZLNoi9qAWnvTtuMSj6pFys= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954/go.mod h1:wQEKNXVa/BKKq5yro9qo5bFiO3/SW1noORabxEndk3o= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/cdn-s3/go.mod b/cdn-s3/go.mod index 9b2f284e..29e55a1f 100644 --- a/cdn-s3/go.mod +++ b/cdn-s3/go.mod @@ -3,8 +3,8 @@ module github.com/apache/answer-plugins/cdn-s3 go 1.22.0 require ( - github.com/apache/answer v1.4.1 - github.com/apache/answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 + github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 github.com/aws/aws-sdk-go v1.44.314 github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f ) diff --git a/cdn-s3/go.sum b/cdn-s3/go.sum index cdc538b8..34ab9115 100644 --- a/cdn-s3/go.sum +++ b/cdn-s3/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 h1:TmUPU0tX3VzbUO7rCBW3hJDUGO/WOI343zcbymIWQSM= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091/go.mod h1:ehAJmrP4X9kBJKlYzTtRrwRbKeRqjnHxyYlhf11yzfw= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 h1:jVqxzyeHvYxAT30vGfHXtZLNoi9qAWnvTtuMSj6pFys= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954/go.mod h1:wQEKNXVa/BKKq5yro9qo5bFiO3/SW1noORabxEndk3o= github.com/aws/aws-sdk-go v1.44.314 h1:d/5Jyk/Fb+PBd/4nzQg0JuC2W4A0knrDIzBgK/ggAow= github.com/aws/aws-sdk-go v1.44.314/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= diff --git a/cdn-s3/s3.go b/cdn-s3/s3.go index 9810beb4..6b2a17aa 100644 --- a/cdn-s3/s3.go +++ b/cdn-s3/s3.go @@ -25,10 +25,6 @@ import ( "encoding/hex" "encoding/json" "fmt" - "github.com/apache/answer-plugins/cdn-s3/i18n" - "github.com/apache/answer-plugins/util" - "github.com/apache/answer/ui" - "github.com/segmentfault/pacman/log" "io" "io/fs" "net/http" @@ -38,7 +34,11 @@ import ( "strings" "time" + "github.com/apache/answer-plugins/cdn-s3/i18n" + "github.com/apache/answer-plugins/util" "github.com/apache/answer/plugin" + "github.com/apache/answer/ui" + "github.com/segmentfault/pacman/log" ) var ( diff --git a/cdn-s3/s3_client.go b/cdn-s3/s3_client.go index 961a6f2e..8924fa33 100644 --- a/cdn-s3/s3_client.go +++ b/cdn-s3/s3_client.go @@ -21,12 +21,13 @@ package s3 import ( "fmt" + "io" + "strings" + "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/credentials" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/s3" - "io" - "strings" ) type Client struct { diff --git a/connector-apache/apache.go b/connector-apache/apache.go index bc1ae239..6d97b4c9 100644 --- a/connector-apache/apache.go +++ b/connector-apache/apache.go @@ -23,11 +23,11 @@ import ( "embed" "encoding/json" "fmt" - "github.com/apache/answer-plugins/util" "io" "net/http" "github.com/apache/answer-plugins/connector-apache/i18n" + "github.com/apache/answer-plugins/util" "github.com/apache/answer/pkg/token" "github.com/apache/answer/plugin" "github.com/segmentfault/pacman/log" diff --git a/connector-apache/go.mod b/connector-apache/go.mod index 5b25a27a..e577054c 100644 --- a/connector-apache/go.mod +++ b/connector-apache/go.mod @@ -3,8 +3,8 @@ module github.com/apache/answer-plugins/connector-apache go 1.22.0 require ( - github.com/apache/answer v1.4.1 - github.com/apache/answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 + github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f ) diff --git a/connector-apache/go.sum b/connector-apache/go.sum index 1c0762d0..06b0100d 100644 --- a/connector-apache/go.sum +++ b/connector-apache/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 h1:TmUPU0tX3VzbUO7rCBW3hJDUGO/WOI343zcbymIWQSM= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091/go.mod h1:ehAJmrP4X9kBJKlYzTtRrwRbKeRqjnHxyYlhf11yzfw= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 h1:jVqxzyeHvYxAT30vGfHXtZLNoi9qAWnvTtuMSj6pFys= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954/go.mod h1:wQEKNXVa/BKKq5yro9qo5bFiO3/SW1noORabxEndk3o= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/connector-basic/basic.go b/connector-basic/basic.go index 3fd6a3b3..296a2cf2 100644 --- a/connector-basic/basic.go +++ b/connector-basic/basic.go @@ -24,7 +24,6 @@ import ( "embed" "encoding/json" "fmt" - "github.com/apache/answer-plugins/util" "io" "regexp" "strings" @@ -32,6 +31,7 @@ import ( "unicode/utf8" "github.com/apache/answer-plugins/connector-basic/i18n" + "github.com/apache/answer-plugins/util" "github.com/apache/answer/pkg/checker" "github.com/apache/answer/plugin" "github.com/segmentfault/pacman/log" diff --git a/connector-basic/go.mod b/connector-basic/go.mod index 77e04be3..73124546 100644 --- a/connector-basic/go.mod +++ b/connector-basic/go.mod @@ -3,8 +3,8 @@ module github.com/apache/answer-plugins/connector-basic go 1.22.0 require ( - github.com/apache/answer v1.4.1 - github.com/apache/answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 + github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f github.com/tidwall/gjson v1.17.3 golang.org/x/oauth2 v0.4.0 diff --git a/connector-basic/go.sum b/connector-basic/go.sum index 5fbc0989..64c3cf12 100644 --- a/connector-basic/go.sum +++ b/connector-basic/go.sum @@ -22,10 +22,10 @@ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuy github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 h1:TmUPU0tX3VzbUO7rCBW3hJDUGO/WOI343zcbymIWQSM= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091/go.mod h1:ehAJmrP4X9kBJKlYzTtRrwRbKeRqjnHxyYlhf11yzfw= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 h1:jVqxzyeHvYxAT30vGfHXtZLNoi9qAWnvTtuMSj6pFys= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954/go.mod h1:wQEKNXVa/BKKq5yro9qo5bFiO3/SW1noORabxEndk3o= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= diff --git a/connector-dingtalk/dingtalk.go b/connector-dingtalk/dingtalk.go index 9deb65f2..5f7d5694 100644 --- a/connector-dingtalk/dingtalk.go +++ b/connector-dingtalk/dingtalk.go @@ -24,10 +24,10 @@ import ( "embed" "encoding/json" "fmt" - "github.com/apache/answer-plugins/util" "net/http" "github.com/apache/answer-plugins/connector-dingtalk/i18n" + "github.com/apache/answer-plugins/util" "github.com/apache/answer/plugin" "github.com/segmentfault/pacman/log" ) diff --git a/connector-dingtalk/go.mod b/connector-dingtalk/go.mod index 5330e698..3c4da7c8 100644 --- a/connector-dingtalk/go.mod +++ b/connector-dingtalk/go.mod @@ -3,8 +3,8 @@ module github.com/apache/answer-plugins/connector-dingtalk go 1.22.0 require ( - github.com/apache/answer v1.4.1 - github.com/apache/answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 + github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f ) diff --git a/connector-dingtalk/go.sum b/connector-dingtalk/go.sum index 144856eb..7f947b0b 100644 --- a/connector-dingtalk/go.sum +++ b/connector-dingtalk/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 h1:TmUPU0tX3VzbUO7rCBW3hJDUGO/WOI343zcbymIWQSM= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091/go.mod h1:ehAJmrP4X9kBJKlYzTtRrwRbKeRqjnHxyYlhf11yzfw= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 h1:jVqxzyeHvYxAT30vGfHXtZLNoi9qAWnvTtuMSj6pFys= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954/go.mod h1:wQEKNXVa/BKKq5yro9qo5bFiO3/SW1noORabxEndk3o= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/connector-github/github.go b/connector-github/github.go index 4d2bdd2f..fddb34c1 100644 --- a/connector-github/github.go +++ b/connector-github/github.go @@ -24,10 +24,10 @@ import ( "embed" "encoding/json" "fmt" - "github.com/apache/answer-plugins/util" "time" "github.com/apache/answer-plugins/connector-github/i18n" + "github.com/apache/answer-plugins/util" "github.com/apache/answer/plugin" "github.com/google/go-github/v50/github" "github.com/segmentfault/pacman/log" diff --git a/connector-github/go.mod b/connector-github/go.mod index 6a75ae19..093693e8 100644 --- a/connector-github/go.mod +++ b/connector-github/go.mod @@ -3,8 +3,8 @@ module github.com/apache/answer-plugins/connector-github go 1.22.0 require ( - github.com/apache/answer v1.4.1 - github.com/apache/answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 + github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 github.com/google/go-github/v50 v50.1.0 github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f golang.org/x/oauth2 v0.4.0 diff --git a/connector-github/go.sum b/connector-github/go.sum index f88527e4..d5f89be8 100644 --- a/connector-github/go.sum +++ b/connector-github/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 h1:TmUPU0tX3VzbUO7rCBW3hJDUGO/WOI343zcbymIWQSM= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091/go.mod h1:ehAJmrP4X9kBJKlYzTtRrwRbKeRqjnHxyYlhf11yzfw= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 h1:jVqxzyeHvYxAT30vGfHXtZLNoi9qAWnvTtuMSj6pFys= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954/go.mod h1:wQEKNXVa/BKKq5yro9qo5bFiO3/SW1noORabxEndk3o= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/connector-google/go.mod b/connector-google/go.mod index fed7f805..c8b85074 100644 --- a/connector-google/go.mod +++ b/connector-google/go.mod @@ -3,8 +3,8 @@ module github.com/apache/answer-plugins/connector-google go 1.22.0 require ( - github.com/apache/answer v1.4.1 - github.com/apache/answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 + github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 golang.org/x/oauth2 v0.4.0 ) diff --git a/connector-google/go.sum b/connector-google/go.sum index 0b509d54..3e0e6f11 100644 --- a/connector-google/go.sum +++ b/connector-google/go.sum @@ -4,10 +4,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 h1:TmUPU0tX3VzbUO7rCBW3hJDUGO/WOI343zcbymIWQSM= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091/go.mod h1:ehAJmrP4X9kBJKlYzTtRrwRbKeRqjnHxyYlhf11yzfw= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 h1:jVqxzyeHvYxAT30vGfHXtZLNoi9qAWnvTtuMSj6pFys= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954/go.mod h1:wQEKNXVa/BKKq5yro9qo5bFiO3/SW1noORabxEndk3o= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/connector-google/google.go b/connector-google/google.go index 9f5c3621..1cefb7aa 100644 --- a/connector-google/google.go +++ b/connector-google/google.go @@ -24,11 +24,11 @@ import ( "embed" "encoding/json" "fmt" - "github.com/apache/answer-plugins/util" "io" "time" "github.com/apache/answer-plugins/connector-google/i18n" + "github.com/apache/answer-plugins/util" "github.com/apache/answer/plugin" "golang.org/x/oauth2" oauth2Google "golang.org/x/oauth2/google" diff --git a/connector-wallet/go.mod b/connector-wallet/go.mod index 1f47d29b..c7b1ea7a 100644 --- a/connector-wallet/go.mod +++ b/connector-wallet/go.mod @@ -3,8 +3,8 @@ module github.com/apache/answer-plugins/connector-wallet go 1.22.0 require ( - github.com/apache/answer v1.4.1 - github.com/apache/answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 + github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 github.com/i-lucifer/crypto v0.0.2 golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 ) diff --git a/connector-wallet/go.sum b/connector-wallet/go.sum index 1dbdb2e8..71c07ba5 100644 --- a/connector-wallet/go.sum +++ b/connector-wallet/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 h1:TmUPU0tX3VzbUO7rCBW3hJDUGO/WOI343zcbymIWQSM= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091/go.mod h1:ehAJmrP4X9kBJKlYzTtRrwRbKeRqjnHxyYlhf11yzfw= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 h1:jVqxzyeHvYxAT30vGfHXtZLNoi9qAWnvTtuMSj6pFys= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954/go.mod h1:wQEKNXVa/BKKq5yro9qo5bFiO3/SW1noORabxEndk3o= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/editor-chart/go.mod b/editor-chart/go.mod index 93b387ac..98846d50 100644 --- a/editor-chart/go.mod +++ b/editor-chart/go.mod @@ -3,8 +3,8 @@ module github.com/apache/answer-plugins/editor-chart go 1.22.0 require ( - github.com/apache/answer v1.4.1 - github.com/apache/answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 + github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 ) require ( diff --git a/editor-chart/go.sum b/editor-chart/go.sum index 144856eb..7f947b0b 100644 --- a/editor-chart/go.sum +++ b/editor-chart/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 h1:TmUPU0tX3VzbUO7rCBW3hJDUGO/WOI343zcbymIWQSM= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091/go.mod h1:ehAJmrP4X9kBJKlYzTtRrwRbKeRqjnHxyYlhf11yzfw= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 h1:jVqxzyeHvYxAT30vGfHXtZLNoi9qAWnvTtuMSj6pFys= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954/go.mod h1:wQEKNXVa/BKKq5yro9qo5bFiO3/SW1noORabxEndk3o= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/editor-formula/go.mod b/editor-formula/go.mod index 0ce1aef3..78cbfce4 100644 --- a/editor-formula/go.mod +++ b/editor-formula/go.mod @@ -3,8 +3,8 @@ module github.com/apache/answer-plugins/editor-formula go 1.22.0 require ( - github.com/apache/answer v1.4.1 - github.com/apache/answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 + github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 ) require ( diff --git a/editor-formula/go.sum b/editor-formula/go.sum index 144856eb..7f947b0b 100644 --- a/editor-formula/go.sum +++ b/editor-formula/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 h1:TmUPU0tX3VzbUO7rCBW3hJDUGO/WOI343zcbymIWQSM= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091/go.mod h1:ehAJmrP4X9kBJKlYzTtRrwRbKeRqjnHxyYlhf11yzfw= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 h1:jVqxzyeHvYxAT30vGfHXtZLNoi9qAWnvTtuMSj6pFys= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954/go.mod h1:wQEKNXVa/BKKq5yro9qo5bFiO3/SW1noORabxEndk3o= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/embed-basic/go.mod b/embed-basic/go.mod index 8ca2ae92..f721d439 100644 --- a/embed-basic/go.mod +++ b/embed-basic/go.mod @@ -3,8 +3,8 @@ module github.com/apache/answer-plugins/embed-basic go 1.22.0 require ( - github.com/apache/answer v1.4.1 - github.com/apache/answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 + github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 github.com/gin-gonic/gin v1.10.0 ) diff --git a/embed-basic/go.sum b/embed-basic/go.sum index 144856eb..7f947b0b 100644 --- a/embed-basic/go.sum +++ b/embed-basic/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 h1:TmUPU0tX3VzbUO7rCBW3hJDUGO/WOI343zcbymIWQSM= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091/go.mod h1:ehAJmrP4X9kBJKlYzTtRrwRbKeRqjnHxyYlhf11yzfw= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 h1:jVqxzyeHvYxAT30vGfHXtZLNoi9qAWnvTtuMSj6pFys= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954/go.mod h1:wQEKNXVa/BKKq5yro9qo5bFiO3/SW1noORabxEndk3o= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/notification-dingtalk/dingtalk_notification.go b/notification-dingtalk/dingtalk_notification.go index 33646544..8db36770 100644 --- a/notification-dingtalk/dingtalk_notification.go +++ b/notification-dingtalk/dingtalk_notification.go @@ -21,11 +21,12 @@ package dingtalk import ( "embed" - "github.com/apache/answer-plugins/util" "strings" dingtalkI18n "github.com/apache/answer-plugins/notification-dingtalk/i18n" + "github.com/apache/answer-plugins/util" "github.com/apache/answer/plugin" + "github.com/go-resty/resty/v2" "github.com/segmentfault/pacman/i18n" "github.com/segmentfault/pacman/log" ) diff --git a/notification-dingtalk/go.mod b/notification-dingtalk/go.mod index 56fe7b7e..07cdf020 100644 --- a/notification-dingtalk/go.mod +++ b/notification-dingtalk/go.mod @@ -3,10 +3,11 @@ module github.com/apache/answer-plugins/notification-dingtalk go 1.22.0 require ( - github.com/apache/answer v1.4.1 - github.com/apache/answer-plugins/util v1.0.2 - github.com/go-resty/resty/v2 v2.15.3 + github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 + github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 + github.com/go-resty/resty/v2 v2.16.2 github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f + gopkg.in/resty.v1 v1.12.0 ) require ( diff --git a/notification-dingtalk/go.sum b/notification-dingtalk/go.sum index 39477f97..1a6af8ec 100644 --- a/notification-dingtalk/go.sum +++ b/notification-dingtalk/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 h1:TmUPU0tX3VzbUO7rCBW3hJDUGO/WOI343zcbymIWQSM= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091/go.mod h1:ehAJmrP4X9kBJKlYzTtRrwRbKeRqjnHxyYlhf11yzfw= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 h1:jVqxzyeHvYxAT30vGfHXtZLNoi9qAWnvTtuMSj6pFys= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954/go.mod h1:wQEKNXVa/BKKq5yro9qo5bFiO3/SW1noORabxEndk3o= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= @@ -36,8 +36,8 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= github.com/go-playground/validator/v10 v10.22.1 h1:40JcKH+bBNGFczGuoBYgX4I6m/i27HYW8P9FDk5PbgA= github.com/go-playground/validator/v10 v10.22.1/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= -github.com/go-resty/resty/v2 v2.15.3 h1:bqff+hcqAflpiF591hhJzNdkRsFhlB96CYfBwSFvql8= -github.com/go-resty/resty/v2 v2.15.3/go.mod h1:0fHAoK7JoBy/Ch36N8VFeMsK7xQOHhvWaC3iOktwmIU= +github.com/go-resty/resty/v2 v2.16.2 h1:CpRqTjIzq/rweXUt9+GxzzQdlkqMdt8Lm/fuK/CAbAg= +github.com/go-resty/resty/v2 v2.16.2/go.mod h1:0fHAoK7JoBy/Ch36N8VFeMsK7xQOHhvWaC3iOktwmIU= github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA= github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -103,6 +103,7 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= @@ -140,6 +141,8 @@ google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWn gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/resty.v1 v1.12.0 h1:CuXP0Pjfw9rOuY6EP+UvtNvt5DSqHpIxILZKT/quCZI= +gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/notification-lark/go.mod b/notification-lark/go.mod index 0d16a008..b9b43365 100644 --- a/notification-lark/go.mod +++ b/notification-lark/go.mod @@ -3,8 +3,8 @@ module github.com/apache/answer-plugins/notification-lark go 1.22.0 require ( - github.com/apache/answer v1.4.1 - github.com/apache/answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 + github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 github.com/larksuite/oapi-sdk-go/v3 v3.3.1 github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f ) diff --git a/notification-lark/go.sum b/notification-lark/go.sum index 473f7c07..060e8dc0 100644 --- a/notification-lark/go.sum +++ b/notification-lark/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 h1:TmUPU0tX3VzbUO7rCBW3hJDUGO/WOI343zcbymIWQSM= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091/go.mod h1:ehAJmrP4X9kBJKlYzTtRrwRbKeRqjnHxyYlhf11yzfw= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 h1:jVqxzyeHvYxAT30vGfHXtZLNoi9qAWnvTtuMSj6pFys= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954/go.mod h1:wQEKNXVa/BKKq5yro9qo5bFiO3/SW1noORabxEndk3o= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/notification-slack/go.mod b/notification-slack/go.mod index 6f2e2e71..43782104 100644 --- a/notification-slack/go.mod +++ b/notification-slack/go.mod @@ -3,9 +3,9 @@ module github.com/apache/answer-plugins/notification-slack go 1.22.0 require ( - github.com/apache/answer v1.4.1 - github.com/apache/answer-plugins/util v1.0.2 - github.com/go-resty/resty/v2 v2.15.0 + github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 + github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 + github.com/go-resty/resty/v2 v2.16.2 github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f ) diff --git a/notification-slack/go.sum b/notification-slack/go.sum index 89373923..e90a146c 100644 --- a/notification-slack/go.sum +++ b/notification-slack/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 h1:TmUPU0tX3VzbUO7rCBW3hJDUGO/WOI343zcbymIWQSM= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091/go.mod h1:ehAJmrP4X9kBJKlYzTtRrwRbKeRqjnHxyYlhf11yzfw= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 h1:jVqxzyeHvYxAT30vGfHXtZLNoi9qAWnvTtuMSj6pFys= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954/go.mod h1:wQEKNXVa/BKKq5yro9qo5bFiO3/SW1noORabxEndk3o= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= @@ -36,8 +36,8 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= github.com/go-playground/validator/v10 v10.22.1 h1:40JcKH+bBNGFczGuoBYgX4I6m/i27HYW8P9FDk5PbgA= github.com/go-playground/validator/v10 v10.22.1/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= -github.com/go-resty/resty/v2 v2.15.0 h1:clPQLZ2x9h4yGY81IzpMPnty+xoGyFaDg0XMkCsHf90= -github.com/go-resty/resty/v2 v2.15.0/go.mod h1:0fHAoK7JoBy/Ch36N8VFeMsK7xQOHhvWaC3iOktwmIU= +github.com/go-resty/resty/v2 v2.16.2 h1:CpRqTjIzq/rweXUt9+GxzzQdlkqMdt8Lm/fuK/CAbAg= +github.com/go-resty/resty/v2 v2.16.2/go.mod h1:0fHAoK7JoBy/Ch36N8VFeMsK7xQOHhvWaC3iOktwmIU= github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA= github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= diff --git a/notification-slack/slack_notification.go b/notification-slack/slack_notification.go index 0f5c74f9..6d1ba9ac 100644 --- a/notification-slack/slack_notification.go +++ b/notification-slack/slack_notification.go @@ -26,6 +26,7 @@ import ( slackI18n "github.com/apache/answer-plugins/notification-slack/i18n" "github.com/apache/answer-plugins/util" "github.com/apache/answer/plugin" + "github.com/go-resty/resty/v2" "github.com/segmentfault/pacman/i18n" "github.com/segmentfault/pacman/log" ) diff --git a/notification-wecom/go.mod b/notification-wecom/go.mod index e8c7ddb0..e5995baa 100644 --- a/notification-wecom/go.mod +++ b/notification-wecom/go.mod @@ -3,10 +3,11 @@ module github.com/apache/answer-plugins/notification-wecom go 1.22.0 require ( - github.com/apache/answer v1.4.1 - github.com/apache/answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 + github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 github.com/go-resty/resty/v2 v2.16.2 github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f + gopkg.in/resty.v1 v1.12.0 ) require ( diff --git a/notification-wecom/go.sum b/notification-wecom/go.sum index 70faf436..1a6af8ec 100644 --- a/notification-wecom/go.sum +++ b/notification-wecom/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 h1:TmUPU0tX3VzbUO7rCBW3hJDUGO/WOI343zcbymIWQSM= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091/go.mod h1:ehAJmrP4X9kBJKlYzTtRrwRbKeRqjnHxyYlhf11yzfw= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 h1:jVqxzyeHvYxAT30vGfHXtZLNoi9qAWnvTtuMSj6pFys= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954/go.mod h1:wQEKNXVa/BKKq5yro9qo5bFiO3/SW1noORabxEndk3o= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= @@ -103,6 +103,7 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= @@ -140,6 +141,8 @@ google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWn gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/resty.v1 v1.12.0 h1:CuXP0Pjfw9rOuY6EP+UvtNvt5DSqHpIxILZKT/quCZI= +gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/notification-wecom/notification_wecom.go b/notification-wecom/notification_wecom.go index b5506d26..0de5a8b2 100644 --- a/notification-wecom/notification_wecom.go +++ b/notification-wecom/notification_wecom.go @@ -21,11 +21,12 @@ package wecom import ( "embed" - "github.com/apache/answer/plugin" "strings" wecomI18n "github.com/apache/answer-plugins/notification-wecom/i18n" "github.com/apache/answer-plugins/util" + "github.com/apache/answer/plugin" + "github.com/go-resty/resty/v2" "github.com/segmentfault/pacman/i18n" "github.com/segmentfault/pacman/log" ) diff --git a/render-markdown-codehighlight/go.mod b/render-markdown-codehighlight/go.mod index edaf6c5a..edf70bd1 100644 --- a/render-markdown-codehighlight/go.mod +++ b/render-markdown-codehighlight/go.mod @@ -3,8 +3,8 @@ module github.com/apache/answer-plugins/render-markdown-codehighlight go 1.22.0 require ( - github.com/apache/answer v1.4.1 - github.com/apache/answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 + github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 github.com/gin-gonic/gin v1.10.0 ) diff --git a/render-markdown-codehighlight/go.sum b/render-markdown-codehighlight/go.sum index 144856eb..7f947b0b 100644 --- a/render-markdown-codehighlight/go.sum +++ b/render-markdown-codehighlight/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 h1:TmUPU0tX3VzbUO7rCBW3hJDUGO/WOI343zcbymIWQSM= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091/go.mod h1:ehAJmrP4X9kBJKlYzTtRrwRbKeRqjnHxyYlhf11yzfw= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 h1:jVqxzyeHvYxAT30vGfHXtZLNoi9qAWnvTtuMSj6pFys= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954/go.mod h1:wQEKNXVa/BKKq5yro9qo5bFiO3/SW1noORabxEndk3o= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/render-markdown-codehighlight/renderMarkdownCodehighlight.go b/render-markdown-codehighlight/renderMarkdownCodehighlight.go index 3f8fb8bf..17aa0c7f 100644 --- a/render-markdown-codehighlight/renderMarkdownCodehighlight.go +++ b/render-markdown-codehighlight/renderMarkdownCodehighlight.go @@ -22,11 +22,12 @@ package render_markdown_codehighlight import ( "embed" "encoding/json" + "strings" + "github.com/apache/answer-plugins/render-markdown-codehighlight/i18n" "github.com/apache/answer-plugins/util" "github.com/apache/answer/plugin" "github.com/gin-gonic/gin" - "strings" ) //go:embed info.yaml diff --git a/reviewer-akismet/basic.go b/reviewer-akismet/basic.go index f6d15fd5..0f44e5ac 100644 --- a/reviewer-akismet/basic.go +++ b/reviewer-akismet/basic.go @@ -22,9 +22,9 @@ package basic import ( "embed" "encoding/json" - "github.com/apache/answer-plugins/util" "github.com/apache/answer-plugins/reviewer-akismet/i18n" + "github.com/apache/answer-plugins/util" "github.com/apache/answer/plugin" myI18n "github.com/segmentfault/pacman/i18n" "github.com/segmentfault/pacman/log" diff --git a/reviewer-akismet/go.mod b/reviewer-akismet/go.mod index dc9e27ee..fb1afd0f 100644 --- a/reviewer-akismet/go.mod +++ b/reviewer-akismet/go.mod @@ -3,9 +3,8 @@ module github.com/apache/answer-plugins/reviewer-akismet go 1.22.0 require ( - github.com/apache/answer v1.4.1 - github.com/apache/answer-plugins/util v1.0.2 - github.com/go-resty/resty/v2 v2.12.0 + github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 + github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f ) diff --git a/reviewer-akismet/go.sum b/reviewer-akismet/go.sum index 042580ca..ef8d1554 100644 --- a/reviewer-akismet/go.sum +++ b/reviewer-akismet/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 h1:TmUPU0tX3VzbUO7rCBW3hJDUGO/WOI343zcbymIWQSM= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091/go.mod h1:ehAJmrP4X9kBJKlYzTtRrwRbKeRqjnHxyYlhf11yzfw= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 h1:jVqxzyeHvYxAT30vGfHXtZLNoi9qAWnvTtuMSj6pFys= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954/go.mod h1:wQEKNXVa/BKKq5yro9qo5bFiO3/SW1noORabxEndk3o= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= @@ -35,8 +35,6 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= github.com/go-playground/validator/v10 v10.22.1 h1:40JcKH+bBNGFczGuoBYgX4I6m/i27HYW8P9FDk5PbgA= github.com/go-playground/validator/v10 v10.22.1/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= -github.com/go-resty/resty/v2 v2.12.0 h1:rsVL8P90LFvkUYq/V5BTVe203WfRIU4gvcf+yfzJzGA= -github.com/go-resty/resty/v2 v2.12.0/go.mod h1:o0yGPrkS3lOe1+eFajk6kBW8ScXzwU3hD69/gt2yB/0= github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA= github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -100,25 +98,17 @@ golang.org/x/arch v0.10.0 h1:S3huipmSclq3PJMNe76NGwkBR504WFkQ5dhzWzP8ZW8= golang.org/x/arch v0.10.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= -golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= -golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -126,33 +116,20 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= -golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= -golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= -golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= diff --git a/reviewer-baidu/basic.go b/reviewer-baidu/basic.go index 7e92d178..80241d88 100644 --- a/reviewer-baidu/basic.go +++ b/reviewer-baidu/basic.go @@ -22,9 +22,9 @@ package basic import ( "embed" "encoding/json" - "github.com/apache/answer-plugins/util" "github.com/apache/answer-plugins/reviewer-baidu/i18n" + "github.com/apache/answer-plugins/util" "github.com/apache/answer/plugin" "github.com/lufei/baidu-golang-sdk/aip/censor" myI18n "github.com/segmentfault/pacman/i18n" diff --git a/reviewer-baidu/go.mod b/reviewer-baidu/go.mod index b1a37a62..c1074084 100644 --- a/reviewer-baidu/go.mod +++ b/reviewer-baidu/go.mod @@ -3,8 +3,8 @@ module github.com/apache/answer-plugins/reviewer-baidu go 1.22.0 require ( - github.com/apache/answer v1.4.1 - github.com/apache/answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 + github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 github.com/lufei/baidu-golang-sdk v0.0.0-20241007032158-d85deddc0d61 github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f ) diff --git a/reviewer-baidu/go.sum b/reviewer-baidu/go.sum index 40e9fd76..a929be61 100644 --- a/reviewer-baidu/go.sum +++ b/reviewer-baidu/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 h1:TmUPU0tX3VzbUO7rCBW3hJDUGO/WOI343zcbymIWQSM= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091/go.mod h1:ehAJmrP4X9kBJKlYzTtRrwRbKeRqjnHxyYlhf11yzfw= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 h1:jVqxzyeHvYxAT30vGfHXtZLNoi9qAWnvTtuMSj6pFys= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954/go.mod h1:wQEKNXVa/BKKq5yro9qo5bFiO3/SW1noORabxEndk3o= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/reviewer-basic/basic.go b/reviewer-basic/basic.go index d12d6338..e3f47e95 100644 --- a/reviewer-basic/basic.go +++ b/reviewer-basic/basic.go @@ -23,10 +23,10 @@ import ( "embed" "encoding/json" "fmt" - "github.com/apache/answer-plugins/util" "strings" "github.com/apache/answer-plugins/reviewer-basic/i18n" + "github.com/apache/answer-plugins/util" "github.com/apache/answer/plugin" myI18n "github.com/segmentfault/pacman/i18n" ) diff --git a/reviewer-basic/go.mod b/reviewer-basic/go.mod index 983a0d47..b604870c 100644 --- a/reviewer-basic/go.mod +++ b/reviewer-basic/go.mod @@ -3,8 +3,8 @@ module github.com/apache/answer-plugins/reviewer-basic go 1.22.0 require ( - github.com/apache/answer v1.4.1 - github.com/apache/answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 + github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f ) diff --git a/reviewer-basic/go.sum b/reviewer-basic/go.sum index 64aa05d7..ef8d1554 100644 --- a/reviewer-basic/go.sum +++ b/reviewer-basic/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 h1:TmUPU0tX3VzbUO7rCBW3hJDUGO/WOI343zcbymIWQSM= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091/go.mod h1:ehAJmrP4X9kBJKlYzTtRrwRbKeRqjnHxyYlhf11yzfw= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 h1:jVqxzyeHvYxAT30vGfHXtZLNoi9qAWnvTtuMSj6pFys= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954/go.mod h1:wQEKNXVa/BKKq5yro9qo5bFiO3/SW1noORabxEndk3o= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/search-algolia/algolia.go b/search-algolia/algolia.go index d3069492..c6e3795a 100644 --- a/search-algolia/algolia.go +++ b/search-algolia/algolia.go @@ -22,13 +22,13 @@ package algolia import ( "context" "embed" - "github.com/apache/answer-plugins/util" "strconv" "strings" "github.com/algolia/algoliasearch-client-go/v3/algolia/opt" "github.com/algolia/algoliasearch-client-go/v3/algolia/search" "github.com/apache/answer-plugins/search-algolia/i18n" + "github.com/apache/answer-plugins/util" "github.com/apache/answer/plugin" ) diff --git a/search-algolia/go.mod b/search-algolia/go.mod index 31f406d3..b39b0589 100644 --- a/search-algolia/go.mod +++ b/search-algolia/go.mod @@ -4,8 +4,8 @@ go 1.22.0 require ( github.com/algolia/algoliasearch-client-go/v3 v3.29.2 - github.com/apache/answer v1.4.1 - github.com/apache/answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 + github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f ) diff --git a/search-algolia/go.sum b/search-algolia/go.sum index e6bb06e7..02cf57bb 100644 --- a/search-algolia/go.sum +++ b/search-algolia/go.sum @@ -4,10 +4,10 @@ github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2Q github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= github.com/algolia/algoliasearch-client-go/v3 v3.29.2 h1:lmAD/gNui2TLoT8az22ECr056EjoBR0RJQssNezyniQ= github.com/algolia/algoliasearch-client-go/v3 v3.29.2/go.mod h1:i7tLoP7TYDmHX3Q7vkIOL4syVse/k5VJ+k0i8WqFiJk= -github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 h1:TmUPU0tX3VzbUO7rCBW3hJDUGO/WOI343zcbymIWQSM= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091/go.mod h1:ehAJmrP4X9kBJKlYzTtRrwRbKeRqjnHxyYlhf11yzfw= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 h1:jVqxzyeHvYxAT30vGfHXtZLNoi9qAWnvTtuMSj6pFys= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954/go.mod h1:wQEKNXVa/BKKq5yro9qo5bFiO3/SW1noORabxEndk3o= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/search-elasticsearch/es.go b/search-elasticsearch/es.go index 64393a19..cfc5d0fd 100644 --- a/search-elasticsearch/es.go +++ b/search-elasticsearch/es.go @@ -24,12 +24,13 @@ import ( "embed" "encoding/json" "fmt" - "github.com/apache/answer-plugins/util" "strings" "sync" "github.com/apache/answer-plugins/search-elasticsearch/i18n" + "github.com/apache/answer-plugins/util" "github.com/apache/answer/plugin" + "github.com/olivere/elastic/v7" "github.com/segmentfault/pacman/log" ) diff --git a/search-elasticsearch/go.mod b/search-elasticsearch/go.mod index c56a2c0f..1ce4d15c 100644 --- a/search-elasticsearch/go.mod +++ b/search-elasticsearch/go.mod @@ -3,8 +3,8 @@ module github.com/apache/answer-plugins/search-elasticsearch go 1.22.0 require ( - github.com/apache/answer v1.4.1 - github.com/apache/answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 + github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 github.com/olivere/elastic/v7 v7.0.32 github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f ) diff --git a/search-elasticsearch/go.sum b/search-elasticsearch/go.sum index de3dfda0..1c95d481 100644 --- a/search-elasticsearch/go.sum +++ b/search-elasticsearch/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 h1:TmUPU0tX3VzbUO7rCBW3hJDUGO/WOI343zcbymIWQSM= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091/go.mod h1:ehAJmrP4X9kBJKlYzTtRrwRbKeRqjnHxyYlhf11yzfw= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 h1:jVqxzyeHvYxAT30vGfHXtZLNoi9qAWnvTtuMSj6pFys= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954/go.mod h1:wQEKNXVa/BKKq5yro9qo5bFiO3/SW1noORabxEndk3o= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/search-elasticsearch/sync.go b/search-elasticsearch/sync.go index 00e6fa08..f99bda1d 100644 --- a/search-elasticsearch/sync.go +++ b/search-elasticsearch/sync.go @@ -21,6 +21,7 @@ package es import ( "context" + "github.com/apache/answer/plugin" "github.com/segmentfault/pacman/log" ) diff --git a/search-meilisearch/go.mod b/search-meilisearch/go.mod index 66e6b0d0..b708340b 100644 --- a/search-meilisearch/go.mod +++ b/search-meilisearch/go.mod @@ -3,8 +3,8 @@ module github.com/apache/answer-plugins/search-meilisearch go 1.22.0 require ( - github.com/apache/answer v1.4.1 - github.com/apache/answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 + github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 github.com/meilisearch/meilisearch-go v0.25.0 github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f ) diff --git a/search-meilisearch/go.sum b/search-meilisearch/go.sum index 7c246a6a..d7f006aa 100644 --- a/search-meilisearch/go.sum +++ b/search-meilisearch/go.sum @@ -5,10 +5,10 @@ github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHC github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= -github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 h1:TmUPU0tX3VzbUO7rCBW3hJDUGO/WOI343zcbymIWQSM= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091/go.mod h1:ehAJmrP4X9kBJKlYzTtRrwRbKeRqjnHxyYlhf11yzfw= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 h1:jVqxzyeHvYxAT30vGfHXtZLNoi9qAWnvTtuMSj6pFys= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954/go.mod h1:wQEKNXVa/BKKq5yro9qo5bFiO3/SW1noORabxEndk3o= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/search-meilisearch/meilisearch.go b/search-meilisearch/meilisearch.go index ce7c14f4..4926540d 100644 --- a/search-meilisearch/meilisearch.go +++ b/search-meilisearch/meilisearch.go @@ -24,12 +24,13 @@ import ( "embed" "encoding/json" "fmt" - "github.com/apache/answer-plugins/util" "strings" "sync" "github.com/apache/answer-plugins/search-meilisearch/i18n" + "github.com/apache/answer-plugins/util" "github.com/apache/answer/plugin" + "github.com/meilisearch/meilisearch-go" "github.com/segmentfault/pacman/errors" "github.com/segmentfault/pacman/log" ) diff --git a/storage-aliyunoss/aliyunoss.go b/storage-aliyunoss/aliyunoss.go index 4fc41e56..af7cf369 100644 --- a/storage-aliyunoss/aliyunoss.go +++ b/storage-aliyunoss/aliyunoss.go @@ -25,7 +25,6 @@ import ( "encoding/hex" "encoding/json" "fmt" - "github.com/apache/answer-plugins/util" "path/filepath" "strconv" "strings" @@ -33,6 +32,7 @@ import ( "github.com/aliyun/aliyun-oss-go-sdk/oss" "github.com/apache/answer-plugins/storage-aliyunoss/i18n" + "github.com/apache/answer-plugins/util" "github.com/apache/answer/plugin" ) diff --git a/storage-aliyunoss/go.mod b/storage-aliyunoss/go.mod index d84224d3..afaad944 100644 --- a/storage-aliyunoss/go.mod +++ b/storage-aliyunoss/go.mod @@ -4,8 +4,8 @@ go 1.22.0 require ( github.com/aliyun/aliyun-oss-go-sdk v2.2.6+incompatible - github.com/apache/answer v1.4.1 - github.com/apache/answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 + github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 ) require ( diff --git a/storage-aliyunoss/go.sum b/storage-aliyunoss/go.sum index fd0b2c84..9028a202 100644 --- a/storage-aliyunoss/go.sum +++ b/storage-aliyunoss/go.sum @@ -4,10 +4,10 @@ github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2Q github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= github.com/aliyun/aliyun-oss-go-sdk v2.2.6+incompatible h1:KXeJoM1wo9I/6xPTyt6qCxoSZnmASiAjlrr0dyTUKt8= github.com/aliyun/aliyun-oss-go-sdk v2.2.6+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8= -github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 h1:TmUPU0tX3VzbUO7rCBW3hJDUGO/WOI343zcbymIWQSM= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091/go.mod h1:ehAJmrP4X9kBJKlYzTtRrwRbKeRqjnHxyYlhf11yzfw= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 h1:jVqxzyeHvYxAT30vGfHXtZLNoi9qAWnvTtuMSj6pFys= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954/go.mod h1:wQEKNXVa/BKKq5yro9qo5bFiO3/SW1noORabxEndk3o= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/storage-s3/go.mod b/storage-s3/go.mod index 6f952cf5..1db675e7 100644 --- a/storage-s3/go.mod +++ b/storage-s3/go.mod @@ -3,8 +3,8 @@ module github.com/apache/answer-plugins/storage-s3 go 1.22.0 require ( - github.com/apache/answer v1.4.1 - github.com/apache/answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 + github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 github.com/aws/aws-sdk-go v1.44.314 ) diff --git a/storage-s3/go.sum b/storage-s3/go.sum index cdc538b8..34ab9115 100644 --- a/storage-s3/go.sum +++ b/storage-s3/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 h1:TmUPU0tX3VzbUO7rCBW3hJDUGO/WOI343zcbymIWQSM= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091/go.mod h1:ehAJmrP4X9kBJKlYzTtRrwRbKeRqjnHxyYlhf11yzfw= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 h1:jVqxzyeHvYxAT30vGfHXtZLNoi9qAWnvTtuMSj6pFys= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954/go.mod h1:wQEKNXVa/BKKq5yro9qo5bFiO3/SW1noORabxEndk3o= github.com/aws/aws-sdk-go v1.44.314 h1:d/5Jyk/Fb+PBd/4nzQg0JuC2W4A0knrDIzBgK/ggAow= github.com/aws/aws-sdk-go v1.44.314/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= diff --git a/storage-s3/s3.go b/storage-s3/s3.go index f47b1177..7163b94a 100644 --- a/storage-s3/s3.go +++ b/storage-s3/s3.go @@ -25,13 +25,13 @@ import ( "encoding/hex" "encoding/json" "fmt" - "github.com/apache/answer-plugins/util" "path/filepath" "strconv" "strings" "time" "github.com/apache/answer-plugins/storage-s3/i18n" + "github.com/apache/answer-plugins/util" "github.com/apache/answer/plugin" ) diff --git a/storage-tencentyuncos/go.mod b/storage-tencentyuncos/go.mod index 1006cbab..ae1544b7 100644 --- a/storage-tencentyuncos/go.mod +++ b/storage-tencentyuncos/go.mod @@ -3,8 +3,8 @@ module github.com/apache/answer-plugins/storage-tencentyuncos go 1.22.0 require ( - github.com/apache/answer v1.4.1 - github.com/apache/answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 + github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 github.com/tencentyun/cos-go-sdk-v5 v0.7.55 ) diff --git a/storage-tencentyuncos/go.sum b/storage-tencentyuncos/go.sum index 282bc356..242d2e3a 100644 --- a/storage-tencentyuncos/go.sum +++ b/storage-tencentyuncos/go.sum @@ -3,10 +3,10 @@ github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbi github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod h1:1pk82RBxDY/JZnPQrtqHlUFfCctgdorsd9M06fMynOM= -github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 h1:TmUPU0tX3VzbUO7rCBW3hJDUGO/WOI343zcbymIWQSM= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091/go.mod h1:ehAJmrP4X9kBJKlYzTtRrwRbKeRqjnHxyYlhf11yzfw= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 h1:jVqxzyeHvYxAT30vGfHXtZLNoi9qAWnvTtuMSj6pFys= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954/go.mod h1:wQEKNXVa/BKKq5yro9qo5bFiO3/SW1noORabxEndk3o= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/storage-tencentyuncos/tencentyuncos.go b/storage-tencentyuncos/tencentyuncos.go index 353da838..627d59ed 100644 --- a/storage-tencentyuncos/tencentyuncos.go +++ b/storage-tencentyuncos/tencentyuncos.go @@ -25,7 +25,6 @@ import ( "encoding/hex" "encoding/json" "fmt" - "github.com/apache/answer-plugins/util" "net/http" "net/url" "path/filepath" @@ -34,7 +33,9 @@ import ( "time" "github.com/apache/answer-plugins/storage-tencentyuncos/i18n" + "github.com/apache/answer-plugins/util" "github.com/apache/answer/plugin" + "github.com/tencentyun/cos-go-sdk-v5" ) //go:embed info.yaml diff --git a/user-center-slack/client.go b/user-center-slack/client.go index 32adb8a1..25880a34 100644 --- a/user-center-slack/client.go +++ b/user-center-slack/client.go @@ -27,6 +27,7 @@ import ( "net/url" "github.com/apache/answer/plugin" + "github.com/go-resty/resty/v2" "github.com/segmentfault/pacman/log" ) diff --git a/user-center-slack/go.mod b/user-center-slack/go.mod index 2199e668..00e31941 100644 --- a/user-center-slack/go.mod +++ b/user-center-slack/go.mod @@ -3,8 +3,8 @@ module github.com/apache/answer-plugins/user-center-slack go 1.22.0 require ( - github.com/apache/answer v1.4.1 - github.com/apache/answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 + github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 github.com/gin-gonic/gin v1.10.0 github.com/go-resty/resty/v2 v2.15.1 github.com/patrickmn/go-cache v2.1.0+incompatible diff --git a/user-center-slack/go.sum b/user-center-slack/go.sum index 5f92ec43..0ab27a79 100644 --- a/user-center-slack/go.sum +++ b/user-center-slack/go.sum @@ -2,10 +2,10 @@ github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/LinkinStars/go-i18n/v2 v2.2.2 h1:ZfjpzbW13dv6btv3RALKZkpN9A+7K1JA//2QcNeWaxU= github.com/LinkinStars/go-i18n/v2 v2.2.2/go.mod h1:hLglSJ4/3M0Y7ZVcoEJI+OwqkglHCA32DdjuJJR2LbM= -github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 h1:TmUPU0tX3VzbUO7rCBW3hJDUGO/WOI343zcbymIWQSM= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091/go.mod h1:ehAJmrP4X9kBJKlYzTtRrwRbKeRqjnHxyYlhf11yzfw= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 h1:jVqxzyeHvYxAT30vGfHXtZLNoi9qAWnvTtuMSj6pFys= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954/go.mod h1:wQEKNXVa/BKKq5yro9qo5bFiO3/SW1noORabxEndk3o= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= diff --git a/user-center-slack/slack_user_center.go b/user-center-slack/slack_user_center.go index b7db71e5..d7dd66e1 100644 --- a/user-center-slack/slack_user_center.go +++ b/user-center-slack/slack_user_center.go @@ -26,11 +26,11 @@ import ( "sync" "time" - "github.com/apache/answer-plugins/util" - "github.com/apache/answer-plugins/user-center-slack/i18n" + "github.com/apache/answer-plugins/util" "github.com/apache/answer/plugin" "github.com/gin-gonic/gin" + "github.com/patrickmn/go-cache" "github.com/segmentfault/pacman/log" ) diff --git a/user-center-wecom/go.mod b/user-center-wecom/go.mod index 7036fbb0..3ff68223 100644 --- a/user-center-wecom/go.mod +++ b/user-center-wecom/go.mod @@ -3,8 +3,8 @@ module github.com/apache/answer-plugins/user-center-wecom go 1.22.0 require ( - github.com/apache/answer v1.4.1 - github.com/apache/answer-plugins/util v1.0.2 + github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 + github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 github.com/gin-gonic/gin v1.10.0 github.com/go-resty/resty/v2 v2.12.0 github.com/patrickmn/go-cache v2.1.0+incompatible diff --git a/user-center-wecom/go.sum b/user-center-wecom/go.sum index cd4bb044..104e6a86 100644 --- a/user-center-wecom/go.sum +++ b/user-center-wecom/go.sum @@ -6,10 +6,10 @@ github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a h1:HbKu58rmZp github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc= github.com/alicebob/miniredis/v2 v2.30.0 h1:uA3uhDbCxfO9+DI/DuGeAMr9qI+noVWwGPNTFuKID5M= github.com/alicebob/miniredis/v2 v2.30.0/go.mod h1:84TWKZlxYkfgMucPBf5SOQBYJceZeQRFIaQgNMiCX6Q= -github.com/apache/answer v1.4.1 h1:O7BJyhLmc0JxYgjBz/vkapN2vtI0ylFx+PdOzqROM0c= -github.com/apache/answer v1.4.1/go.mod h1:L0GTnyO7ykalUVJkApwtbWGLfsknwSyTKdJG5V4x/d8= -github.com/apache/answer-plugins/util v1.0.2 h1:PontocVaiEm+oTj+4aDonwWDZnxywUeHsaTwlQgclfA= -github.com/apache/answer-plugins/util v1.0.2/go.mod h1:KPMSiM4ec4uEl2njaGINYuSl6zVmHdvPB2nHUxVcQDo= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 h1:TmUPU0tX3VzbUO7rCBW3hJDUGO/WOI343zcbymIWQSM= +github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091/go.mod h1:ehAJmrP4X9kBJKlYzTtRrwRbKeRqjnHxyYlhf11yzfw= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 h1:jVqxzyeHvYxAT30vGfHXtZLNoi9qAWnvTtuMSj6pFys= +github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954/go.mod h1:wQEKNXVa/BKKq5yro9qo5bFiO3/SW1noORabxEndk3o= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d h1:pVrfxiGfwelyab6n21ZBkbkmbevaf+WvMIiR7sr97hw= diff --git a/user-center-wecom/wecom_user_center.go b/user-center-wecom/wecom_user_center.go index 899a7517..8e55c618 100644 --- a/user-center-wecom/wecom_user_center.go +++ b/user-center-wecom/wecom_user_center.go @@ -22,14 +22,15 @@ package wecom import ( "embed" "fmt" - "github.com/apache/answer-plugins/util" "net/http" "sync" "time" "github.com/apache/answer-plugins/user-center-wecom/i18n" + "github.com/apache/answer-plugins/util" "github.com/apache/answer/plugin" "github.com/gin-gonic/gin" + "github.com/patrickmn/go-cache" "github.com/segmentfault/pacman/log" ) From 3a78da97331f94356b8c7feeb4d77e5c7de9469b Mon Sep 17 00:00:00 2001 From: LinkinStars Date: Tue, 7 Jan 2025 12:15:21 +0800 Subject: [PATCH 19/20] upgrade(version): update version --- cache-redis/info.yaml | 2 +- captcha-basic/info.yaml | 2 +- captcha-google-v2/info.yaml | 2 +- cdn-aliyun/info.yaml | 2 +- cdn-s3/info.yaml | 2 +- connector-apache/info.yaml | 2 +- connector-basic/info.yaml | 2 +- connector-dingtalk/info.yaml | 2 +- connector-github/info.yaml | 2 +- connector-google/info.yaml | 2 +- connector-wallet/info.yaml | 2 +- editor-chart/info.yaml | 2 +- editor-formula/info.yaml | 2 +- embed-basic/info.yaml | 2 +- notification-dingtalk/info.yaml | 2 +- notification-lark/info.yaml | 2 +- notification-slack/info.yaml | 2 +- notification-wecom/info.yaml | 2 +- render-markdown-codehighlight/info.yaml | 2 +- reviewer-akismet/info.yaml | 2 +- reviewer-baidu/info.yaml | 2 +- reviewer-basic/info.yaml | 2 +- search-algolia/info.yaml | 2 +- search-elasticsearch/info.yaml | 2 +- search-meilisearch/info.yaml | 2 +- storage-aliyunoss/info.yaml | 2 +- storage-s3/info.yaml | 2 +- storage-tencentyuncos/info.yaml | 2 +- user-center-slack/info.yaml | 2 +- user-center-wecom/info.yaml | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/cache-redis/info.yaml b/cache-redis/info.yaml index aacbf8bc..4bccaa46 100644 --- a/cache-redis/info.yaml +++ b/cache-redis/info.yaml @@ -17,6 +17,6 @@ slug_name: redis_cache type: cache -version: 1.2.9 +version: 1.3.0 author: answerdev link: https://github.com/apache/answer-plugins/tree/main/cache-redis diff --git a/captcha-basic/info.yaml b/captcha-basic/info.yaml index 9e584b91..4e68f082 100644 --- a/captcha-basic/info.yaml +++ b/captcha-basic/info.yaml @@ -17,6 +17,6 @@ slug_name: basic_captcha type: captcha -version: 1.0.4 +version: 1.0.5 author: answerdev link: https://github.com/apache/answer-plugins/tree/main/captcha-basic \ No newline at end of file diff --git a/captcha-google-v2/info.yaml b/captcha-google-v2/info.yaml index 46ff2463..6f646f49 100644 --- a/captcha-google-v2/info.yaml +++ b/captcha-google-v2/info.yaml @@ -17,6 +17,6 @@ slug_name: google_v2_captcha type: captcha -version: 1.0.4 +version: 1.0.5 author: answerdev link: https://github.com/apache/answer-plugins/tree/main/captcha-google-v2 \ No newline at end of file diff --git a/cdn-aliyun/info.yaml b/cdn-aliyun/info.yaml index a62b4ca5..84769723 100644 --- a/cdn-aliyun/info.yaml +++ b/cdn-aliyun/info.yaml @@ -17,6 +17,6 @@ slug_name: aliyun_cdn type: cdn -version: 1.0.2 +version: 1.0.3 author: answerdev link: https://github.com/apache/answer-plugins/tree/main/cdn-aliyun diff --git a/cdn-s3/info.yaml b/cdn-s3/info.yaml index 1542365c..1b8780de 100644 --- a/cdn-s3/info.yaml +++ b/cdn-s3/info.yaml @@ -17,6 +17,6 @@ slug_name: s3_cdn type: cdn -version: 1.0.2 +version: 1.0.3 author: answerdev link: https://github.com/apache/answer-plugins/tree/main/cdn-s3 diff --git a/connector-apache/info.yaml b/connector-apache/info.yaml index 7d376a87..89a346e5 100644 --- a/connector-apache/info.yaml +++ b/connector-apache/info.yaml @@ -17,6 +17,6 @@ slug_name: apache_connector type: connector -version: 1.0.3 +version: 1.0.4 author: answerdev link: https://github.com/apache/answer-plugins/tree/main/connector-apache diff --git a/connector-basic/info.yaml b/connector-basic/info.yaml index 53475bd6..4d5d423e 100644 --- a/connector-basic/info.yaml +++ b/connector-basic/info.yaml @@ -17,6 +17,6 @@ slug_name: basic_connector type: connector -version: 1.2.8 +version: 1.2.9 author: answerdev link: https://github.com/apache/answer-plugins/tree/main/connector-basic diff --git a/connector-dingtalk/info.yaml b/connector-dingtalk/info.yaml index 030079ae..d529ddd9 100644 --- a/connector-dingtalk/info.yaml +++ b/connector-dingtalk/info.yaml @@ -17,6 +17,6 @@ slug_name: dingtalk_connector type: connector -version: 1.0.3 +version: 1.0.4 author: xbmlz link: https://github.com/apache/answer-plugins/tree/main/connector-dingtalk diff --git a/connector-github/info.yaml b/connector-github/info.yaml index 8c474a0c..0842d479 100644 --- a/connector-github/info.yaml +++ b/connector-github/info.yaml @@ -17,6 +17,6 @@ slug_name: github_connector type: connector -version: 1.2.9 +version: 1.2.10 author: answerdev link: https://github.com/apache/answer-plugins/tree/main/connector-github diff --git a/connector-google/info.yaml b/connector-google/info.yaml index 9dfc094b..826c3118 100644 --- a/connector-google/info.yaml +++ b/connector-google/info.yaml @@ -17,6 +17,6 @@ slug_name: google_connector type: connector -version: 1.2.9 +version: 1.2.10 author: answerdev link: https://github.com/apache/answer-plugins/tree/main/connector-google diff --git a/connector-wallet/info.yaml b/connector-wallet/info.yaml index fedf206f..f34ff620 100644 --- a/connector-wallet/info.yaml +++ b/connector-wallet/info.yaml @@ -17,7 +17,7 @@ slug_name: wallet_connector type: route -version: 1.0.0 +version: 1.0.1 author: i-Lucifer,ourai link: https://github.com/apache/answer-plugins/tree/main/connector-wallet route: /connector-wallet-auth diff --git a/editor-chart/info.yaml b/editor-chart/info.yaml index 9a401d40..998ad9d0 100644 --- a/editor-chart/info.yaml +++ b/editor-chart/info.yaml @@ -17,6 +17,6 @@ slug_name: chart_editor type: editor -version: 1.2.10 +version: 1.2.11 author: answerdev link: https://github.com/apache/answer-plugins/tree/main/editor-chart diff --git a/editor-formula/info.yaml b/editor-formula/info.yaml index db162194..3dd7c696 100644 --- a/editor-formula/info.yaml +++ b/editor-formula/info.yaml @@ -17,6 +17,6 @@ slug_name: formula_editor type: editor -version: 1.2.13 +version: 1.2.14 author: answerdev link: https://github.com/apache/answer-plugins/tree/main/editor-formula diff --git a/embed-basic/info.yaml b/embed-basic/info.yaml index 78fefb16..7e96d7a7 100644 --- a/embed-basic/info.yaml +++ b/embed-basic/info.yaml @@ -17,6 +17,6 @@ slug_name: basic_embed type: editor -version: 1.1.3 +version: 1.1.4 author: answerdev link: https://github.com/apache/answer-plugins/tree/main/embed-basic diff --git a/notification-dingtalk/info.yaml b/notification-dingtalk/info.yaml index 6bba42b7..963f7e87 100644 --- a/notification-dingtalk/info.yaml +++ b/notification-dingtalk/info.yaml @@ -17,6 +17,6 @@ slug_name: dingtalk_notification type: notification -version: 1.0.1 +version: 1.0.2 author: Luffy link: https://github.com/apache/answer-plugins/tree/main/notification-dingtalk diff --git a/notification-lark/info.yaml b/notification-lark/info.yaml index 98415c6e..f7b47be6 100644 --- a/notification-lark/info.yaml +++ b/notification-lark/info.yaml @@ -17,6 +17,6 @@ slug_name: lark_notification type: notification -version: 1.0.2 +version: 1.0.3 author: sonui link: https://github.com/apache/answer-plugins/tree/main/notification-lark diff --git a/notification-slack/info.yaml b/notification-slack/info.yaml index 96aa9d3f..8a10b542 100644 --- a/notification-slack/info.yaml +++ b/notification-slack/info.yaml @@ -17,6 +17,6 @@ slug_name: slack_notification type: notification -version: 1.0.3 +version: 1.0.4 author: answerdev link: https://github.com/apache/answer-plugins/tree/main/notification-slack diff --git a/notification-wecom/info.yaml b/notification-wecom/info.yaml index 380dd11b..1ced4986 100644 --- a/notification-wecom/info.yaml +++ b/notification-wecom/info.yaml @@ -17,6 +17,6 @@ slug_name: notification_wecom type: notification -version: 1.0.0 +version: 1.0.1 author: lihui link: https://github.com/apache/answer-plugins/tree/main/notification-wecom diff --git a/render-markdown-codehighlight/info.yaml b/render-markdown-codehighlight/info.yaml index f518138a..7bb257f3 100644 --- a/render-markdown-codehighlight/info.yaml +++ b/render-markdown-codehighlight/info.yaml @@ -17,6 +17,6 @@ slug_name: render_markdown_codehighlight type: render -version: 0.2.2 +version: 1.0.0 author: Chen Jiaji, Zhu Xuanlyu link: https://github.com/apache/answer-plugins/tree/main/render-markdown-codehighlight diff --git a/reviewer-akismet/info.yaml b/reviewer-akismet/info.yaml index 3d0094d5..e59207c2 100644 --- a/reviewer-akismet/info.yaml +++ b/reviewer-akismet/info.yaml @@ -17,6 +17,6 @@ slug_name: akismet_reviewer type: reviewer -version: 1.0.3 +version: 1.0.4 author: answerdev link: https://github.com/apache/answer-plugins/tree/main/reviewer-akismet diff --git a/reviewer-baidu/info.yaml b/reviewer-baidu/info.yaml index 3e218128..47e39ab0 100644 --- a/reviewer-baidu/info.yaml +++ b/reviewer-baidu/info.yaml @@ -17,6 +17,6 @@ slug_name: baidu_reviewer type: reviewer -version: 1.0.1 +version: 1.0.2 author: Luffy link: https://github.com/apache/answer-plugins/tree/main/reviewer-baidu diff --git a/reviewer-basic/info.yaml b/reviewer-basic/info.yaml index 9dc75f8a..da9f3e49 100644 --- a/reviewer-basic/info.yaml +++ b/reviewer-basic/info.yaml @@ -17,6 +17,6 @@ slug_name: basic_reviewer type: reviewer -version: 1.0.5 +version: 1.0.6 author: answerdev link: https://github.com/apache/answer-plugins/tree/main/reviewer-basic diff --git a/search-algolia/info.yaml b/search-algolia/info.yaml index 2ba4ae5d..64af74df 100644 --- a/search-algolia/info.yaml +++ b/search-algolia/info.yaml @@ -17,6 +17,6 @@ slug_name: algolia-search type: search -version: 1.2.10 +version: 1.2.11 author: answerdev link: https://github.com/apache/answer-plugins/tree/main/search-algolia diff --git a/search-elasticsearch/info.yaml b/search-elasticsearch/info.yaml index 21109ada..c59bdf47 100644 --- a/search-elasticsearch/info.yaml +++ b/search-elasticsearch/info.yaml @@ -17,6 +17,6 @@ slug_name: es_search type: search -version: 1.2.9 +version: 1.2.10 author: answerdev link: https://github.com/apache/answer-plugins/tree/main/search-elasticsearch diff --git a/search-meilisearch/info.yaml b/search-meilisearch/info.yaml index 3d5e50a7..b07b602f 100644 --- a/search-meilisearch/info.yaml +++ b/search-meilisearch/info.yaml @@ -17,6 +17,6 @@ slug_name: meilisearch_search type: search -version: 1.2.8 +version: 1.2.9 author: sivdead link: https://github.com/apache/answer-plugins/tree/main/search-meilisearch diff --git a/storage-aliyunoss/info.yaml b/storage-aliyunoss/info.yaml index 3ea1cdf4..a9b55d5e 100644 --- a/storage-aliyunoss/info.yaml +++ b/storage-aliyunoss/info.yaml @@ -17,6 +17,6 @@ slug_name: aliyunoss_storage type: storage -version: 1.2.9 +version: 1.2.10 author: answerdev link: https://github.com/apache/answer-plugins/tree/main/storage-aliyunoss diff --git a/storage-s3/info.yaml b/storage-s3/info.yaml index 9ccae7fb..b2b0d76e 100644 --- a/storage-s3/info.yaml +++ b/storage-s3/info.yaml @@ -17,6 +17,6 @@ slug_name: s3_storage type: storage -version: 1.2.9 +version: 1.2.10 author: answerdev link: https://github.com/apache/answer-plugins/tree/main/storage-s3 diff --git a/storage-tencentyuncos/info.yaml b/storage-tencentyuncos/info.yaml index d662e0f0..729d82af 100644 --- a/storage-tencentyuncos/info.yaml +++ b/storage-tencentyuncos/info.yaml @@ -17,6 +17,6 @@ slug_name: tencentyuncos_storage type: storage -version: 1.0.1 +version: 1.0.2 author: Luffy link: https://github.com/apache/answer-plugins/tree/main/storage-tencentyuncos diff --git a/user-center-slack/info.yaml b/user-center-slack/info.yaml index 9a948c49..3d9a3ea9 100644 --- a/user-center-slack/info.yaml +++ b/user-center-slack/info.yaml @@ -17,6 +17,6 @@ slug_name: slack_user_center type: user_center -version: 1.0.3 +version: 1.0.4 author: AnanChen link: https://github.com/apache/answer-plugins/tree/main/user-center-slack diff --git a/user-center-wecom/info.yaml b/user-center-wecom/info.yaml index 104a142a..93f59655 100644 --- a/user-center-wecom/info.yaml +++ b/user-center-wecom/info.yaml @@ -17,6 +17,6 @@ slug_name: wecom_user_center type: user_center -version: 1.2.8 +version: 1.2.9 author: answerdev link: https://github.com/apache/answer-plugins/tree/main/user-center-wecom From e20b2ade762d18d6a4e5b5d762b9800613b505db Mon Sep 17 00:00:00 2001 From: LinkinStars Date: Tue, 7 Jan 2025 13:22:01 +0800 Subject: [PATCH 20/20] fix(reviewer-akismet): update go mod --- reviewer-akismet/akismet.go | 1 + reviewer-akismet/go.mod | 1 + reviewer-akismet/go.sum | 4 ++++ reviewer-akismet/info.yaml | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/reviewer-akismet/akismet.go b/reviewer-akismet/akismet.go index 10a3b7e3..1a0383f8 100644 --- a/reviewer-akismet/akismet.go +++ b/reviewer-akismet/akismet.go @@ -21,6 +21,7 @@ package basic import ( "github.com/apache/answer/plugin" + "github.com/go-resty/resty/v2" "github.com/segmentfault/pacman/log" ) diff --git a/reviewer-akismet/go.mod b/reviewer-akismet/go.mod index fb1afd0f..d9baccf1 100644 --- a/reviewer-akismet/go.mod +++ b/reviewer-akismet/go.mod @@ -5,6 +5,7 @@ go 1.22.0 require ( github.com/apache/answer v1.4.2-RC1.0.20250107023923-061894735091 github.com/apache/answer-plugins/util v1.0.3-0.20250107030257-cf94ebc70954 + github.com/go-resty/resty/v2 v2.16.2 github.com/segmentfault/pacman v1.0.5-0.20230822083413-c0075a2d401f ) diff --git a/reviewer-akismet/go.sum b/reviewer-akismet/go.sum index ef8d1554..8e6340d1 100644 --- a/reviewer-akismet/go.sum +++ b/reviewer-akismet/go.sum @@ -35,6 +35,8 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= github.com/go-playground/validator/v10 v10.22.1 h1:40JcKH+bBNGFczGuoBYgX4I6m/i27HYW8P9FDk5PbgA= github.com/go-playground/validator/v10 v10.22.1/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= +github.com/go-resty/resty/v2 v2.16.2 h1:CpRqTjIzq/rweXUt9+GxzzQdlkqMdt8Lm/fuK/CAbAg= +github.com/go-resty/resty/v2 v2.16.2/go.mod h1:0fHAoK7JoBy/Ch36N8VFeMsK7xQOHhvWaC3iOktwmIU= github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA= github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -126,6 +128,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= +golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= diff --git a/reviewer-akismet/info.yaml b/reviewer-akismet/info.yaml index e59207c2..7f3b6e8f 100644 --- a/reviewer-akismet/info.yaml +++ b/reviewer-akismet/info.yaml @@ -17,6 +17,6 @@ slug_name: akismet_reviewer type: reviewer -version: 1.0.4 +version: 1.0.5 author: answerdev link: https://github.com/apache/answer-plugins/tree/main/reviewer-akismet