!51 添加 PostgreSQL 数据库的配置，并新增驼峰转下划线功能

Merge pull request !51 from 凤凰/abp

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore.Abstractions/DbConnOptions.cs

@@ -19,7 +19,10 @@ namespace Yi.Framework.SqlSugarCore.Abstractions
         /// </summary>
         public bool EnabledDbSeed { get; set; } = false;
 
-
+        /// <summary>
+        /// 开启驼峰转下划线
+        /// </summary>
+        public bool EnableUnderLine { get; set; } = false;
 
         /// <summary>
         /// 开启codefirst

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/SqlSugarDbConnectionCreator.cs

@@ -64,6 +64,12 @@ namespace Yi.Framework.SqlSugarCore
                 //设置codefirst非空值判断
                 ConfigureExternalServices = new ConfigureExternalServices
                 {
+                    // 处理表
+                    EntityNameService = (type, entity) =>
+                    {
+                        if (dbConnOptions.EnableUnderLine && !entity.DbTableName.Contains('_'))
+                            entity.DbTableName = UtilMethods.ToUnderLine(entity.DbTableName);// 驼峰转下划线
+                    },
                     EntityService = (c, p) =>
                     {
                         if (new NullabilityInfoContext()
@@ -72,6 +78,9 @@ namespace Yi.Framework.SqlSugarCore
                             p.IsNullable = true;
                         }
 
+                        if (dbConnOptions.EnableUnderLine && !p.IsIgnore && !p.DbColumnName.Contains('_'))
+                            p.DbColumnName = UtilMethods.ToUnderLine(p.DbColumnName);// 驼峰转下划线
+
                         EntityService(c, p);
                     }
                 },

Yi.Abp.Net8/sample/Acme.BookStore.Web/appsettings.json

@@ -13,22 +13,24 @@
   },
 
   //数据库类型列表
-  "DbList": [ "Sqlite", "Mysql", "Sqlserver", "Oracle" ],
+    "DbList": [ "Sqlite", "Mysql", "Sqlserver", "Oracle", "PostgreSQL" ],
 
-  "DbConnOptions": {
-    "Url": "DataSource=yi-abp-dev.db",
-    "DbType": "Sqlite",
-    "EnabledReadWrite": false,
-    "EnabledCodeFirst": true,
-    "EnabledSqlLog": true,
-    "EnabledDbSeed": true
-    //读写分离地址
-    //"ReadUrl": [
-    //  "DataSource=[xxxx]", //Sqlite
-    //  "server=[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]", //Mysql
-    //  "Data Source=[xxxx];Initial Catalog=[xxxx];User ID=[xxxx];password=[xxxx]" //Sqlserver
-    //]
-  },
+    "DbConnOptions": {
+        "Url": "DataSource=yi-abp-dev.db",
+        "DbType": "Sqlite",
+        "EnabledReadWrite": false,
+        "EnabledCodeFirst": true,
+        "EnabledSqlLog": true,
+        "EnabledDbSeed": true,
+        "EnableUnderLine": false // 启用驼峰转下划线
+        //读写分离地址
+        //"ReadUrl": [
+        //  "DataSource=[xxxx]", //Sqlite
+        //  "server=[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]", //Mysql
+        //  "Data Source=[xxxx];Initial Catalog=[xxxx];User ID=[xxxx];password=[xxxx]" //Sqlserver
+        //  "HOST=[xxxx];PORT=5432;DATABASE=[xxxx];USERID=[xxxx];PASSWORD=[xxxx]" //PostgreSQL
+        //]
+    },
 
   //鉴权
   "JwtOptions": {

Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.json

@@ -17,24 +17,26 @@
   },
 
   //数据库类型列表
-  "DbList": [ "Sqlite", "Mysql", "Sqlserver", "Oracle" ],
+    "DbList": [ "Sqlite", "Mysql", "Sqlserver", "Oracle", "PostgreSQL" ],
 
-  "DbConnOptions": {
-    "Url": "DataSource=yi-abp-dev.db",
-    "DbType": "Sqlite",
-    "EnabledReadWrite": false,
-    "EnabledCodeFirst": true,
-    "EnabledSqlLog": true,
-    "EnabledDbSeed": true,
-    //SAAS多租户
-    "EnabledSaasMultiTenancy": false
-    //读写分离地址
-    //"ReadUrl": [
-    //  "DataSource=[xxxx]", //Sqlite
-    //  "server=[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]", //Mysql
-    //  "Data Source=[xxxx];Initial Catalog=[xxxx];User ID=[xxxx];password=[xxxx]" //Sqlserver
-    //]
-  },
+    "DbConnOptions": {
+        "Url": "DataSource=yi-abp-dev.db",
+        "DbType": "Sqlite",
+        "EnabledReadWrite": false,
+        "EnabledCodeFirst": true,
+        "EnabledSqlLog": true,
+        "EnabledDbSeed": true,
+        "EnableUnderLine": false, // 启用驼峰转下划线
+        //SAAS多租户
+        "EnabledSaasMultiTenancy": true
+        //读写分离地址
+        //"ReadUrl": [
+        //  "DataSource=[xxxx]", //Sqlite
+        //  "server=[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]", //Mysql
+        //  "Data Source=[xxxx];Initial Catalog=[xxxx];User ID=[xxxx];password=[xxxx]" //Sqlserver
+        //  "HOST=[xxxx];PORT=5432;DATABASE=[xxxx];USERID=[xxxx];PASSWORD=[xxxx]" //PostgreSQL
+        //]
+    },
 
   //redis使用freeesql参数在“FreeSqlOptions的ConnectionStringBuilder中”
   "Redis": {

Yi.Abp.Net8/test/Yi.Abp.Test/appsettings.json

@@ -13,22 +13,24 @@
   },
 
   //数据库类型列表
-  "DbList": [ "Sqlite", "Mysql", "Sqlserver", "Oracle" ],
+    "DbList": [ "Sqlite", "Mysql", "Sqlserver", "Oracle", "PostgreSQL" ],
 
-  "DbConnOptions": {
-    "Url": "DataSource=yi-abp-dev.db",
-    "DbType": "Sqlite",
-    "EnabledReadWrite": false,
-    "EnabledCodeFirst": true,
-    "EnabledSqlLog": true,
-    "EnabledDbSeed": true
-    //读写分离地址
-    //"ReadUrl": [
-    //  "DataSource=[xxxx]", //Sqlite
-    //  "server=[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]", //Mysql
-    //  "Data Source=[xxxx];Initial Catalog=[xxxx];User ID=[xxxx];password=[xxxx]" //Sqlserver
-    //]
-  },
+    "DbConnOptions": {
+        "Url": "DataSource=yi-abp-dev.db",
+        "DbType": "Sqlite",
+        "EnabledReadWrite": false,
+        "EnabledCodeFirst": true,
+        "EnabledSqlLog": true,
+        "EnabledDbSeed": true,
+        "EnableUnderLine": false // 启用驼峰转下划线
+        //读写分离地址
+        //"ReadUrl": [
+        //  "DataSource=[xxxx]", //Sqlite
+        //  "server=[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]", //Mysql
+        //  "Data Source=[xxxx];Initial Catalog=[xxxx];User ID=[xxxx];password=[xxxx]" //Sqlserver
+        //  "HOST=[xxxx];PORT=5432;DATABASE=[xxxx];USERID=[xxxx];PASSWORD=[xxxx]" //PostgreSQL
+        //]
+    },
 
   //鉴权
   "JwtOptions": {

Yi.Abp.Net8/test/Yi.Framework.Rbac.Test/appsettings.json

@@ -13,22 +13,24 @@
   },
 
   //数据库类型列表
-  "DbList": [ "Sqlite", "Mysql", "Sqlserver", "Oracle" ],
+    "DbList": [ "Sqlite", "Mysql", "Sqlserver", "Oracle", "PostgreSQL" ],
 
-  "DbConnOptions": {
-    "Url": "DataSource=yi-rbac-test.db",
-    "DbType": "Sqlite",
-    "EnabledReadWrite": false,
-    "EnabledCodeFirst": true,
-    "EnabledSqlLog": true,
-    "EnabledDbSeed": true
-    //读写分离地址
-    //"ReadUrl": [
-    //  "DataSource=[xxxx]", //Sqlite
-    //  "server=[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]", //Mysql
-    //  "Data Source=[xxxx];Initial Catalog=[xxxx];User ID=[xxxx];password=[xxxx]" //Sqlserver
-    //]
-  },
+    "DbConnOptions": {
+        "Url": "DataSource=yi-rbac-test.db",
+        "DbType": "Sqlite",
+        "EnabledReadWrite": false,
+        "EnabledCodeFirst": true,
+        "EnabledSqlLog": true,
+        "EnabledDbSeed": true,
+        "EnableUnderLine": false // 启用驼峰转下划线
+        //读写分离地址
+        //"ReadUrl": [
+        //  "DataSource=[xxxx]", //Sqlite
+        //  "server=[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]", //Mysql
+        //  "Data Source=[xxxx];Initial Catalog=[xxxx];User ID=[xxxx];password=[xxxx]" //Sqlserver
+        //  "HOST=[xxxx];PORT=5432;DATABASE=[xxxx];USERID=[xxxx];PASSWORD=[xxxx]" //PostgreSQL
+        //]
+    },
 
   //鉴权
   "JwtOptions": {

Yi.RuoYi.Vue3/src/views/system/tenant/index.vue

@@ -127,7 +127,7 @@ system/tenant : api文件路径,例如：codeGen/tableApi
          <el-form-item label="数据库类型" prop="dbType">
               <el-radio-group v-model="form.dbType">
                 <el-radio
-                  v-for="dict in ['Sqlite','Mysql','Sqlserver']"
+                  v-for="dict in ['Sqlite','Mysql','Sqlserver','PostgreSQL']"
                   :key="dict"
                   :value="dict"
                   >{{ dict }}</el-radio
@@ -141,6 +141,7 @@ system/tenant : api文件路径,例如：codeGen/tableApi
                 <p>Sqlite: DataSource=[xxxx]</p>
                 <p>Mysql: server=[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]</p> 
                 <p>Sqlserver: Data Source=[xxxx];Initial Catalog=[xxxx];User ID=[xxxx];password=[xxxx]</p>
+                <p>PostgreSQL: HOST=[xxxx];PORT=5432;DATABASE=[xxxx];USERID=[xxxx];PASSWORD=[xxxx]</p>
             </el-form>
             <template #footer>
                 <div class="dialog-footer">