添加mq和controller

config/config.go

@@ -28,7 +28,7 @@ type ConfAPI struct {
 	init      	bool
 }
 type ElasticSearch struct{
-	Address string `yaml:"string"`
+	Address string `yaml:"address"`
 }
 
 type EntityRedis struct {

controller/hardware.go

@@ -1,9 +1,9 @@
 package controller
 
 import (
-
+	"background/model"
 	"github.com/gin-gonic/gin"
-
+	"qiniupkg.com/x/log.v7"
 )
 
 
@@ -12,14 +12,25 @@ func AddHardware(c *gin.Context)  {
 	defer func() {
 		c.JSON(200,resp)
 	}()
+	var hardware model.Hardware
 
+	e := c.BindJSON(&hardware)
+	if nil != e{
+		log.Print(e)
+		print(e)
+		return
+	}
+	if nil != hardware.CreateHardware(){
+		print(e)
+		return
+	}
 	resp.Data = nil
 	resp.Msg = "OK"
 	resp.Status = 0
 }
 
 func DeleteHardWare(c *gin.Context)  {
-	
+
 }
 
 func UpdateHardWare(c *gin.Context)  {

db/elasticEngine.go

@@ -19,7 +19,6 @@ type  ElkEngine struct {
 
 
 
-
 func (p *ElkEngine)Create(index string,types string,id string,data interface{}) (error)  {
 	if nil != p{
 		if (reflect.TypeOf(data).Kind() != reflect.String)  && (reflect.TypeOf(data).Kind() != reflect.Struct){

db/sqlManager.go

@@ -38,11 +38,13 @@ func Init() {
 	}else{
 		gDb = Database{Type: string(""), DB: initMysqlTLS(mysqlconf)}
 	}
+	InitELK()
 }
 
 func InitELK()  {
 	var e error
 	elkconf := config.GetElkConfig()
+	log.Print(elkconf)
 	gElkEngine.cli,e = elastic.NewClient(
 		elastic.SetURL(elkconf.Address),
 		// Must turn off sniff in docker

main.go

@@ -116,6 +116,8 @@ func main() {
 		api.POST("/image_upload",fileController.OnUpload)   //  上传图片
 		api.GET("/image_download/:file",fileController.OnDownLoad)  // 下载图片
 		api.GET("/doc_types",controller.ArticlesTypes)        // 获取所有的文章类型
+
+		api.POST("/hardware",controller.AddHardware)   // 新增硬件
 	}
 
 	e := r.Run(":" + strconv.Itoa(config.GetPort()))

model/hardware.go

@@ -1,6 +1,11 @@
 package model
 
-import "time"
+import (
+	"background/db"
+	"github.com/pkg/errors"
+	"qiniupkg.com/x/log.v7"
+	"time"
+)
 
 // this api is based on elasticsearch
 type Hardware struct {
@@ -12,8 +17,14 @@ type Hardware struct {
 	Doc string `json:"doc"`  //文档资料
 }
 
-func (*Hardware )Create()  error{
+func (this *Hardware )CreateHardware( )  error{
-
+	if nil == this{
-
+		return errors.New("null pointer")
+	}
+	e := db.GetElastic().Create("hardware","0","",*this)
+	if nil != e{
+		log.Print(e.Error())
+		return e
+	}
 	return nil;
 }