[support] Support #178.

homenoc · Apr 22, 2023 · b2725e0 · b2725e0
1 parent 7f4730e
commit b2725e0
Show file tree

Hide file tree

Showing 12 changed files with 633 additions and 19 deletions.
diff --git a/pkg/api/api.go b/pkg/api/api.go
@@ -68,15 +68,15 @@ func AdminRestAPI() {
 			v1.POST("/logout", token.DeleteAdminUser)
 
 			//
-			// Token
+			// BotToken
 			//
 			v1.POST("/token/generate", token.GenerateByAdmin)
 
 			v1.POST("/token", token.AddByAdmin)
-			// Token Delete
+			// BotToken Delete
 			v1.DELETE("/token", token.DeleteAllByAdmin)
 			v1.DELETE("/token/:id", token.DeleteByAdmin)
-			// Token Update
+			// BotToken Update
 			v1.PUT("/token/:id", token.UpdateByAdmin)
 			v1.GET("/token", token.GetAllByAdmin)
 			v1.GET("/token/:id", token.GetByAdmin)
@@ -323,7 +323,7 @@ func UserRestAPI() {
 
 func cors(c *gin.Context) {
 
-	//c.Header("Access-Control-Allow-Headers", "Accept, Content-ID, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, Access-Control-Request-Headers, Access-Control-Request-Method, Connection, Host, Origin, User-Agent, Referer, Cache-Control, X-header")
+	//c.Header("Access-Control-Allow-Headers", "Accept, Content-ID, Content-Length, Accept-Encoding, X-CSRF-BotToken, Authorization, Access-Control-Request-Headers, Access-Control-Request-Method, Connection, Host, Origin, User-Agent, Referer, Cache-Control, X-header")
 	c.Header("Access-Control-Allow-Origin", "*")
 	c.Header("Access-Control-Allow-Methods", "*")
 	c.Header("Access-Control-Allow-Headers", "*")

diff --git a/pkg/api/core/group/service/interface.go b/pkg/api/core/group/service/interface.go
@@ -12,6 +12,7 @@ const (
 	Open              = 3
 	SearchNewNumber   = 4
 	GIDAndAddAllow    = 5
+	ASN               = 6
 	UpdateName        = 100
 	UpdateDate        = 102
 	UpdateRoute       = 103

diff --git a/pkg/api/core/tool/config/config.go b/pkg/api/core/tool/config/config.go
@@ -100,7 +100,8 @@ type Radius struct {
 }
 
 type Slack struct {
-	Token    string        `json:"token"`
+	AppToken string        `json:"app_token"`
+	BotToken string        `json:"bot_token"`
 	Channels SlackChannels `json:"channels"`
 }
 

diff --git a/pkg/api/core/tool/notification/notification.go b/pkg/api/core/tool/notification/notification.go
@@ -13,6 +13,7 @@ var Notification NotifyStruct
 
 func NewNotification() {
 	// slack
-	slackToken := config.Conf.Slack.Token
-	Notification.Slack = slack.New(slackToken)
+	slackToken := config.Conf.Slack.BotToken
+	appToken := slack.OptionAppLevelToken(config.Conf.Slack.AppToken)
+	Notification.Slack = slack.New(slackToken, appToken, slack.OptionDebug(config.IsDebug))
 }
diff --git a/pkg/api/core/tool/notification/slack.go b/pkg/api/core/tool/notification/slack.go
@@ -1,6 +1,7 @@
 package notification
 
 import (
+	"fmt"
 	"github.com/homenoc/dsbd-backend/pkg/api/core/tool/config"
 	"github.com/slack-go/slack"
 	"strings"
@@ -45,11 +46,12 @@ func NoticeLog(color string, baseKeyValue []string) {
 		slackAttachField = append(slackAttachField, slack.AttachmentField{Title: splitKeyValue[0], Value: keyValue[len(splitKeyValue[0])+1:]})
 	}
 
-	Notification.Slack.PostMessage(config.Conf.Slack.Channels.Log, slack.MsgOptionAttachments(
+	_, _, err := Notification.Slack.PostMessage(config.Conf.Slack.Channels.Log, slack.MsgOptionAttachments(
 		slack.Attachment{
 			Color:  color,
 			Title:  "System",
 			Fields: slackAttachField,
 		},
 	))
+	fmt.Println(err)
 }