Commit a52f7150 by Li Feifei

test

parent da2bbceb
Pipeline #13601 passed with stages
in 28 seconds
...@@ -7,11 +7,14 @@ package upload ...@@ -7,11 +7,14 @@ package upload
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"sync"
beeLogger "github.com/beego/bee/logger" beeLogger "github.com/beego/bee/logger"
"github.com/streadway/amqp" "github.com/streadway/amqp"
) )
var once sync.Once
var RM *RabbitMQ
type RabbitMQ struct { type RabbitMQ struct {
connection *amqp.Connection connection *amqp.Connection
channel *amqp.Channel channel *amqp.Channel
...@@ -60,7 +63,7 @@ func (r *RabbitMQ) mqClose() { ...@@ -60,7 +63,7 @@ func (r *RabbitMQ) mqClose() {
} }
func (r *RabbitMQ) Send(req map[string]interface{}) error { func (r *RabbitMQ) Send(req map[string]interface{}) error {
defer r.mqClose() //defer r.mqClose()
bytes, err := json.Marshal(req) bytes, err := json.Marshal(req)
if err != nil { if err != nil {
...@@ -73,7 +76,13 @@ func (r *RabbitMQ) Send(req map[string]interface{}) error { ...@@ -73,7 +76,13 @@ func (r *RabbitMQ) Send(req map[string]interface{}) error {
} }
func Send(r map[string]interface{}) error { func init() {
s := &RabbitMQ{} once.Do(func() {
return s.Send(r) RM = NewRabbitmq()
} })
\ No newline at end of file
}
func NewRabbitmq() *RabbitMQ{
return &RabbitMQ{}
}
...@@ -68,7 +68,8 @@ func (p *PPT) Transform() (err error) { ...@@ -68,7 +68,8 @@ func (p *PPT) Transform() (err error) {
_ = mime.AddExtensionType(".pptx", "application/vnd.openxmlformats-officedocument.presentationml.presentation") _ = mime.AddExtensionType(".pptx", "application/vnd.openxmlformats-officedocument.presentationml.presentation")
maps["type"] = mime.TypeByExtension(ext) maps["type"] = mime.TypeByExtension(ext)
maps["path"] = objectName maps["path"] = objectName
if err = Send(maps); err != nil {
if err = RM.Send(maps); err != nil {
beeLogger.Log.Errorf("Send Error: %s", err) beeLogger.Log.Errorf("Send Error: %s", err)
_ = UpdateFileError("6", maps["uuid"].(string), maps["roomNum"].(string), objectName) _ = UpdateFileError("6", maps["uuid"].(string), maps["roomNum"].(string), objectName)
return return
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment