添加固件类型字段

.drone.yml

@@ -51,7 +51,7 @@ pipeline:
     port: 22 # 可选，指定 SSH 端口，默认为 22
     script:
       - docker rm -f zjm-service-api
-      - docker pull registry.cn-shenzhen.aliyuncs.com/ax-stor/ax-wl-admin-api:zjm-service-api
+      - docker pull registry.cn-shenzhen.aliyuncs.com/ax-stor/ax-wl-admin-api:zjm-latest4
-      - docker run --name=zjm-service-api -p 30818:8001 -d registry.cn-shenzhen.aliyuncs.com/ax-stor/ax-wl-admin-api:zjm-service-api
+      - docker run --name=zjm-service-api -p 30818:8001 -d registry.cn-shenzhen.aliyuncs.com/ax-stor/ax-wl-admin-api:zjm-latest4
     when:
       branch: develop

model/firmware.go

@@ -5,6 +5,7 @@ import "pure/global"
 type Firmware struct {
 	global.MG_MODEL
 	Source       string `gorm:"type:varchar(255);comment:来源" json:"source"`        //来源(厂家)
+	Type         int    `gorm:"type:int;comment:类型" json:"type"`                   //类型(1:注册app 2:通行app)
 	Ver          string `gorm:"type:varchar(255);comment:版本号" json:"ver"`          //版本号
 	Url          string `gorm:"type:varchar(255);comment:下载地址" json:"url"`         //下载地址
 	Md5          string `gorm:"type:varchar(255);comment:md5" json:"md5"`          //md5

model/request/terminal.go

@@ -16,6 +16,7 @@ type TerminalUpdateGet struct {
 	Cmd  int `json:"cmd"` //命令id 1050
 	Data struct {
 		Flag int `json:"flag"` //获取更新文件标识，值为1
+		Type int `json:"type"` //升级文件类型，1:注册app 2:通行app
 	} `json:"data"`
 	MsgID string `json:"msg_id"` //消息id 报文唯一标识
 	Time  string `json:"time"`   //时间戳

service/termianl.go

@@ -63,7 +63,7 @@ func TerminalUpdateGet(req *request.TerminalUpdateGet, boxID string) (err error,
 		return errors.New("未找到盒子"), nil
 	}
 	//查询最新固件
-	global.MG_DB.Where("status = ? and source=?", 1, terminal.Source).Order("id desc").First(&firmware)
+	global.MG_DB.Where("status = ? and source=? and type=?", 1, terminal.Source, req.Data.Type).Order("id desc").First(&firmware)
 	if terminal.Ver == firmware.Ver {
 		return errors.New("已是最新版本"), nil
 	}