Merge branch 'master' into publish

dotnetcore · Oct 6, 2023 · 28d29ff · 28d29ff
2 parents 6f91161 + 3e96b05
commit 28d29ff
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/src/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj b/src/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj
@@ -3,11 +3,11 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
-    <AssemblyVersion>1.7.0</AssemblyVersion>
-    <Version>1.7.0-rc</Version>
+    <AssemblyVersion>1.7.1</AssemblyVersion>
+    <Version>1.7.1</Version>
     <PackageVersion>1.6.20</PackageVersion>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <FileVersion>1.7.0</FileVersion>
+    <FileVersion>1.7.1</FileVersion>
     <Authors>kklldog</Authors>
     <Company>kklldog</Company>
   </PropertyGroup>

diff --git 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
@@ -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
@@ -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)
             }
         }
     }
-}
+}