diff --git a/internal/api/third/minio_init.go b/internal/api/third/minio_init.go index e9aa7c1aa..e49651061 100644 --- a/internal/api/third/minio_init.go +++ b/internal/api/third/minio_init.go @@ -75,6 +75,7 @@ func MinioInit() { } // 自动化桶public的代码 err = MinioClient.SetBucketPolicy(context.Background(), config.Config.Credential.Minio.Bucket, policy.BucketPolicyReadWrite) + err = MinioClient.SetBucketPolicy(context.Background(), config.Config.Credential.Minio.AppBucket, policy.BucketPolicyReadWrite) if err != nil { log.NewDebug("", utils.GetSelfFuncName(), "SetBucketPolicy failed please set in web", err.Error()) return diff --git a/internal/cms_api/admin/admin.go b/internal/cms_api/admin/admin.go index eb5ccd156..524f1eeb2 100644 --- a/internal/cms_api/admin/admin.go +++ b/internal/cms_api/admin/admin.go @@ -69,7 +69,7 @@ func UploadUpdateApp(c *gin.Context) { c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": "invalid file path" + err.Error()}) return } - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "name: ", newFileName, newYamlName) + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "name: ", newFileName, newYamlName, fileObj, yamlObj, req.File.Size, req.Yaml.Size) // v2.0.9_app_linux v2.0.9_yaml_linux _, err = apiThird.MinioClient.PutObject(context.Background(), config.Config.Credential.Minio.AppBucket, newFileName, fileObj, req.File.Size, minio.PutObjectOptions{}) _, err = apiThird.MinioClient.PutObject(context.Background(), config.Config.Credential.Minio.AppBucket, newYamlName, yamlObj, req.Yaml.Size, minio.PutObjectOptions{}) diff --git a/pkg/common/db/model_struct.go b/pkg/common/db/model_struct.go index 6ed3f2dc1..eae008542 100644 --- a/pkg/common/db/model_struct.go +++ b/pkg/common/db/model_struct.go @@ -274,8 +274,8 @@ func (DepartmentMember) TableName() string { } type AppVersion struct { - Version string `gorm:"column:user_id;size:64"` - Type int `gorm:"column:user_id;primary_key"` + Version string `gorm:"column:version;size:64"` + Type int `gorm:"column:type;primary_key"` UpdateTime int `gorm:"column:update_time"` ForceUpdate bool `gorm:"column:force_update"` }