Merge pull request #217 from dotnetcore/master

kklldog · web-flow · commit ed4df466ce14 · 2025-07-18T00:28:36.000+08:00
检测表是否存在的时候忽略大小写
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>net8.0</TargetFramework>
 		<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
-		<AssemblyVersion>1.9.12</AssemblyVersion>
-		<Version>1.9.12</Version>
-		<PackageVersion>1.9.12</PackageVersion>
+		<AssemblyVersion>1.9.13</AssemblyVersion>
+		<Version>1.9.13</Version>
+		<PackageVersion>1.9.13</PackageVersion>
 		<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-		<FileVersion>1.9.12</FileVersion>
+		<FileVersion>1.9.13</FileVersion>
 		<Authors>kklldog</Authors>
 		<Company>kklldog</Company>
 	</PropertyGroup>
diff --git a/src/AgileConfig.Server.Data.Freesql/EnsureTables.cs b/src/AgileConfig.Server.Data.Freesql/EnsureTables.cs
@@ -2,24 +2,23 @@
 using AgileConfig.Server.Data.Entity;
 using Microsoft.Extensions.Logging;
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace AgileConfig.Server.Data.Freesql
 {
     public class EnsureTables
     {
         private const string Sqlite_ExistTableSql =
-            "SELECT count(1) FROM sqlite_master WHERE type='table' AND name = 'agc_app'";
+            "SELECT count(1) FROM sqlite_master WHERE type='table' AND (name = 'agc_app' OR name = 'AGC_APP')";
 
         private const string Mysql_ExistTableSql =
-            " SELECT count(1) FROM information_schema.TABLES WHERE table_schema= @schema AND table_name ='agc_app'";
+            " SELECT count(1) FROM information_schema.TABLES WHERE table_schema= @schema AND (table_name ='agc_app' OR 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";
 
-        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'";
+        private const string Oracle_ExistTableSql = "select count(1) from user_tables where table_name = 'agc_app' or table_name = 'AGC_APP'";
+
+        private const string PostgreSql_ExistTableSql = "select count(1) from pg_class where relname = 'agc_app' or relname = 'AGC_APP'";
 
         public static bool ExistTable(IFreeSql instance)
         {
diff --git a/src/AgileConfig.Server.Data.Repository.Freesql/AgileConfig.Server.Data.Repository.Freesql.csproj b/src/AgileConfig.Server.Data.Repository.Freesql/AgileConfig.Server.Data.Repository.Freesql.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
+    <Nullable>disable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/AgileConfig.Server.Data.Repository.Freesql/FreesqlRepositoryServiceRegister.cs b/src/AgileConfig.Server.Data.Repository.Freesql/FreesqlRepositoryServiceRegister.cs
@@ -22,30 +22,26 @@ public void AddFixedRepositories(IServiceCollection sc)
 
         public T GetServiceByEnv<T>(IServiceProvider sp, string env) where T : class
         {
+            var factory = sp.GetService<IFreeSqlFactory>();
+
             if (typeof(T) == typeof(IUow))
             {
-                var factory = sp.GetService<IFreeSqlFactory>();
-                var fsq = factory.Create(env);
-                return (new FreeSqlUow(fsq)) as T;
+                return (new FreeSqlUow(factory.Create(env))) as T;
             }
             if (typeof(T) == typeof(IConfigPublishedRepository))
             {
-                var factory = sp.GetService<IFreeSqlFactory>();
                 return new ConfigPublishedRepository(factory.Create(env)) as T;
             }
             if (typeof(T) == typeof(IConfigRepository))
             {
-                var factory = sp.GetService<IFreeSqlFactory>();
                 return new ConfigRepository(factory.Create(env)) as T;
             }
             if (typeof(T) == typeof(IPublishDetailRepository))
             {
-                var factory = sp.GetService<IFreeSqlFactory>();
                 return new PublishDetailRepository(factory.Create(env)) as T;
             }
             if (typeof(T) == typeof(IPublishTimelineRepository))
             {
-                var factory = sp.GetService<IFreeSqlFactory>();
                 return new PublishTimelineRepository(factory.Create(env)) as T;
             }
 
@@ -56,7 +52,7 @@ public bool IsSuit4Provider(string provider)
         {
             var freesqlType = MyFreeSQL.ProviderToFreesqlDbType(provider);
 
-            return freesqlType.HasValue;
+            return freesqlType.HasValue ;
         }
     }
 }
diff --git a/src/AgileConfig.Server.Event/AddAppSuccessful.cs b/src/AgileConfig.Server.Event/AddAppSuccessful.cs
@@ -0,0 +1,17 @@
+﻿using AgileConfig.Server.Common.EventBus;
+using AgileConfig.Server.Data.Entity;
+
+namespace AgileConfig.Server.Event
+{
+    public class AddAppSuccessful : IEvent
+    {
+        public AddAppSuccessful(App app, string userName)
+        {
+            App = app;
+            UserName = userName;
+        }
+
+        public App App { get; }
+        public string UserName { get; }
+    }
+}
diff --git a/src/AgileConfig.Server.Event/AddConfigSuccessful.cs b/src/AgileConfig.Server.Event/AddConfigSuccessful.cs
@@ -0,0 +1,17 @@
+﻿using AgileConfig.Server.Common.EventBus;
+using AgileConfig.Server.Data.Entity;
+
+namespace AgileConfig.Server.Event
+{
+    public class AddConfigSuccessful : IEvent
+    {
+        public AddConfigSuccessful(Config config, string userName)
+        {
+            Config = config;
+            UserName = userName;
+        }
+
+        public Config Config { get; }
+        public string UserName { get; }
+    }
+}
diff --git a/src/AgileConfig.Server.Event/AddNodeSuccessful.cs b/src/AgileConfig.Server.Event/AddNodeSuccessful.cs
@@ -0,0 +1,17 @@
+﻿using AgileConfig.Server.Common.EventBus;
+using AgileConfig.Server.Data.Entity;
+
+namespace AgileConfig.Server.Event
+{
+    public class AddNodeSuccessful : IEvent
+    {
+        public AddNodeSuccessful(ServerNode node, string userName)
+        {
+            Node = node;
+            UserName = userName;
+        }
+
+        public ServerNode Node { get; }
+        public string UserName { get; }
+    }
+}
diff --git a/src/AgileConfig.Server.Event/AddUserSuccessful.cs b/src/AgileConfig.Server.Event/AddUserSuccessful.cs
@@ -0,0 +1,17 @@
+﻿using AgileConfig.Server.Common.EventBus;
+using AgileConfig.Server.Data.Entity;
+
+namespace AgileConfig.Server.Event
+{
+    public class AddUserSuccessful : IEvent
+    {
+        public AddUserSuccessful(User user, string userName)
+        {
+            User = user;
+            UserName = userName;
+        }
+
+        public User User { get; }
+        public string UserName { get; }
+    }
+}
diff --git a/src/AgileConfig.Server.Event/CancelEditConfigSomeSuccessful.cs b/src/AgileConfig.Server.Event/CancelEditConfigSomeSuccessful.cs
@@ -0,0 +1,19 @@
+﻿using AgileConfig.Server.Common.EventBus;
+using AgileConfig.Server.Data.Entity;
+
+namespace AgileConfig.Server.Event
+{
+    public class CancelEditConfigSomeSuccessful : IEvent
+    {
+        public CancelEditConfigSomeSuccessful(Config config, string userName)
+        {
+            Config = config;
+            UserName = userName;
+        }
+
+        public Config Config { get; }
+        public string UserName { get; }
+
+        public string Env { get; set; }
+    }
+}
diff --git a/src/AgileConfig.Server.Event/CancelEditConfigSuccessful.cs b/src/AgileConfig.Server.Event/CancelEditConfigSuccessful.cs
@@ -0,0 +1,17 @@
+﻿using AgileConfig.Server.Common.EventBus;
+using AgileConfig.Server.Data.Entity;
+
+namespace AgileConfig.Server.Event
+{
+    public class CancelEditConfigSuccessful : IEvent
+    {
+        public CancelEditConfigSuccessful(Config config, string userName)
+        {
+            Config = config;
+            UserName = userName;
+        }
+
+        public Config Config { get; }
+        public string UserName { get; }
+    }
+}
diff --git a/src/AgileConfig.Server.Event/ChangeUserPasswordSuccessful.cs b/src/AgileConfig.Server.Event/ChangeUserPasswordSuccessful.cs
@@ -0,0 +1,14 @@
+﻿using AgileConfig.Server.Common.EventBus;
+
+namespace AgileConfig.Server.Event
+{
+    public class ChangeUserPasswordSuccessful : IEvent
+    {
+        public ChangeUserPasswordSuccessful(string userName)
+        {
+            UserName = userName;
+        }
+
+        public string UserName { get; }
+    }
+}
diff --git a/src/AgileConfig.Server.Event/DeleteAppSuccessful.cs b/src/AgileConfig.Server.Event/DeleteAppSuccessful.cs
@@ -0,0 +1,17 @@
+﻿using AgileConfig.Server.Common.EventBus;
+using AgileConfig.Server.Data.Entity;
+
+namespace AgileConfig.Server.Event
+{
+    public class DeleteAppSuccessful : IEvent
+    {
+        public DeleteAppSuccessful(App app, string userName)
+        {
+            App = app;
+            UserName = userName;
+        }
+
+        public App App { get; }
+        public string UserName { get; }
+    }
+}
diff --git a/src/AgileConfig.Server.Event/DeleteConfigSuccessful.cs b/src/AgileConfig.Server.Event/DeleteConfigSuccessful.cs
@@ -0,0 +1,17 @@
+﻿using AgileConfig.Server.Common.EventBus;
+using AgileConfig.Server.Data.Entity;
+
+namespace AgileConfig.Server.Event
+{
+    public class DeleteConfigSuccessful : IEvent
+    {
+        public DeleteConfigSuccessful(Config config, string userName)
+        {
+            Config = config;
+            UserName = userName;
+        }
+
+        public Config Config { get; }
+        public string UserName { get; }
+    }
+}
diff --git a/src/AgileConfig.Server.Event/DeleteNodeSuccessful.cs b/src/AgileConfig.Server.Event/DeleteNodeSuccessful.cs
@@ -0,0 +1,17 @@
+﻿using AgileConfig.Server.Common.EventBus;
+using AgileConfig.Server.Data.Entity;
+
+namespace AgileConfig.Server.Event
+{
+    public class DeleteNodeSuccessful : IEvent
+    {
+        public DeleteNodeSuccessful(ServerNode node, string userName)
+        {
+            Node = node;
+            UserName = userName;
+        }
+
+        public ServerNode Node { get; }
+        public string UserName { get; }
+    }
+}
diff --git a/src/AgileConfig.Server.Event/DeleteSomeConfigSuccessful.cs b/src/AgileConfig.Server.Event/DeleteSomeConfigSuccessful.cs
@@ -0,0 +1,17 @@
+﻿using AgileConfig.Server.Common.EventBus;
+using AgileConfig.Server.Data.Entity;
+
+namespace AgileConfig.Server.Event
+{
+    public class DeleteSomeConfigSuccessful : IEvent
+    {
+        public DeleteSomeConfigSuccessful(Config config, string userName)
+        {
+            Config = config;
+            UserName = userName;
+        }
+
+        public Config Config { get; }
+        public string UserName { get; }
+    }
+}
diff --git a/src/AgileConfig.Server.Event/DeleteUserSuccessful.cs b/src/AgileConfig.Server.Event/DeleteUserSuccessful.cs
@@ -0,0 +1,17 @@
+﻿using AgileConfig.Server.Common.EventBus;
+using AgileConfig.Server.Data.Entity;
+
+namespace AgileConfig.Server.Event
+{
+    public class DeleteUserSuccessful : IEvent
+    {
+        public DeleteUserSuccessful(User user, string userName)
+        {
+            UserName = userName;
+            User = user;
+        }
+
+        public string UserName { get; }
+        public User User { get; }
+    }
+}
diff --git a/src/AgileConfig.Server.Event/DisableOrEnableAppSuccessful.cs b/src/AgileConfig.Server.Event/DisableOrEnableAppSuccessful.cs
@@ -0,0 +1,17 @@
+﻿using AgileConfig.Server.Common.EventBus;
+using AgileConfig.Server.Data.Entity;
+
+namespace AgileConfig.Server.Event
+{
+    public class DisableOrEnableAppSuccessful : IEvent
+    {
+        public DisableOrEnableAppSuccessful(App app, string userName)
+        {
+            App = app;
+            UserName = userName;
+        }
+
+        public App App { get; }
+        public string UserName { get; }
+    }
+}
diff --git a/src/AgileConfig.Server.Event/DiscoinnectSuccessful.cs b/src/AgileConfig.Server.Event/DiscoinnectSuccessful.cs
@@ -0,0 +1,16 @@
+﻿using AgileConfig.Server.Common.EventBus;
+
+namespace AgileConfig.Server.Event
+{
+    public class DiscoinnectSuccessful : IEvent
+    {
+        public DiscoinnectSuccessful(string clientId, string userName)
+        {
+            ClientId = clientId;
+            UserName = userName;
+        }
+
+        public string ClientId { get; }
+        public string UserName { get; }
+    }
+}
diff --git a/src/AgileConfig.Server.Event/EditAppSuccessful.cs b/src/AgileConfig.Server.Event/EditAppSuccessful.cs
@@ -0,0 +1,17 @@
+﻿using AgileConfig.Server.Common.EventBus;
+using AgileConfig.Server.Data.Entity;
+
+namespace AgileConfig.Server.Event
+{
+    public class EditAppSuccessful : IEvent
+    {
+        public EditAppSuccessful(App app, string userName)
+        {
+            App = app;
+            UserName = userName;
+        }
+
+        public App App { get; }
+        public string UserName { get; }
+    }
+}
diff --git a/src/AgileConfig.Server.Event/EditConfigSuccessful.cs b/src/AgileConfig.Server.Event/EditConfigSuccessful.cs
@@ -0,0 +1,17 @@
+﻿using AgileConfig.Server.Common.EventBus;
+using AgileConfig.Server.Data.Entity;
+
+namespace AgileConfig.Server.Event
+{
+    public class EditConfigSuccessful : IEvent
+    {
+        public EditConfigSuccessful(Config config, string userName)
+        {
+            Config = config;
+            UserName = userName;
+        }
+
+        public Config Config { get; }
+        public string UserName { get; }
+    }
+}
diff --git a/src/AgileConfig.Server.Event/EditUserSuccessful.cs b/src/AgileConfig.Server.Event/EditUserSuccessful.cs
diff --git a/src/AgileConfig.Server.Event/InitSaPasswordSuccessful.cs b/src/AgileConfig.Server.Event/InitSaPasswordSuccessful.cs
diff --git a/src/AgileConfig.Server.Event/LoginEvent.cs b/src/AgileConfig.Server.Event/LoginEvent.cs
diff --git a/src/AgileConfig.Server.Event/PublishConfigSuccessful.cs b/src/AgileConfig.Server.Event/PublishConfigSuccessful.cs
diff --git a/src/AgileConfig.Server.Event/RegisterAServiceSuccessful.cs b/src/AgileConfig.Server.Event/RegisterAServiceSuccessful.cs
diff --git a/src/AgileConfig.Server.Event/ResetUserPasswordSuccessful.cs b/src/AgileConfig.Server.Event/ResetUserPasswordSuccessful.cs
diff --git a/src/AgileConfig.Server.Event/RollbackConfigSuccessful.cs b/src/AgileConfig.Server.Event/RollbackConfigSuccessful.cs
diff --git a/src/AgileConfig.Server.Event/SysLogEvents.cs b/src/AgileConfig.Server.Event/SysLogEvents.cs
diff --git a/src/AgileConfig.Server.Event/UnRegisterAServiceSuccessful.cs b/src/AgileConfig.Server.Event/UnRegisterAServiceSuccessful.cs

Original file line number	Diff line number	Diff line change
`@@ -22,30 +22,26 @@ public void AddFixedRepositories(IServiceCollection sc)`
`22`	`22`
`23`	`23`	`public T GetServiceByEnv<T>(IServiceProvider sp, string env) where T : class`
`24`	`24`	`{`
	`25`	`+ var factory = sp.GetService<IFreeSqlFactory>();`
	`26`	`+`
`25`	`27`	`if (typeof(T) == typeof(IUow))`
`26`	`28`	`{`
`27`		`- var factory = sp.GetService<IFreeSqlFactory>();`
`28`		`- var fsq = factory.Create(env);`
`29`		`- return (new FreeSqlUow(fsq)) as T;`
	`29`	`+ return (new FreeSqlUow(factory.Create(env))) as T;`
`30`	`30`	`}`
`31`	`31`	`if (typeof(T) == typeof(IConfigPublishedRepository))`
`32`	`32`	`{`
`33`		`- var factory = sp.GetService<IFreeSqlFactory>();`
`34`	`33`	`return new ConfigPublishedRepository(factory.Create(env)) as T;`
`35`	`34`	`}`
`36`	`35`	`if (typeof(T) == typeof(IConfigRepository))`
`37`	`36`	`{`
`38`		`- var factory = sp.GetService<IFreeSqlFactory>();`
`39`	`37`	`return new ConfigRepository(factory.Create(env)) as T;`
`40`	`38`	`}`
`41`	`39`	`if (typeof(T) == typeof(IPublishDetailRepository))`
`42`	`40`	`{`
`43`		`- var factory = sp.GetService<IFreeSqlFactory>();`
`44`	`41`	`return new PublishDetailRepository(factory.Create(env)) as T;`
`45`	`42`	`}`
`46`	`43`	`if (typeof(T) == typeof(IPublishTimelineRepository))`
`47`	`44`	`{`
`48`		`- var factory = sp.GetService<IFreeSqlFactory>();`
`49`	`45`	`return new PublishTimelineRepository(factory.Create(env)) as T;`
`50`	`46`	`}`
`51`	`47`
`@@ -56,7 +52,7 @@ public bool IsSuit4Provider(string provider)`
`56`	`52`	`{`
`57`	`53`	`var freesqlType = MyFreeSQL.ProviderToFreesqlDbType(provider);`
`58`	`54`
`59`		`- return freesqlType.HasValue;`
	`55`	`+ return freesqlType.HasValue ;`
`60`	`56`	`}`
`61`	`57`	`}`
`62`	`58`	`}`