From 1347633f7e4810998b10c0c7d7a021de67b03aa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=87=E6=AD=A6?= <875892894@qq.com> Date: Sat, 7 Sep 2024 23:12:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=BA=E4=BB=B6=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 4 ++-- model/firmware.go | 1 + model/request/terminal.go | 1 + service/termianl.go | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 1d4be9a..d51c69f 100644 --- a/.drone.yml +++ b/.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 run --name=zjm-service-api -p 30818:8001 -d 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-latest4 when: branch: develop \ No newline at end of file diff --git a/model/firmware.go b/model/firmware.go index 03fe9e6..d7360d7 100644 --- a/model/firmware.go +++ b/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 diff --git a/model/request/terminal.go b/model/request/terminal.go index c228be1..3fbbffc 100644 --- a/model/request/terminal.go +++ b/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"` //时间戳 diff --git a/service/termianl.go b/service/termianl.go index 74a7b60..11f48e2 100644 --- a/service/termianl.go +++ b/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 }