diff --git a/src/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj b/src/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj index 19ae642a..fe11827c 100644 --- a/src/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj +++ b/src/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj @@ -3,11 +3,11 @@ net6.0 InProcess - 1.7.0 - 1.7.0-rc + 1.7.1 + 1.7.1 1.6.20 Linux - 1.7.0 + 1.7.1 kklldog kklldog diff --git a/src/AgileConfig.Server.Apisite/Websocket/MessageHandlers/MessageHandler.cs b/src/AgileConfig.Server.Apisite/Websocket/MessageHandlers/MessageHandler.cs index effd63f8..d39eee7c 100644 --- a/src/AgileConfig.Server.Apisite/Websocket/MessageHandlers/MessageHandler.cs +++ b/src/AgileConfig.Server.Apisite/Websocket/MessageHandlers/MessageHandler.cs @@ -4,6 +4,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; +using System.Web; using Agile.Config.Protocol; using AgileConfig.Server.IService; using Microsoft.AspNetCore.Http; @@ -58,10 +59,12 @@ public async Task Handle(string message, HttpRequest request, WebsocketClient cl message = ""; } - if (message == "ping") + // "ping" is old version + if (message == "ping" || message == "c:ping") { //如果是ping,回复本地数据的md5版本 var appId = request.Headers["appid"]; + appId = HttpUtility.UrlDecode(appId); var env = request.Headers["env"]; env = await _configService.IfEnvEmptySetDefaultAsync(env); var md5 = await _configService.AppPublishedConfigsMd5CacheWithInheritanced(appId, env); diff --git a/src/AgileConfig.Server.Apisite/Websocket/WebsocketHandlerMiddleware.cs b/src/AgileConfig.Server.Apisite/Websocket/WebsocketHandlerMiddleware.cs index 58ace610..3e543008 100644 --- a/src/AgileConfig.Server.Apisite/Websocket/WebsocketHandlerMiddleware.cs +++ b/src/AgileConfig.Server.Apisite/Websocket/WebsocketHandlerMiddleware.cs @@ -56,6 +56,8 @@ public async Task Invoke( appId = appIdSecret.Item1; } + appId = HttpUtility.UrlDecode(appId); + var env = context.Request.Headers["env"]; if (!string.IsNullOrEmpty(env)) { diff --git a/src/AgileConfig.Server.Data.Freesql/EnsureTables.cs b/src/AgileConfig.Server.Data.Freesql/EnsureTables.cs index 1c5e37d5..32323e26 100644 --- a/src/AgileConfig.Server.Data.Freesql/EnsureTables.cs +++ b/src/AgileConfig.Server.Data.Freesql/EnsureTables.cs @@ -16,7 +16,7 @@ public class EnsureTables " SELECT count(1) FROM information_schema.TABLES WHERE table_schema= @schema AND table_name ='agc_app'"; private const string SqlServer_ExistTableSql = - "SELECT COUNT(1) FROM dbo.SYSOBJECTS WHERE ID = object_id(N'[dbo].[agc_app]') and OBJECTPROPERTY(id, N'IsUserTable') = 1"; + "SELECT COUNT(1) FROM dbo.sysobjects WHERE ID = object_id(N'[dbo].[agc_app]') and OBJECTPROPERTY(id, N'IsUserTable') = 1"; private const string Oracle_ExistTableSql = "select count(1) from user_tables where table_name = 'agc_app'"; private const string PostgreSql_ExistTableSql = "select count(1) from pg_class where relname = 'agc_app'"; @@ -91,4 +91,4 @@ public static void Ensure(IFreeSql instance) } } } -} \ No newline at end of file +}