diff --git a/config/conf_loader.go b/config/conf_loader.go index 5494e3d..7c3bce1 100644 --- a/config/conf_loader.go +++ b/config/conf_loader.go @@ -26,7 +26,7 @@ import ( func GetConfLoader() *onion.Onion { logger := zerolog.New(os.Stdout).With().Timestamp().Logger() AppName := GetAppName() - EnvPrefix := strings.ToUpper(AppName[0:2]+AppName[3:]) + "_" + EnvPrefix := "OC_" defaultConfigFile := "/etc/oc/" + AppName[3:] + ".json" localConfigFile := "./" + AppName[3:] + ".json" var configFile string diff --git a/models/resources/resource_model/resource_model.go b/models/resources/resource_model/resource_model.go index c4aaff4..423f384 100644 --- a/models/resources/resource_model/resource_model.go +++ b/models/resources/resource_model/resource_model.go @@ -21,16 +21,17 @@ type WebResource struct { * it defines the resource data */ type AbstractResource struct { - utils.AbstractObject // AbstractObject contains the basic fields of an object (id, name) - ShortDescription string `json:"short_description,omitempty" bson:"short_description,omitempty" validate:"required"` // ShortDescription is the short description of the resource - Description string `json:"description,omitempty" bson:"description,omitempty"` // Description is the description of the resource - Logo string `json:"logo,omitempty" bson:"logo,omitempty" validate:"required"` // Logo is the logo of the resource - Owner string `json:"owner,omitempty" bson:"owner,omitempty" validate:"required"` // Owner is the owner of the resource - OwnerLogo string `json:"owner_logo,omitempty" bson:"owner_logo,omitempty"` // OwnerLogo is the owner logo of the resource - SourceUrl string `json:"source_url,omitempty" bson:"source_url,omitempty" validate:"required"` // SourceUrl is the source URL of the resource - PeerID string `json:"peer_id,omitempty" bson:"peer_id,omitempty" validate:"required"` // PeerID is the ID of the peer getting this resource - License string `json:"license,omitempty" bson:"license,omitempty"` // License is the license of the resource - ResourceModel *ResourceModel `json:"resource_model,omitempty" bson:"resource_model,omitempty"` // ResourceModel is the model of the resource + utils.AbstractObject // AbstractObject contains the basic fields of an object (id, name) + ShortDescription string `json:"short_description,omitempty" bson:"short_description,omitempty" validate:"required"` // ShortDescription is the short description of the resource + Description string `json:"description,omitempty" bson:"description,omitempty"` // Description is the description of the resource + Logo string `json:"logo,omitempty" bson:"logo,omitempty" validate:"required"` // Logo is the logo of the resource + Owner string `json:"owner,omitempty" bson:"owner,omitempty" validate:"required"` // Owner is the owner of the resource + OwnerLogo string `json:"owner_logo,omitempty" bson:"owner_logo,omitempty"` // OwnerLogo is the owner logo of the resource + SourceUrl string `json:"source_url,omitempty" bson:"source_url,omitempty" validate:"required"` // SourceUrl is the source URL of the resource + + PeerID string `json:"peer_id,omitempty" bson:"peer_id,omitempty"` // PeerID is the ID of the peer getting this resource + License string `json:"license,omitempty" bson:"license,omitempty"` // License is the license of the resource + ResourceModel *ResourceModel `json:"resource_model,omitempty" bson:"resource_model,omitempty"` // ResourceModel is the model of the resource AllowedPeersGroup map[string][]string `json:"allowed_peers_group,omitempty" bson:"allowed_peers_group,omitempty"` // AllowedPeersGroup is the group of allowed peers