blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

update app

Browse Source
This commit is contained in:
wangchuxiao 2022-05-10 17:17:20 +08:00
parent 608b166b32
commit f5d4397f0b
4 changed files with 29 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
internal/api/third/minio_storage_credential.go
View File

@ -228,10 +228,9 @@ func GetDownloadURL(c *gin.Context) {
app, err := imdb.GetNewestVersion(req.Type)
if err != nil {
log.NewError(req.OperationID, utils.GetSelfFuncName(), "getNewestVersion failed", err.Error())
c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": "getNewestVersion failed" + err.Error()})
return
}
if app.Version != req.Version {
if app != nil {
if app.Version != req.Version && app.Version != "" {
resp.Data.HasNewVersion = true
if app.ForceUpdate == true {
resp.Data.ForceUpdate = true
@ -244,3 +243,5 @@ func GetDownloadURL(c *gin.Context) {
c.JSON(http.StatusOK, resp)
}
}
c.JSON(http.StatusBadRequest, gin.H{"errCode": 0, "errMsg": "not found app version"})
}

11
internal/cms_api/admin/admin.go
View File

@ -153,18 +153,11 @@ func GetDownloadURL(c *gin.Context) {
return
}
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req)
//fileName, yamlName, err := utils.GetUploadAppNewName(req.Type, req.Version, req.)
//if err != nil {
// log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetUploadAppNewName failed", err.Error())
// c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": "invalid file type" + err.Error()})
// return
//}
app, err := imdb.GetNewestVersion(req.Type)
if err != nil {
log.NewError(req.OperationID, utils.GetSelfFuncName(), "getNewestVersion failed", err.Error())
c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": "getNewestVersion failed" + err.Error()})
return
}
if app != nil {
if app.Version != req.Version {
resp.Data.HasNewVersion = true
if app.ForceUpdate == true {
@ -178,6 +171,8 @@ func GetDownloadURL(c *gin.Context) {
c.JSON(http.StatusOK, resp)
}
}
c.JSON(http.StatusBadRequest, gin.H{"errCode": 0, "errMsg": "not found app version"})
}
func MinioUploadFile(c *gin.Context) {
var (

2
pkg/base_info/minio_api_struct.go
View File

@ -32,7 +32,7 @@ type UploadUpdateAppReq struct {
Version string `form:"version" binding:"required"`
File *multipart.FileHeader `form:"file" binding:"required"`
Yaml *multipart.FileHeader `form:"yaml" binding:"required"`
ForceUpdate bool `form:"forceUpdate" binding:"required"`
ForceUpdate bool `form:"forceUpdate"`
}
type UploadUpdateAppResp struct {

4
pkg/common/db/mysql_model/im_mysql_model/file_model.go
View File

@ -31,10 +31,10 @@ func UpdateAppVersion(appType int, version string, forceUpdate bool, fileName, y
func GetNewestVersion(appType int) (*db.AppVersion, error) {
dbConn, err := db.DB.MysqlDB.DefaultGormDB()
app := db.AppVersion{}
if err != nil {
return nil, err
return &app, err
}
dbConn.LogMode(true)
app := db.AppVersion{}
return &app, dbConn.Model(db.AppVersion{}).First(&app, appType).Error
}