Merge branch 'develop' of https://github.com/piexlmax/QMPlus into gva_gormv2_dev

Author: pixel

README.md

@@ -0,0 +1,23 @@
+package v1
+
+import (
+	"fmt"
+	"gin-vue-admin/global/response"
+	"gin-vue-admin/service"
+	"github.com/gin-gonic/gin"
+)
+
+// @Tags system
+// @Summary 发送测试邮件
+// @Security ApiKeyAuth
+// @Produce  application/json
+// @Success 200 {string} string "{"success":true,"data":{},"msg":"返回成功"}"
+// @Router /email/emailTest [post]
+func EmailTest(c *gin.Context) {
+	err := service.EmailTest()
+	if err != nil {
+		response.FailWithMessage(fmt.Sprintf("发送失败，%v", err), c)
+	} else {
+		response.OkWithData("发送成功", c)
+	}
+}

server/api/v1/sys_email.go

@@ -55,7 +55,6 @@ sqlserver:
 # 切换本地与七牛云上传，分配头像和文件路径
 localupload:
   local: false
-  avatar-path: uploads/avatar
   file-path: uploads/file
 
 # 请自行七牛申请对应的 公钥 私钥 bucket 和 域名地址
@@ -105,4 +104,13 @@ zap:
   # LowercaseLevelEncoder:小写, LowercaseColorLevelEncoder:小写带颜色,CapitalLevelEncoder: 大写, CapitalColorLevelEncoder: 大写带颜色,
   encode_level: 'LowercaseColorLevelEncoder'
   stacktrace_key: 'stacktrace'
-  log_in_console: true
+  log_in_console: true
+
+email:
+  email_from: '[email protected]'
+  email_nick_name: 'test'
+  email_secret: 'xxx'
+  email_to: '[email protected]'
+  email_host: 'smtp.163.com'
+  email_port: 465
+  email_isSSL: true

server/config.yaml

@@ -13,6 +13,7 @@ type Server struct {
 	Captcha     Captcha     `mapstructure:"captcha" json:"captcha" yaml:"captcha"`
 	Zap         Zap         `mapstructure:"zap" json:"zap" yaml:"zap"`
 	LocalUpload LocalUpload `mapstructure:"localUpload" json:"localUpload" yaml:"localUpload"`
+	Email       Email       `mapstructure:"email" json:"email" yaml:"email"`
 }
 
 type System struct {
@@ -79,7 +80,6 @@ type Redis struct {
 
 type LocalUpload struct {
 	Local      bool   `mapstructure:"local" json:"local" yaml:"local"`
-	AvatarPath string `mapstructure:"avatar-path" json:"avatarPath" yaml:"avatar-path"`
 	FilePath   string `mapstructure:"file-path" json:"filePath" yaml:"file-path"`
 }
 
@@ -107,3 +107,13 @@ type Zap struct {
 	StacktraceKey string `mapstructure:"stacktrace_key" json:"stacktraceKey" yaml:"stacktrace_key"`
 	LogInConsole  bool   `mapstructure:"log_in_console" json:"logInConsole" yaml:"log_in_console"`
 }
+
+type Email struct {
+	EmailFrom         string `mapstructure:"email_from" json:"emailFrom" yaml:"email_from"`
+	EmailNickName         string `mapstructure:"email_nick_name" json:"emailNickName" yaml:"email_nick_name"`
+	EmailSecret         string `mapstructure:"email_secret" json:"emailSecret" yaml:"email_secret"`
+	EmailTo         string `mapstructure:"email_to" json:"emailTo" yaml:"email_to"`
+	EmailHost         string `mapstructure:"email_host" json:"emailHost" yaml:"email_host"`
+	EmailPort         int `mapstructure:"email_port" json:"emailPort" yaml:"email_port"`
+	EmailIsSSL         bool `mapstructure:"email_isSSL" json:"emailIsSSL" yaml:"email_isSSL"`
+}

server/config/config.go

@@ -19,6 +19,7 @@ require (
 	github.com/go-sql-driver/mysql v1.5.0
 	github.com/golang/protobuf v1.4.2 // indirect
 	github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 // indirect
+	github.com/jordan-wright/email v0.0.0-20200824153738-3f5bafa1cd84
 	github.com/json-iterator/go v1.1.10 // indirect
 	github.com/lestrrat-go/file-rotatelogs v2.3.0+incompatible
 	github.com/lestrrat-go/strftime v1.0.3 // indirect

server/go.mod

@@ -16,7 +16,6 @@ import (
 func Routers() *gin.Engine {
 	var Router = gin.Default()
 	// 为用户头像和文件提供静态地址
-	Router.StaticFS(global.GVA_CONFIG.LocalUpload.AvatarPath, http.Dir(global.GVA_CONFIG.LocalUpload.AvatarPath))
 	Router.StaticFS(global.GVA_CONFIG.LocalUpload.FilePath, http.Dir(global.GVA_CONFIG.LocalUpload.FilePath))
 	// Router.Use(middleware.LoadTls())  // 打开就能玩https了
 	global.GVA_LOG.Debug("use middleware logger")
@@ -43,6 +42,7 @@ func Routers() *gin.Engine {
 	router.InitSysDictionaryDetailRouter(ApiGroup)   // 字典详情管理
 	router.InitSysDictionaryRouter(ApiGroup)         // 字典管理
 	router.InitSysOperationRecordRouter(ApiGroup)    // 操作记录
+	router.InitEmailRouter(ApiGroup)                 // 邮件相关路由
 
 	global.GVA_LOG.Info("router register success")
 	return Router

server/initialize/router.go

@@ -0,0 +1,14 @@
+package router
+
+import (
+	"gin-vue-admin/api/v1"
+	"gin-vue-admin/middleware"
+	"github.com/gin-gonic/gin"
+)
+
+func InitEmailRouter(Router *gin.RouterGroup) {
+	UserRouter := Router.Group("email").Use(middleware.JWTAuth()).Use(middleware.CasbinHandler())
+	{
+		UserRouter.POST("emailTest", v1.EmailTest) // 发送测试邮件
+	}
+}

server/router/sys_email.go

@@ -0,0 +1,17 @@
+package service
+
+import (
+	"gin-vue-admin/utils"
+)
+
+// @title    EmailTest
+// @description   发送邮件测试
+// @auth                    （2020/09/08  13:58
+// @return    err            error
+
+func EmailTest() (err error) {
+	subject := "test"
+	body := "test"
+	err = utils.EmailTest(subject, body)
+	return err
+}

server/service/sys_email.go

@@ -0,0 +1,50 @@
+package utils
+
+import (
+	"crypto/tls"
+	"fmt"
+	"net/smtp"
+	"strings"
+
+	"gin-vue-admin/global"
+
+	"github.com/jordan-wright/email"
+)
+
+func Email(subject string, body string) error {
+	to := strings.Split(global.GVA_CONFIG.Email.EmailTo, ",")
+	return send(to, subject, body)
+}
+
+func EmailTest(subject string, body string) error {
+	to := []string{global.GVA_CONFIG.Email.EmailFrom}
+	return send(to, subject, body)
+}
+
+func send(to []string, subject string, body string) error {
+	from := global.GVA_CONFIG.Email.EmailFrom
+	nickName := global.GVA_CONFIG.Email.EmailNickName
+	secret := global.GVA_CONFIG.Email.EmailSecret
+	host := global.GVA_CONFIG.Email.EmailHost
+	port := global.GVA_CONFIG.Email.EmailPort
+	isSSL := global.GVA_CONFIG.Email.EmailIsSSL
+
+	auth := smtp.PlainAuth("", from, secret, host)
+	e := email.NewEmail()
+	if nickName != "" {
+		e.From = fmt.Sprintf("%s <%s>", nickName, from)
+	} else {
+		e.From = from
+	}
+	e.To = to
+	e.Subject = subject
+	e.HTML = []byte(body)
+	var err error
+	hostAddr := fmt.Sprintf("%s:%d", host, port)
+	if isSSL {
+		err = e.SendWithTLS(hostAddr, auth, &tls.Config{ServerName: host})
+	} else {
+		err = e.Send(hostAddr, auth)
+	}
+	return err
+}

server/utils/email.go

@@ -1,2 +1,2 @@
 ENV = 'production'
-VUE_APP_BASE_API = '/v1'
+VUE_APP_BASE_API = '/api'