|
|
@@ -2301,7 +2301,6 @@ func GetColorMap() map[int]string {
|
|
|
return colorMap
|
|
|
}
|
|
|
|
|
|
-<<<<<<< HEAD
|
|
|
// 检查src属性是否以http或data:image开头
|
|
|
func isValidSrc(src string) bool {
|
|
|
// 使用Parse函数解析URL
|
|
|
@@ -2398,7 +2397,8 @@ func customXssPolicy() (p *bluemonday.Policy) {
|
|
|
p.AllowAttrs("allow").Matching(regexp.MustCompile(`[a-z; -]*`)).OnElements("iframe")
|
|
|
p.AllowAttrs("allowfullscreen").OnElements("iframe")
|
|
|
return
|
|
|
-=======
|
|
|
+}
|
|
|
+
|
|
|
// SecondsToHHMMSS 秒转HH:MM:SS
|
|
|
func SecondsToHHMMSS(seconds int) string {
|
|
|
duration := time.Duration(seconds) * time.Second
|
|
|
@@ -2441,5 +2441,4 @@ func MillisecondsToHHMMSS(ms int) string {
|
|
|
|
|
|
func ByteToMB(byteCount int) float64 {
|
|
|
return float64(byteCount) / (1024 * 1024)
|
|
|
->>>>>>> custom
|
|
|
}
|
