From 454fb6c8d36670bbf165d0f0a40b89b65f0a1a6a Mon Sep 17 00:00:00 2001
From: wen <wen@theplant.jp>
Date: Thu, 22 Aug 2024 13:17:31 +0800
Subject: [PATCH] no  url set cached url empty string

---
 media/base/base.go                    |  6 +++++-
 media/integration/integration_test.go | 10 ++++++++++
 media/media_library/media_box.go      |  6 +++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/media/base/base.go b/media/base/base.go
index 8a830d4e5..260f3662f 100644
--- a/media/base/base.go
+++ b/media/base/base.go
@@ -139,7 +139,11 @@ func (b Base) URL(styles ...string) string {
 }
 
 func (b Base) URLNoCached(styles ...string) string {
-	return b.URL(styles...) + "?" + fmt.Sprint(time.Now().Nanosecond())
+	i := b.URL(styles...)
+	if i != "" {
+		return i + "?" + fmt.Sprint(time.Now().Nanosecond())
+	}
+	return i
 }
 
 // String return file's url
diff --git a/media/integration/integration_test.go b/media/integration/integration_test.go
index 67ba13503..450d182c8 100644
--- a/media/integration/integration_test.go
+++ b/media/integration/integration_test.go
@@ -184,10 +184,20 @@ func TestUnCachedURL(t *testing.T) {
 		t.Fatalf("set uncached url error %v", b.URLNoCached())
 		return
 	}
+	b.Url = ""
+	if b.URLNoCached() != "" {
+		t.Fatalf("set uncached url empty error %v", b.URLNoCached())
+		return
+	}
 	m := media_library.MediaLibrary{}
 	m.File.Url = "test2.jpg"
 	if !strings.Contains(m.File.URLNoCached(), "test2.jpg?") {
 		t.Fatalf("set uncached url error %v", m.File.URLNoCached())
 		return
 	}
+	m.File.Url = ""
+	if m.File.URLNoCached() != "" {
+		t.Fatalf("set uncached url empty error %v", m.File.URLNoCached())
+		return
+	}
 }
diff --git a/media/media_library/media_box.go b/media/media_library/media_box.go
index 64193d4fe..d9c94c685 100644
--- a/media/media_library/media_box.go
+++ b/media/media_library/media_box.go
@@ -83,7 +83,11 @@ func (mediaBox *MediaBox) URL(styles ...string) string {
 	return mediaBox.Url
 }
 func (mediaBox *MediaBox) URLNoCached(styles ...string) string {
-	return mediaBox.URL(styles...) + "?" + fmt.Sprint(time.Now().Nanosecond())
+	i := mediaBox.URL(styles...)
+	if i != "" {
+		return i + "?" + fmt.Sprint(time.Now().Nanosecond())
+	}
+	return i
 }
 
 func (mediaBox MediaBox) WebpURL(styles ...string) string {