diff --git a/controller/misc.go b/controller/misc.go index 31954f4..6ea1634 100644 --- a/controller/misc.go +++ b/controller/misc.go @@ -1,16 +1,12 @@ package controller import ( - "crypto/sha1" - "encoding/hex" "encoding/json" "fmt" "github.com/gin-gonic/gin" "message-pusher/common" "message-pusher/model" "net/http" - "sort" - "strings" ) func GetStatus(c *gin.Context) { @@ -171,23 +167,3 @@ func ResetPassword(c *gin.Context) { }) return } - -func WeChatTestAccountVerification(c *gin.Context) { - user := model.User{Username: c.Param("username")} - user.FillUserByUsername() - // https://developers.weixin.qq.com/doc/offiaccount/Basic_Information/Access_Overview.html - signature := c.Query("signature") - timestamp := c.Query("timestamp") - nonce := c.Query("nonce") - echoStr := c.Query("echostr") - arr := []string{user.WeChatTestAccountVerificationToken, timestamp, nonce} - sort.Strings(arr) - str := strings.Join(arr, "") - hash := sha1.Sum([]byte(str)) - hexStr := hex.EncodeToString(hash[:]) - if signature == hexStr { - c.String(http.StatusOK, echoStr) - } else { - c.Status(http.StatusForbidden) - } -} diff --git a/router/api-router.go b/router/api-router.go index 2695123..7706a48 100644 --- a/router/api-router.go +++ b/router/api-router.go @@ -13,7 +13,6 @@ func SetApiRouter(router *gin.Engine) { apiRouter.GET("/status", controller.GetStatus) apiRouter.GET("/notice", controller.GetNotice) apiRouter.GET("/about", controller.GetAbout) - apiRouter.GET("/wechat_test_account_verification/:username", controller.WeChatTestAccountVerification) apiRouter.GET("/verification", middleware.CriticalRateLimit(), middleware.TurnstileCheck(), controller.SendEmailVerification) apiRouter.GET("/reset_password", middleware.CriticalRateLimit(), middleware.TurnstileCheck(), controller.SendPasswordResetEmail) apiRouter.POST("/user/reset", middleware.CriticalRateLimit(), controller.ResetPassword) diff --git a/web/src/components/PushSetting.js b/web/src/components/PushSetting.js index 10cd495..9e5e89f 100644 --- a/web/src/components/PushSetting.js +++ b/web/src/components/PushSetting.js @@ -19,7 +19,6 @@ const PushSetting = () => { wechat_test_account_secret: '', wechat_test_account_template_id: '', wechat_test_account_open_id: '', - wechat_test_account_verification_token: '', wechat_corp_account_id: '', wechat_corp_account_agent_secret: '', wechat_corp_account_agent_id: '', @@ -81,8 +80,6 @@ const PushSetting = () => { data.wechat_test_account_template_id = inputs.wechat_test_account_template_id; data.wechat_test_account_open_id = inputs.wechat_test_account_open_id; - data.wechat_test_account_verification_token = - inputs.wechat_test_account_verification_token; break; case 'corp': data.wechat_corp_account_id = inputs.wechat_corp_account_id; @@ -135,7 +132,9 @@ const PushSetting = () => {
通用设置
- 注意:密钥类配置信息不会发送到前端显示。 + + 注意:密钥类配置信息不会发送到前端显示。另外浏览器可能会错误填充账户和密钥信息,请留意。 + { - 接口配置信息中的 URL 填写: - {`${window.location.origin}/api/wechat_test_account_verification/${inputs.username}`} -
- Token 填一个随机字符串,然后填入下方的「接口配置验证 Token」中。 + 需要新增测试模板,模板标题推荐填写为「消息推送」,模板内容必须填写为 + {' {{'}text.DATA{'}}'}。
{ onChange={handleInputChange} autoComplete='off' value={inputs.wechat_test_account_open_id} - placeholder='测试号二维码 -> 用户列表 -> 微信号' - /> -