conflict #173

Merged
chenhao merged 4 commits from conflict into test 2024-03-12 12:13:48 +08:00
1 changed files with 3 additions and 3 deletions
Showing only changes of commit 19f60097ff - Show all commits

View File

@ -42,9 +42,9 @@ func SetFileServerDomainName(fileServerDomainName string) {
func (p *MediaFiller) GetFileServerDomain() string { func (p *MediaFiller) GetFileServerDomain() string {
// cdn测试 // cdn测试
if rand.Intn(100) < 20 { //if rand.Intn(100) < 20 {
return "https://filecdn01.tiefen.fun/" return "https://filecdn01.tiefen.fun/"
} //}
return defaultMediaFiller.fileServerDomainName return defaultMediaFiller.fileServerDomainName
} }