From 41db6fa0afcaa9ec38fc5eb6941d77adf82ca806 Mon Sep 17 00:00:00 2001 From: zzh <1368735060@qq.com> Date: Wed, 9 Sep 2026 12:38:12 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E7=94=9F=E4=BA=A7/=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=88=86=E7=A6=BB=EF=BC=8C=E5=B9=B6=E6=94=B6?= =?UTF-8?q?=E7=B4=A7=E5=BE=AE=E4=BF=A1=20mp=20AppId=20=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Development 指向 oms.nanafa.com；Production 指向 ideship.com。微信 /wechat/mp/{appId} 仅匹配 wx 前缀。 Co-authored-by: Cursor --- .../Integrations/Itfx/ItfxGatewayOptions.cs | 4 +-- .../WeChatRouteIntegrationTests.cs | 2 +- .../Auth/AuthService.WeChatMp.cs | 5 +-- .../appsettings.Development.json | 9 +++-- .../appsettings.Production.json | 34 +++++++++++++++++++ 5 files changed, 47 insertions(+), 7 deletions(-) create mode 100644 src/SimpleAdmin.Api/appsettings.Production.json diff --git a/src/Oms.Application/Integrations/Itfx/ItfxGatewayOptions.cs b/src/Oms.Application/Integrations/Itfx/ItfxGatewayOptions.cs index 1ba817e..6cbe9af 100644 --- a/src/Oms.Application/Integrations/Itfx/ItfxGatewayOptions.cs +++ b/src/Oms.Application/Integrations/Itfx/ItfxGatewayOptions.cs @@ -8,9 +8,9 @@ public class ItfxGatewayOptions public const string SectionName = "Oms:Itfx"; /// - /// itfx 服务根地址，如 http://api.nanafa.com/itfx。 + /// itfx 服务根地址。生产默认 api.ideship.com；测试用 appsettings.Development / Consul 覆盖为 api.nanafa.com。 /// - public string BaseUrl { get; set; } = "http://api.nanafa.com/itfx"; + public string BaseUrl { get; set; } = "https://api.ideship.com/itfx"; public int TimeoutSeconds { get; set; } = 30; diff --git a/src/SimpleAdmin.Api.IntegrationTests/WeChatRouteIntegrationTests.cs b/src/SimpleAdmin.Api.IntegrationTests/WeChatRouteIntegrationTests.cs index f6229da..9a412b6 100644 --- a/src/SimpleAdmin.Api.IntegrationTests/WeChatRouteIntegrationTests.cs +++ b/src/SimpleAdmin.Api.IntegrationTests/WeChatRouteIntegrationTests.cs @@ -30,7 +30,7 @@ public class WeChatRouteIntegrationTests await using var host = await SimpleAdminApiTestHost.CreateAsync(configureServices: ConfigureWeChatFallback); host.RoutePatterns.Should().Contain("apiwechat/verification"); - host.RoutePatterns.Should().Contain("wechat/mp/{appId}"); + host.RoutePatterns.Should().Contain("wechat/mp/{appId:regex(^wx[A-Za-z0-9]+$)}"); host.RoutePatterns.Should().Contain("wechat/mp/login-qrcode"); host.RoutePatterns.Should().Contain("wechat/oauth/config"); host.RoutePatterns.Should().Contain("wechat/mp/follow-qrcode"); diff --git a/src/SimpleAdmin.Api/Auth/AuthService.WeChatMp.cs b/src/SimpleAdmin.Api/Auth/AuthService.WeChatMp.cs index f774fa1..914cee0 100644 --- a/src/SimpleAdmin.Api/Auth/AuthService.WeChatMp.cs +++ b/src/SimpleAdmin.Api/Auth/AuthService.WeChatMp.cs @@ -70,9 +70,10 @@ public partial class AuthService /// /// 微信服务器接入验签，验签通过后原样返回 echostr。 + /// appId 仅匹配 wx 开头，避免 login-qrcode / oauth-config 等静态段落入本路由。 /// [AllowAnonymous] - [HttpGet("/wechat/mp/{appId}")] + [HttpGet("/wechat/mp/{appId:regex(^wx[A-Za-z0-9]+$)}")] [Produces("text/plain")] [ApiExplorerSettings(GroupName = "WeChat")] public async Task WeChatValidateAsync( @@ -120,7 +121,7 @@ public partial class AuthService /// 微信消息/事件推送（明文，XML/JSON）。 /// [AllowAnonymous] - [HttpPost("/wechat/mp/{appId}")] + [HttpPost("/wechat/mp/{appId:regex(^wx[A-Za-z0-9]+$)}")] [Consumes("text/xml", "application/xml", "application/json", "text/plain")] [Produces("text/plain", "application/xml")] [ApiExplorerSettings(GroupName = "WeChat")] diff --git a/src/SimpleAdmin.Api/appsettings.Development.json b/src/SimpleAdmin.Api/appsettings.Development.json index f9647a9..1439c62 100644 --- a/src/SimpleAdmin.Api/appsettings.Development.json +++ b/src/SimpleAdmin.Api/appsettings.Development.json @@ -12,7 +12,12 @@ }, "App": { "Urls": ["http://localhost:5281"], - "CorsOrigins": ["http://localhost:5173", "http://localhost:5281"], + "CorsOrigins": [ + "http://localhost:5173", + "http://localhost:5281", + "https://oms.nanafa.com", + "http://oms.nanafa.com" + ], "SendStartupNotification": false }, "Jwt": { @@ -46,7 +51,7 @@ }, "WeChat": { "Mp": { - "AppId": "wxd5141ba46c856e1f", + "AppId": "wxfffea62e089ee15f", "Secret": "379f51a89419dc36fbb9167feef6f89a", "Token": "c6ca74013df823c0e1da0feaaaf8bf66", "EncodingAesKey": "", diff --git a/src/SimpleAdmin.Api/appsettings.Production.json b/src/SimpleAdmin.Api/appsettings.Production.json new file mode 100644 index 0000000..49f2a98 --- /dev/null +++ b/src/SimpleAdmin.Api/appsettings.Production.json @@ -0,0 +1,34 @@ +{ + "UseLocalConfigs": false, + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "App": { + "CorsOrigins": [ + "https://ideship.com", + "https://www.ideship.com" + ], + "SendStartupNotification": false + }, + "WeChat": { + "Mp": { + "OAuthRedirectBase": "https://ideship.com", + "FollowUrl": "" + } + }, + "Oms": { + "TrackService": { + "Enabled": true, + "BaseUrl": "https://api.ideship.com/track" + }, + "Itfx": { + "BaseUrl": "https://api.ideship.com/itfx" + }, + "PlatformShop": { + "FrontendBaseUrl": "https://ideship.com" + } + } +}