fix:整理代码

controllers/base_auth.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"eta/eta_mini_api/models"
 	"eta/eta_mini_api/utils"
-	"fmt"
 	"net/http"
 
 	"github.com/beego/beego/v2/server/web"
@@ -74,8 +73,7 @@ func (c *BaseAuthController) ServeJSON(encoding ...bool) {
 	if c.Data["json"] == nil {
 		//go utils.SendEmail("异常提醒:", "接口:"+"URI:"+c.Ctx.Input.URI()+";无返回值", utils.EmailSendToUsers)
 		body := "接口:" + "URI:" + c.Ctx.Input.URI() + ";无返回值"
-		fmt.Println(body)
-		// go alarm_msg.SendAlarmMsg(body, 1)
+		utils.ApiLog.Notice(body)
 		return
 	}
 	baseRes := c.Data["json"].(*models.BaseResponse)
@@ -93,10 +91,9 @@ func (c *BaseAuthController) ServeJSON(encoding ...bool) {
 			//go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "URI:"+c.Ctx.Input.URI()+"<br/> "+"Params"+requestBody+" <br/>"+"ErrMsg:"+baseRes.ErrMsg+";<br/>Msg:"+baseRes.Msg+";<br/> Body:"+string(body)+"<br/>"+c.SysUser.RealName, utils.EmailSendToUsers)
 			body := "URI:" + c.Ctx.Input.URI() + "<br/> " + "Params" + requestBody + " <br/>" + "ErrMsg:" + baseRes.ErrMsg + ";<br/>Msg:" + baseRes.Msg + ";<br/> Body:" + string(body) + "<br/>" + c.User.RealName
 			// go alarm_msg.SendAlarmMsg(body, 1)
-			fmt.Println(body)
+			utils.ApiLog.Notice(body)
 		}
 		if baseRes.IsAddLog && c.User != nil {
-			// go cache.RecordNewLogs(c.SysUser.AdminId, requestBody, string(body), c.SysUser.RealName, c.Ctx.Input.IP(), c.Ctx.Input.URI())
 			return
 		}
 	}

controllers/base_common.go

@@ -40,12 +40,14 @@ func (c *BaseCommonController) ServeJSON(encoding ...bool) {
 		hasEncoding = true
 	}
 	if c.Data["json"] == nil {
-		go utils.SendEmail(utils.APPNAME+" "+utils.RunMode+"异常提醒", "接口:"+"URI:"+c.Ctx.Input.URI()+";无返回值", utils.EmailSendToUsers)
+		// go utils.SendEmail(utils.APPNAME+" "+utils.RunMode+"异常提醒", "接口:"+"URI:"+c.Ctx.Input.URI()+";无返回值", utils.EmailSendToUsers)
+		utils.ApiLog.Notice(utils.APPNAME+" "+utils.RunMode+"异常提醒", "接口:"+"URI:"+c.Ctx.Input.URI()+";无返回值")
 		return
 	}
 	baseRes := c.Data["json"].(*models.BaseResponse)
 	if baseRes != nil && !baseRes.Success && baseRes.IsSendEmail {
-		go utils.SendEmail(utils.APPNAME+" "+utils.RunMode+" 失败提醒", "URI:"+c.Ctx.Input.URI()+" ErrMsg:"+baseRes.ErrMsg+";Msg"+baseRes.Msg, utils.EmailSendToUsers)
+		utils.ApiLog.Notice("接口:"+"URI:"+c.Ctx.Input.URI()+";ErrMsg:"+baseRes.ErrMsg+";Msg"+baseRes.Msg, utils.EmailSendToUsers)
+		// go utils.SendEmail(utils.APPNAME+" "+utils.RunMode+" 失败提醒", "URI:"+c.Ctx.Input.URI()+" ErrMsg:"+baseRes.ErrMsg+";Msg"+baseRes.Msg, utils.EmailSendToUsers)
 	}
 	c.JSON(c.Data["json"], hasIndent, hasEncoding)
 }

services/email.go

@@ -1,5 +0,0 @@
-package services
-
-func SendEmail() {
-
-}

services/wechat/wechat.go

@@ -53,7 +53,7 @@ var DefaultKey = "zcmRedis"
 
 // GetAccessToken 获取accessToken
 func (wechat WechatAccessToken) GetAccessToken() (accessToken string, err error) {
-	accessToken, err = utils.Redis.Get(context.TODO(), utils.CACHE_WX_ACCESS_TOKEN_HZ).Result()
+	accessToken, err = utils.Redis.Get(context.TODO(), utils.CACHE_WX_ACCESS_TOKEN_DW).Result()
 	// wxToken, err := models.GetWxTokenById()
 	if err != nil && err != redis.Nil {
 		return
@@ -67,11 +67,11 @@ func (wechat WechatAccessToken) GetAccessToken() (accessToken string, err error)
 		return
 	}
 	redisTimeExpire := time.Duration(expires-600) * time.Second
-	err = utils.Redis.SetEX(context.TODO(), utils.CACHE_WX_ACCESS_TOKEN_HZ, tmpAccessToken, redisTimeExpire).Err()
+	err = utils.Redis.SetEX(context.TODO(), utils.CACHE_WX_ACCESS_TOKEN_DW, tmpAccessToken, redisTimeExpire).Err()
 	if err != nil {
 		return
 	}
-	err = utils.Redis.HSet(context.TODO(), DefaultKey, utils.CACHE_WX_ACCESS_TOKEN_HZ, true).Err()
+	err = utils.Redis.HSet(context.TODO(), DefaultKey, utils.CACHE_WX_ACCESS_TOKEN_DW, true).Err()
 	// err = utils.Redis.Put(utils.CACHE_WX_ACCESS_TOKEN_HZ, tmpAccessToken, redisTimeExpire)
 	if err != nil {
 		err = errors.New("更新微信token失败")
@@ -144,11 +144,7 @@ type WxUserInfo struct {
 func GetWxUserInfo(code string) (info *WxUserInfo, err error) {
 	httpUrl := `https://api.weixin.qq.com/sns/oauth2/access_token?appid=%s&secret=%s&code=%s&grant_type=authorization_code`
 
-	confMap, err := models.GetMiniConf()
-	if err != nil {
-		return
-	}
-	httpUrl = fmt.Sprintf(httpUrl, confMap["WxAppId"], confMap["WxAppSecret"], code)
+	httpUrl = fmt.Sprintf(httpUrl, utils.DW_WX_APPID, utils.DW_WX_APP_SECRET, code)
 
 	client := http.Client{}
 	wxReq, err := http.NewRequest("GET", httpUrl, nil)

services/wx_app/wx_app.go

@@ -14,18 +14,11 @@ import (
 func GetWxApp() (miniprogram *miniprogram.MiniProgram) {
 	wc := wechat.NewWechat()
 	memory := cache.NewMemory()
-	//memory := cache.NewRedis(global.Redis)
-	// var WxId = `gh_75abb562a946`
-	// var WxAppId = `wxb059c872d79b9967` // 投研小程序
-	// var WxAppSecret = `1737c73e9f69a21de1a345b8f0800258`
+	// memory := cache.NewRedis(utils.Redis)
 	cfg := &config.Config{
-		AppID:     utils.WX_APPID,
-		AppSecret: utils.WX_APP_SECRET,
-		// AppID:     utils.WX_APPID,
-		// AppSecret: utils.WX_APP_SECRET,
-		// AppID:     WxAppId,
-		// AppSecret: WxAppSecret,
-		Cache: memory,
+		AppID:     utils.WX_MINI_APPID,
+		AppSecret: utils.WX_MINI_APP_SECRET,
+		Cache:     memory,
 	}
 
 	miniprogram = wc.GetMiniProgram(cfg)

utils/config.go

@@ -41,12 +41,10 @@ var AlarmMsgUrl string // 报警地址
 
 // 微信相关
 var (
-	HZ_WX_APPID            string
-	HZ_WX_APP_SECRET       string
+	WX_MINI_APPID          string
+	WX_MINI_APP_SECRET     string
 	DW_WX_Id               string //微信原始ID
-	WX_APPID               string
-	WX_APP_SECRET          string
-	DW_WX_APPID            string
+	DW_WX_APPID            string // 东吴公众号appid
 	DW_WX_APP_SECRET       string
 	TEMPLATE_ID_BY_PRODUCT string
 )
@@ -88,21 +86,16 @@ func init() {
 	SMS_TPLID = config["sms_tplId"]
 	DesKey = config["des_key"]
 
-	WX_APPID = config["wx_appid"]
-	WX_APP_SECRET = config["wx_app_secret"]
-	TEMPLATE_ID_BY_PRODUCT = config["template_id_by_product"]
+	WX_MINI_APPID = config["wx_appid"]
+	WX_MINI_APP_SECRET = config["wx_app_secret"]
 	DW_WX_Id = config["dw_wx_id"]
 	DW_WX_APPID = config["dw_wx_appid"]
 	DW_WX_APP_SECRET = config["dw_wx_app_secret"]
+	TEMPLATE_ID_BY_PRODUCT = config["template_id_by_product"]
 
 	ETA_MINI_BRIDGE_URL = config["eta_mini_bridge_url"]
 	ETA_MINI_APPID = config["eta_mini_appid"]
 	ETA_MINI_APP_SECRET = config["eta_mini_app_secret"]
-	// HZ_WX_APPID = config["hz_wx_appid"]
-	// HZ_WX_APP_SECRET = config["hz_wx_app_secret"]
-	HZ_WX_APPID = "wx9b5d7291e581233a"
-	HZ_WX_APP_SECRET = "f4d52e34021eee262dce9682b31f8861"
-	AlarmMsgUrl = "http://127.0.0.1:8606/api/alarm/send"
 	initRedis(config)
 }
 

utils/constants.go

@@ -67,5 +67,5 @@ const (
 
 // 缓存key
 const (
-	CACHE_WX_ACCESS_TOKEN_HZ = "wx:accesstoken:dwgzh" //弘则研究公众号 微信accessToken
+	CACHE_WX_ACCESS_TOKEN_DW = "wx:accesstoken:dw" //东吴公众号 微信accessToken
 )

utils/email.go

@@ -19,11 +19,11 @@ func SendEmail(title, content string, touser string) bool {
 		arr = append(arr, touser)
 	}
 	m := gomail.NewMessage()
-	m.SetHeader("From", "317699326@qq.com ")
+	m.SetHeader("From", "")
 	m.SetHeader("To", arr...)
 	m.SetHeader("Subject", title+" "+GetRandString(16))
 	m.SetBody("text/html", content)
-	d := gomail.NewDialer("smtp.qq.com", 587, "317699326@qq.com", "oqdypwfcvruwcbea")
+	d := gomail.NewDialer("smtp.qq.com", 587, "", "")
 	if err := d.DialAndSend(m); err != nil {
 		return false
 	}
@@ -44,13 +44,11 @@ func SendEmailByDw(title, content string, touser string) (result bool, err error
 		arr = append(arr, touser)
 	}
 	m := gomail.NewMessage()
-	// m.SetHeader("From", "lvan@dwqh88.com")
-	m.SetHeader("From", "564693862@qq.com")
+	m.SetHeader("From", "lvan@dwqh88.com")
 	m.SetHeader("To", arr...)
 	m.SetHeader("Subject", title)
 	m.SetBody("text/html", content)
-	d := gomail.NewDialer("smtp.qq.com", 587, "564693862@qq.com", "izytoolbgbirbbhb")
-	// d := gomail.NewDialer("mail.dwqh88.com", 465, "lvan@dwqh88.com", "Dwqh20248888")
+	d := gomail.NewDialer("mail.dwqh88.com", 465, "lvan@dwqh88.com", "Dwqh20248888")
 	if err := d.DialAndSend(m); err != nil {
 		result = false
 		return result, err