Skip to content

Commit 5e6490a

Browse files
committed
fix: youchuan cdn2
1 parent 8d85407 commit 5e6490a

5 files changed

Lines changed: 14 additions & 5 deletions

File tree

src/Midjourney.API/Midjourney.API.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<IncludeAllContentForSelfExtract>true</IncludeAllContentForSelfExtract>
1010
<EnableCompressionInSingleFile>true</EnableCompressionInSingleFile>
1111
<SatelliteResourceLanguages>zh-Hans</SatelliteResourceLanguages>
12-
<AssemblyVersion>11.9.12</AssemblyVersion>
12+
<AssemblyVersion>11.9.13</AssemblyVersion>
1313
<DockerfileContext>..\..</DockerfileContext>
1414
</PropertyGroup>
1515

src/Midjourney.Base/Models/TaskInfo.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,11 @@ public class TaskInfo : DomainObject
7777
/// </summary>
7878
public const string YOUCHUAN_CDN = "youchuan-imagine.oss-cn-shanghai.aliyuncs.com";
7979

80+
/// <summary>
81+
/// 悠船 CDN 域名2
82+
/// </summary>
83+
public const string YOUCHUAN_CDN2 = "imagine-cdn.youchuan.cn";
84+
8085
/// <summary>
8186
/// 悠船内网 CDN 域名
8287
/// </summary>

src/Midjourney.Base/Models/WebpMergerSimple.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,9 +444,11 @@ public static string ReplaceInternalUrl(string url, bool youChuanInternalDownloa
444444
{
445445
if (!string.IsNullOrWhiteSpace(url) && youChuanInternalDownload)
446446
{
447-
if (url.Contains(TaskInfo.YOUCHUAN_CDN, StringComparison.OrdinalIgnoreCase))
447+
if (url.Contains(TaskInfo.YOUCHUAN_CDN, StringComparison.OrdinalIgnoreCase)
448+
|| url.Contains(TaskInfo.YOUCHUAN_CDN2, StringComparison.OrdinalIgnoreCase))
448449
{
449-
return url.Replace(TaskInfo.YOUCHUAN_CDN, TaskInfo.YOUCHUAN_CDN_INTERNAL);
450+
return url.Replace(TaskInfo.YOUCHUAN_CDN, TaskInfo.YOUCHUAN_CDN_INTERNAL)
451+
.Replace(TaskInfo.YOUCHUAN_CDN2, TaskInfo.YOUCHUAN_CDN_INTERNAL);
450452
}
451453
}
452454
return url;

src/Midjourney.Base/StorageHelper.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1027,9 +1027,11 @@ public static string ReplaceInternalUrl(TaskInfo info, string url)
10271027
{
10281028
if (info?.IsPartner == true && !string.IsNullOrWhiteSpace(url) && GlobalConfiguration.Setting.EnableYouChuanInternalDownload)
10291029
{
1030-
if (url.Contains(TaskInfo.YOUCHUAN_CDN, StringComparison.OrdinalIgnoreCase))
1030+
if (url.Contains(TaskInfo.YOUCHUAN_CDN, StringComparison.OrdinalIgnoreCase)
1031+
|| url.Contains(TaskInfo.YOUCHUAN_CDN2, StringComparison.OrdinalIgnoreCase))
10311032
{
1032-
return url.Replace(TaskInfo.YOUCHUAN_CDN, TaskInfo.YOUCHUAN_CDN_INTERNAL);
1033+
return url.Replace(TaskInfo.YOUCHUAN_CDN, TaskInfo.YOUCHUAN_CDN_INTERNAL)
1034+
.Replace(TaskInfo.YOUCHUAN_CDN2, TaskInfo.YOUCHUAN_CDN_INTERNAL);
10331035
}
10341036
}
10351037
return url;

src/lib/Midjourney.License.dll

-3.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)