小程序/APP static_domain处理

TruthHun88 · TruthHun88 · commit 8662206a49bf · 2021-01-07T23:11:59.000+08:00
diff --git a/models/api.go b/models/api.go
@@ -16,13 +16,15 @@ var (
 )
 
 func initAPI() {
-	staticDomain = beego.AppConfig.DefaultString("static_domain", "")
-	if staticDomain != "" {
-		staticDomain = strings.TrimRight(staticDomain, "/") + "/"
-	}
 	if strings.ToLower(utils.StoreType) == utils.StoreOss {
-		staticDomain = strings.TrimRight(beego.AppConfig.String("oss::Domain"), "/ ") + "/"
+		staticDomain = strings.TrimSpace(beego.AppConfig.String("oss::Domain"))
+	}
+
+	if strings.TrimRight(staticDomain, "/") == "" {
+		staticDomain = beego.AppConfig.DefaultString("static_domain", "")
 	}
+
+	staticDomain = strings.TrimRight(staticDomain, "/") + "/"
 }
 
 func GetAPIStaticDomain() string {

Original file line number	Diff line number	Diff line change
`@@ -16,13 +16,15 @@ var (`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`func initAPI() {`
`19`		`- staticDomain = beego.AppConfig.DefaultString("static_domain", "")`
`20`		`- if staticDomain != "" {`
`21`		`- staticDomain = strings.TrimRight(staticDomain, "/") + "/"`
`22`		`- }`
`23`	`19`	`if strings.ToLower(utils.StoreType) == utils.StoreOss {`
`24`		`- staticDomain = strings.TrimRight(beego.AppConfig.String("oss::Domain"), "/ ") + "/"`
	`20`	`+ staticDomain = strings.TrimSpace(beego.AppConfig.String("oss::Domain"))`
	`21`	`+ }`
	`22`	`+`
	`23`	`+ if strings.TrimRight(staticDomain, "/") == "" {`
	`24`	`+ staticDomain = beego.AppConfig.DefaultString("static_domain", "")`
`25`	`25`	`}`
	`26`	`+`
	`27`	`+ staticDomain = strings.TrimRight(staticDomain, "/") + "/"`
`26`	`28`	`}`
`27`	`29`
`28`	`30`	`func GetAPIStaticDomain() string {`