|
+
+
+ |
|
|
|
@@ -243,10 +249,19 @@
+
+
+
+
+
-
@@ -393,14 +408,14 @@ function ossApiApp() {
openAdd() {
this.editItem = null;
- this.form = { name: '', endpoint: '', access_key_id: '', access_key_secret: '', bucket_name: '', region: '', is_active: true, notes: '' };
+ this.form = { name: '', provider: 'alibaba', endpoint: '', access_key_id: '', access_key_secret: '', bucket_name: '', region: '', is_active: true, notes: '' };
this.modalError = '';
this.showModal = true;
},
openEdit(item) {
this.editItem = item;
- this.form = { name: item.name || '', endpoint: item.endpoint || '', access_key_id: '', access_key_secret: '', bucket_name: item.bucket_name || '', region: item.region || '', is_active: item.is_active, notes: item.notes || '' };
+ this.form = { name: item.name || '', provider: item.provider || 'alibaba', endpoint: item.endpoint || '', access_key_id: '', access_key_secret: '', bucket_name: item.bucket_name || '', region: item.region || '', is_active: item.is_active, notes: item.notes || '' };
this.modalError = '';
this.showModal = true;
},
diff --git a/rest/controllers/api/oss_helpers.go b/rest/controllers/api/oss_helpers.go
new file mode 100644
index 0000000..59f6ecb
--- /dev/null
+++ b/rest/controllers/api/oss_helpers.go
@@ -0,0 +1,40 @@
+package controllers
+
+import (
+ "encoding/json"
+
+ "github.com/gofiber/fiber/v2"
+ "github.com/sujit-baniya/fiber-boilerplate/pkg/models"
+ "github.com/sujit-baniya/fiber-boilerplate/pkg/services"
+)
+
+// getOSSFromBody creates an OSSProvider from the oss_api_id in the request body.
+// If oss_api_id is missing, it falls back to the last active config (legacy behavior).
+func getOSSFromBody(c *fiber.Ctx) (services.OSSProvider, error) {
+ var req struct {
+ OssAPIID *uint `json:"oss_api_id"`
+ }
+ if err := json.Unmarshal(c.Body(), &req); err != nil {
+ req.OssAPIID = nil
+ }
+
+ if req.OssAPIID != nil {
+ return services.NewOSSProviderByID(*req.OssAPIID)
+ }
+ return services.NewOSSProviderFromDB()
+}
+
+// getOSSFromQuery creates an OSSProvider from the oss_api_id query param.
+// If missing, falls back to last active config.
+func getOSSFromQuery(c *fiber.Ctx) (services.OSSProvider, error) {
+ id := c.QueryInt("oss_api_id", 0)
+ if id > 0 {
+ return services.NewOSSProviderByID(uint(id))
+ }
+
+ lastActive, err := models.GetLastActiveOssApi()
+ if err != nil {
+ return nil, err
+ }
+ return services.NewOSSProvider(lastActive)
+}
diff --git a/rest/controllers/api/vcard_qr.go b/rest/controllers/api/vcard_qr.go
index 0a32322..b5aee17 100755
--- a/rest/controllers/api/vcard_qr.go
+++ b/rest/controllers/api/vcard_qr.go
@@ -65,14 +65,14 @@ func CreateQr(c *fiber.Ctx) error {
defer os.Remove(tmpPath)
// 5. Subir a OSS
- ossService, err := services.NewOSSServiceFromDB()
+ ossProvider, err := getOSSFromBody(c)
if err != nil {
return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
"error": "Error de conexión con OSS",
})
}
- if err := ossService.UploadFile(fileName, tmpPath); err != nil {
+ if err := ossProvider.UploadFile(fileName, tmpPath); err != nil {
log.Printf("Error subiendo archivo a OSS: %v", err)
return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
"error": "Error subiendo archivo a OSS",
@@ -80,7 +80,7 @@ func CreateQr(c *fiber.Ctx) error {
}
// 6. URL del archivo
- url := fmt.Sprintf("https://%s.%s/%s", ossService.BucketName, ossService.Endpoint, fileName)
+ url := ossProvider.PublicURL(fileName)
// 7. Buscar si ya existe un registro con ese vcard_id
var existing models.QrVcard
@@ -110,9 +110,9 @@ func CreateQr(c *fiber.Ctx) error {
}
} else {
// Ya existe, eliminar el QR anterior en OSS
- oldFilePath := strings.Replace(existing.Qr, fmt.Sprintf("https://%s.%s/", ossService.BucketName, ossService.Endpoint), "", 1)
+ oldFilePath := strings.Replace(existing.Qr, ossProvider.PublicURL(""), "", 1)
- if err := ossService.DeleteFile(oldFilePath); err != nil {
+ if err := ossProvider.DeleteFile(oldFilePath); err != nil {
log.Printf("Error al eliminar QR anterior en OSS: %v", err)
// No retornamos error, porque queremos continuar de todas formas
}
@@ -224,14 +224,14 @@ func CreateUrlQr(c *fiber.Ctx) error {
defer os.Remove(tmpPath)
// 5. Subir a OSS
- ossService, err := services.NewOSSServiceFromDB()
+ ossProvider, err := getOSSFromBody(c)
if err != nil {
return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
"error": "Error de conexión con OSS",
})
}
- if err := ossService.UploadFile(fileName, tmpPath); err != nil {
+ if err := ossProvider.UploadFile(fileName, tmpPath); err != nil {
log.Printf("Error subiendo archivo a OSS: %v", err)
return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
"error": "Error subiendo archivo a OSS",
@@ -239,8 +239,7 @@ func CreateUrlQr(c *fiber.Ctx) error {
}
// 6. URL del archivo
- url := fmt.Sprintf("https://%s.%s/%s", ossService.BucketName, ossService.Endpoint, fileName)
-
+ url := ossProvider.PublicURL(fileName)
// 8. Retornar la URL
diff --git a/rest/controllers/api/vcard_vcf.go b/rest/controllers/api/vcard_vcf.go
index 709bb3b..a4ce691 100755
--- a/rest/controllers/api/vcard_vcf.go
+++ b/rest/controllers/api/vcard_vcf.go
@@ -46,14 +46,14 @@ func CreateVcf(c *fiber.Ctx) error {
defer os.Remove(tmpPath)
// 3. Subir a OSS
- ossService, err := services.NewOSSServiceFromDB()
+ ossProvider, err := getOSSFromBody(c)
if err != nil {
return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
"error": "Error de conexión con OSS",
})
}
- if err := ossService.UploadFile(fileName, tmpPath); err != nil {
+ if err := ossProvider.UploadFile(fileName, tmpPath); err != nil {
log.Printf("Error subiendo archivo a OSS: %v", err)
return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
"error": "Error subiendo archivo a OSS",
@@ -61,7 +61,7 @@ func CreateVcf(c *fiber.Ctx) error {
}
// 4. URL del archivo
- url := fmt.Sprintf("https://%s.%s/%s", ossService.BucketName, ossService.Endpoint, fileName)
+ url := ossProvider.PublicURL(fileName)
// 5. Buscar si ya existe un registro con ese vcard_id
var existing models.VcfVcard
diff --git a/rest/controllers/oss_api_controller.go b/rest/controllers/oss_api_controller.go
index 2c7db2e..27e7dd6 100644
--- a/rest/controllers/oss_api_controller.go
+++ b/rest/controllers/oss_api_controller.go
@@ -12,6 +12,18 @@ import (
"github.com/sujit-baniya/fiber-boilerplate/pkg/services"
)
+// helper: obtiene el provider OSS por ID o el activo por defecto
+func getOSSProvider(c *fiber.Ctx) (services.OSSProvider, error) {
+ idStr := c.Query("oss_api_id", "")
+ if idStr != "" {
+ id, err := strconv.ParseUint(idStr, 10, 32)
+ if err == nil && id > 0 {
+ return services.NewOSSProviderByID(uint(id))
+ }
+ }
+ return services.NewOSSProviderFromDB()
+}
+
// OssApiIndex renderiza la vista del panel de gestión de Alibaba Cloud OSS.
func OssApiIndex(c *fiber.Ctx) error {
data := fiber.Map{
@@ -143,6 +155,15 @@ func UpdateOssApiConfig(c *fiber.Ctx) error {
return c.JSON(fiber.Map{"ok": true, "item": existing})
}
+// GetActiveOssApiList devuelve todas las configuraciones activas (para selectores UI).
+func GetActiveOssApiList(c *fiber.Ctx) error {
+ items, err := models.GetActiveOssApis()
+ if err != nil {
+ return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{"error": err.Error()})
+ }
+ return c.JSON(fiber.Map{"data": items})
+}
+
// DeleteOssApiConfig elimina una configuración de Alibaba Cloud OSS.
func DeleteOssApiConfig(c *fiber.Ctx) error {
id, err := strconv.ParseUint(c.Params("id"), 10, 64)
@@ -166,7 +187,7 @@ func DeleteOssApiConfig(c *fiber.Ctx) error {
// OssBrowserList lista los objetos del bucket activo con soporte de carpetas virtuales.
// Query params: prefix (carpeta actual), marker (paginación), max_keys
func OssBrowserList(c *fiber.Ctx) error {
- svc, err := services.NewOSSServiceFromDB()
+ svc, err := getOSSProvider(c)
if err != nil {
return c.Status(fiber.StatusServiceUnavailable).JSON(fiber.Map{"error": "Sin configuración OSS activa: " + err.Error()})
}
@@ -190,7 +211,7 @@ func OssBrowserSignedURL(c *fiber.Ctx) error {
return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{"error": "key es requerido"})
}
- svc, err := services.NewOSSServiceFromDB()
+ svc, err := getOSSProvider(c)
if err != nil {
return c.Status(fiber.StatusServiceUnavailable).JSON(fiber.Map{"error": "Sin configuración OSS activa: " + err.Error()})
}
@@ -213,7 +234,7 @@ func OssBrowserDelete(c *fiber.Ctx) error {
return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{"error": "key es requerido"})
}
- svc, err := services.NewOSSServiceFromDB()
+ svc, err := getOSSProvider(c)
if err != nil {
return c.Status(fiber.StatusServiceUnavailable).JSON(fiber.Map{"error": "Sin configuración OSS activa: " + err.Error()})
}
@@ -249,7 +270,7 @@ func OssBrowserUpload(c *fiber.Ctx) error {
ct = "application/octet-stream"
}
- svc, err := services.NewOSSServiceFromDB()
+ svc, err := getOSSProvider(c)
if err != nil {
return c.Status(fiber.StatusServiceUnavailable).JSON(fiber.Map{"error": "Sin configuración OSS activa: " + err.Error()})
}
diff --git a/rest/routes/user.go b/rest/routes/user.go
index 9b217dd..03954de 100755
--- a/rest/routes/user.go
+++ b/rest/routes/user.go
@@ -288,9 +288,10 @@ func UserRoutes(app fiber.Router) {
protected.Put("/ai-config/:id", controllers.UpdateAiConfigHandler)
protected.Delete("/ai-config/:id", controllers.DeleteAiConfigHandler)
- // ─── Alibaba Cloud OSS API ────────────────────────────────────────────────
+ // ─── OSS API (Alibaba Cloud + S3/MinIO) ────────────────────────────────────
protected.Get("/oss-api", middlewares.MenuMiddleware, controllers.OssApiIndex)
protected.Get("/loadossapi", controllers.GetOssApiConfigs)
+ protected.Get("/oss-api/active", controllers.GetActiveOssApiList)
protected.Post("/oss-api", controllers.CreateOssApiConfig)
protected.Put("/oss-api/:id", controllers.UpdateOssApiConfig)
protected.Delete("/oss-api/:id", controllers.DeleteOssApiConfig)