Merge branch 'master' of http://106.52.134.22:3000/longan/lcfns

api/v1/app/gateway.go

@@ -1,7 +1,6 @@
 package app
 
 import (
-	"fmt"
 	"github.com/gin-gonic/gin"
 	"lcfns/model/app"
 	"lcfns/model/app/request"
@@ -36,7 +35,6 @@ func (api *GatewayApi) List(c *gin.Context) {
 	v3 := c.Query("page")
 	req.Page, _ = strconv.Atoi(v3)
 
-	fmt.Printf("参数:%+v\n", req)
 	list, err := gs.List(req)
 	if err != nil {
 		response.FailWithMessage(err.Error(), c)

eventServer/eventServer.go

@@ -56,7 +56,7 @@ func handler(w http.ResponseWriter, r *http.Request) {
 		//处理事件 todo 邮箱
 		handleEvent_(event)
 	} else if strings.Contains(contentType, "multipart/form-data") {
-		fmt.Println("multipart/form-data 事件")
+		//fmt.Println("multipart/form-data 事件")
 		handleMultipart(r)
 	} else {
 		logrus.WithField("Content-Type", contentType).Error("该Content-Type没有写处理逻辑")
@@ -87,7 +87,7 @@ func handleMultipart(r *http.Request) {
 		}
 		// 检查 part 的 Content-Disposition
 		formName := part.FormName()
-		fmt.Println("formName", formName)
+		//fmt.Println("formName", formName)
 		if formName != "intrusionImage" {
 			//不含图片的xml部分数据
 			xmlData, err := ioutil.ReadAll(part)
@@ -101,7 +101,7 @@ func handleMultipart(r *http.Request) {
 			msg = handleEvent_(eventAlert)
 			continue
 		}
-		fmt.Printf("eventAlert:%+v\n", eventAlert)
+		//fmt.Printf("eventAlert:%+v\n", eventAlert)
 		//处理图片部分数据
 		contentType := part.Header.Get("Content-Type")
 		eventCode := part.Header.Get("Content-ID")

gatewayServer/c2s.go

@@ -32,7 +32,7 @@ func ParseAndResponse(adu AppDataUnit, c net.Conn) {
 	case CmdCodeUpdateC2S:
 		//更新固件
 	default:
-		fmt.Println(adu.String())
+		//fmt.Println(adu.String())
 	}
 }
 

gatewayServer/gatewayServer.go

@@ -1,7 +1,6 @@
 package gatewayServer
 
 import (
-	"fmt"
 	"github.com/sirupsen/logrus"
 	"io"
 	"lcfns/global"
@@ -37,8 +36,8 @@ func handleConn(c net.Conn) {
 		//gs.UpdateState()
 	}()
 	atomic.AddInt32(&n, 1)
-	fmt.Printf("连接数 %d\n", atomic.LoadInt32(&n))
-	fmt.Printf("当前连接 %s\n", c.RemoteAddr())
+	//fmt.Printf("连接数 %d\n", atomic.LoadInt32(&n))
+	//fmt.Printf("当前连接 %s\n", c.RemoteAddr())
 	//var filterChan = make(chan []byte, 32)
 	var dataChan = make(chan []byte, 32)
 	readData := func() {

initialize/gorm.go

@@ -1,7 +1,6 @@
 package initialize
 
 import (
-	"fmt"
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm/logger"
 	"gorm.io/gorm/schema"
@@ -16,7 +15,6 @@ import (
 
 func Gorm() *gorm.DB {
 	m := global.Config.Mysql
-	fmt.Println("mysql配置:", m)
 	if m.Dbname == "" {
 		return nil
 	}

isapi/client.go

@@ -29,7 +29,6 @@ func NewClient(host, username, password string) (*Client, error) {
 	if err != nil {
 		return nil, err
 	}
-	fmt.Printf("baseUrl:%s\n", u.String())
 	return &Client{
 		Client: &http.Client{
 			Transport: NewAuthTransport(username, password),
@@ -39,7 +38,6 @@ func NewClient(host, username, password string) (*Client, error) {
 }
 
 func TouChuan(host string, o Operation, data []byte, c *gin.Context) (resp any, err error) {
-	fmt.Println("请求参数: ", string(data))
 	resp, err = Com(host, o, data)
 	if err != nil {
 		logrus.Error(err)

isapi/digest.go

@@ -68,7 +68,7 @@ func (c *Challenge) Authorize(username, password, method, uri string) *Response
 	// MD5(<request-method>:<uri>)
 	a2 := MD5(fmt.Sprintf("%s:%s", method, uri))
 
-	// MD5(MD5(A1):<auth>:<nc>:<cnonce>:<qop>:MD5(A2))
+	// MD5(MD5(A1):<nonce>:<nc>:<cnonce>:<qop>:MD5(A2))
 	response := MD5(fmt.Sprintf("%s:%s:%s:%s:%s:%s", a1, c.Nonce, "00000001", "0a4f113b", c.Qop, a2))
 	return &Response{
 		Username: username,

utils/email.go

@@ -19,12 +19,6 @@ var emailClient = func() *mail.SMTPServer {
 
 func EmailPicture(To, subject, data string, pic *mail.File) {
 	// 创建邮件客户端
-	//client := mail.NewSMTPClient()
-	//// 设置SMTP服务器和认证信息
-	//client.Host = "smtp.163.com"            // 替换为你的SMTP服务器地址
-	//client.Port = 25                        // 替换为SMTP服务器端口
-	//client.Username = "17673481176@163.com" // 替换为SMTP服务器的用户名
-	//client.Password = "kk992471"            // 替换为SMTP服务器的密码
 	smtpClient, err := emailClient.Connect()
 	if err != nil {
 		logrus.Error("email client Connect err", err)
@@ -57,12 +51,6 @@ func EmailPicture(To, subject, data string, pic *mail.File) {
 	log.Println("Email sent successfully")
 }
 
-//@author: [maplepie](https://github.com/maplepie)
-//@function: Email
-//@description: Email发送方法
-//@param: subject string, body string
-//@return: error
-
 func Email(To, subject string, body string) {
 	smtpClient, err := emailClient.Connect()
 	if err != nil {
@@ -91,12 +79,6 @@ func Email(To, subject string, body string) {
 	log.Println("Email sent successfully")
 }
 
-//@author: [SliverHorn](https://github.com/SliverHorn)
-//@function: ErrorToEmail
-//@description: 给email中间件错误发送邮件到指定邮箱
-//@param: subject string, body string
-//@return: error
-
 func ErrorToEmail(subject string, body string) error {
 	//to := strings.Split(global.GlobalConfig.To, ",")
 	//if to[len(to)-1] == "" { // 判断切片的最后一个元素是否为空,为空则移除
@@ -105,32 +87,3 @@ func ErrorToEmail(subject string, body string) error {
 	//return send(to, subject, body)
 	return nil
 }
-
-func send(to []string, subject string, body string) error {
-	//from := global.GlobalConfig.From
-	//nickname := global.GlobalConfig.Nickname
-	//secret := global.GlobalConfig.Secret
-	//host := global.GlobalConfig.Host
-	//port := global.GlobalConfig.Port
-	//isSSL := global.GlobalConfig.IsSSL
-	//
-	//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
-	return nil
-}