fix(): 钉钉通知取消全局配置

server/config.yaml

@@ -34,11 +34,6 @@ email:
   secret: 'xxx'
   nickname: 'test'
 
-dingding:
-  url: 'https://oapi.dingtalk.com/robot/send'
-  secret: 'SEC38425b7bd57c6bca9ce20611c41b437994ed65e0ddbd42e840ffa7a8c7da2106'
-  token: '77d18293e221b3b7bdae7330d19a213c3cbb20fa07de5f4c273c0363ae475c34'
-
 # casbin configuration
 casbin:
   model-path: './resource/rbac_model.conf'

server/config/config.go

@@ -1,14 +1,13 @@
 package config
 
 type Server struct {
-	JWT      JWT      `mapstructure:"jwt" json:"jwt" yaml:"jwt"`
-	Zap      Zap      `mapstructure:"zap" json:"zap" yaml:"zap"`
-	Redis    Redis    `mapstructure:"redis" json:"redis" yaml:"redis"`
-	Email    Email    `mapstructure:"email" json:"email" yaml:"email"`
-	DingDing DingDing `mapstructure:"dingding" json:"dingding" yaml:"dingding"`
-	Casbin   Casbin   `mapstructure:"casbin" json:"casbin" yaml:"casbin"`
-	System   System   `mapstructure:"system" json:"system" yaml:"system"`
-	Captcha  Captcha  `mapstructure:"captcha" json:"captcha" yaml:"captcha"`
+	JWT     JWT     `mapstructure:"jwt" json:"jwt" yaml:"jwt"`
+	Zap     Zap     `mapstructure:"zap" json:"zap" yaml:"zap"`
+	Redis   Redis   `mapstructure:"redis" json:"redis" yaml:"redis"`
+	Email   Email   `mapstructure:"email" json:"email" yaml:"email"`
+	Casbin  Casbin  `mapstructure:"casbin" json:"casbin" yaml:"casbin"`
+	System  System  `mapstructure:"system" json:"system" yaml:"system"`
+	Captcha Captcha `mapstructure:"captcha" json:"captcha" yaml:"captcha"`
 	// auto
 	AutoCode Autocode `mapstructure:"autoCode" json:"autoCode" yaml:"autoCode"`
 	// gorm

server/config/dingding.go

@@ -1,7 +0,0 @@
-package config
-
-type DingDing struct {
-	Url    string `mapstructure:"url" json:"url" yaml:"url"`          // 发件人  你自己要发邮件的邮箱
-	Token  string `mapstructure:"token" json:"token" yaml:"token"`    // 服务器地址 例如 smtp.qq.com  请前往QQ或者你要发邮件的邮箱查看其smtp协议
-	Secret string `mapstructure:"secret" json:"secret" yaml:"secret"` // 密钥    用于登录的密钥 最好不要用邮箱密码 去邮箱smtp申请一个用于登录的密钥
-}

server/initialize/router.go

@@ -67,11 +67,7 @@ func Routers() *gin.Engine {
 	PluginInit(PublicGroup, example_plugin.ExamplePlugin)
 
 	//  钉钉通知，暂时开放权限
-	PluginInit(PublicGroup, notify.CreateDDPlug(
-		global.GVA_CONFIG.DingDing.Url,
-		global.GVA_CONFIG.DingDing.Secret,
-		global.GVA_CONFIG.DingDing.Token,
-	))
+	PluginInit(PublicGroup, notify.CreateDDPlug())
 
 	//  添加跟角色挂钩权限的插件 示例 本地示例模式于在线仓库模式注意上方的import 可以自行切换 效果相同
 	PluginInit(PrivateGroup, email.CreateEmailPlug(

server/plugin/notify/global/gloabl.go

@@ -1,5 +0,0 @@
-package global
-
-import "github.com/flipped-aurora/gin-vue-admin/server/plugin/notify/config"
-
-var GlobalConfig = new(config.DingDing)

server/plugin/notify/global/global.go

@@ -0,0 +1,9 @@
+package global
+
+import "github.com/flipped-aurora/gin-vue-admin/server/plugin/notify/config"
+
+var GlobalConfig_ = &config.DingDing{
+	Url:    "https://oapi.dingtalk.com/robot/send",
+	Token:  "77d18293e221b3b7bdae7330d19a213c3cbb20fa07de5f4c273c0363ae475c34",
+	Secret: "SEC38425b7bd57c6bca9ce20611c41b437994ed65e0ddbd42e840ffa7a8c7da2106",
+}

server/plugin/notify/main.go

@@ -1,7 +1,6 @@
 package notify
 
 import (
-	"github.com/flipped-aurora/gin-vue-admin/server/plugin/notify/global"
 	"github.com/flipped-aurora/gin-vue-admin/server/plugin/notify/router"
 	"github.com/gin-gonic/gin"
 )
@@ -12,10 +11,7 @@ type ddPlugin struct {
 	Url    string
 }
 
-func CreateDDPlug(Url string, Secret string, Token string) *ddPlugin {
-	global.GlobalConfig.Secret = Secret
-	global.GlobalConfig.Token = Token
-	global.GlobalConfig.Url = Url
+func CreateDDPlug() *ddPlugin {
 	return &ddPlugin{}
 }
 

server/plugin/notify/service/notify.go

@@ -39,14 +39,14 @@ func SendMessage(msg interface{}) error {
 	}
 
 	value := url.Values{}
-	value.Set("access_token", global.GlobalConfig.Token)
-	if global.GlobalConfig.Secret != "" {
+	value.Set("access_token", global.GlobalConfig_.Token)
+	if global.GlobalConfig_.Secret != "" {
 		t := time.Now().UnixNano() / 1e6
 		value.Set("timestamp", fmt.Sprintf("%d", t))
-		value.Set("sign", sign(t, global.GlobalConfig.Secret))
+		value.Set("sign", sign(t, global.GlobalConfig_.Secret))
 	}
 
-	request, err := http.NewRequest(http.MethodPost, global.GlobalConfig.Url, body)
+	request, err := http.NewRequest(http.MethodPost, global.GlobalConfig_.Url, body)
 	if err != nil {
 		return fmt.Errorf("error request: %v", err.Error())
 	}