Merge branch 'master' into publish

dotnetcore · Jan 3, 2022 · 80a434f · 80a434f
2 parents 287702e + dd58dc2
commit 80a434f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/AgileConfig.Server.Data.Freesql/FreeSQL.cs b/AgileConfig.Server.Data.Freesql/FreeSQL.cs
@@ -68,7 +68,7 @@ public static IFreeSql GetInstance(string env)
 
         private static FreeSql.DataType ProviderToFreesqlDbType(string provider)
         {
-            switch (provider)
+            switch (provider.ToLower())
             {
                 case "sqlite":
                     return FreeSql.DataType.Sqlite;
@@ -78,6 +78,8 @@ private static FreeSql.DataType ProviderToFreesqlDbType(string provider)
                     return FreeSql.DataType.SqlServer;
                 case "npgsql":
                     return FreeSql.DataType.PostgreSQL;
+                case "postgresql":
+                    return FreeSql.DataType.PostgreSQL;
                 case "oracle":
                     return FreeSql.DataType.Oracle;
                 default:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Change log
 ------------------------------
+[1.5.7.5] - 2021.12.31    
+* 修复 json 编辑器不能在内网使用的问题
+
 [1.5.7.4] - 2021.12.23    
 * 修复 Oracle 建表可能出现的字符串超长问题
 

diff --git a/README.md b/README.md
@@ -42,10 +42,16 @@ Gitee 镜像：[https://gitee.com/kklldog/AgileConfig](https://gitee.com/kklldog
 [教程 - 如何使用AgileConfig.Client读取配置](https://www.cnblogs.com/kklldog/p/how-to-use-agileconfigclient.html)    
 👉🏻👉🏻[常见问题，必看！！！](https://github.com/kklldog/AgileConfig/wiki/%E5%B8%B8%E8%A7%81%E9%97%AE%E9%A2%98%EF%BC%8C%E5%BF%85%E7%9C%8B%EF%BC%81%EF%BC%81%EF%BC%81)👈🏻👈🏻   
 [关于多环境的部署说明](https://github.com/dotnetcore/AgileConfig/wiki/%E5%85%B3%E4%BA%8E-1.5-%E7%89%88%E6%9C%AC%E6%94%AF%E6%8C%81%E5%A4%9A%E7%8E%AF%E5%A2%83%E7%9A%84%E8%AF%B4%E6%98%8E)   
+
+其它教程：    
+[博客园-.Net Core&Agile Config配置中心](https://www.cnblogs.com/CKExp/p/15738149.html)
+
 API:   
 [restful api](https://github.com/kklldog/AgileConfig/wiki/Restful-API)
 ## ChangeLog
-[Changelog](https://github.com/kklldog/AgileConfig/blob/master/CHANGELOG.md)
+[Changelog](https://github.com/kklldog/AgileConfig/blob/master/CHANGELOG.md)   
+## 联系作者
+[联系](#联系我)
 ## 架构
 ![](https://s1.ax1x.com/2020/06/29/NRz1gO.png)
 AgileConfig的架构比较简单，主要是分3块：