Browse Source

优化建库脚本为空的问题

zhontai 2 years ago
parent
commit
fced2efb12

+ 2 - 2
src/hosts/ZhonTai.Host/Configs/dbconfig.json

@@ -9,7 +9,7 @@
   //SqlServer,PostgreSQL,Oracle,OdbcOracle,OdbcSqlServer,OdbcMySql,OdbcPostgreSQL,Odbc,OdbcDameng,MsAccess
   //建库连接字符串
   //MySql "Server=localhost; Port=3306; Database=mysql; Uid=root; Pwd=pwd; Charset=utf8mb4;"
-  //SqlServer "SqlServer "Data Source=.;User Id=sa;Password=pwd;Initial Catalog=master;TrustServerCertificate=true;Pooling=true;Min Pool Size=1""
+  //SqlServer "Data Source=.;User Id=sa;Password=pwd;Initial Catalog=master;TrustServerCertificate=true;Pooling=true;Min Pool Size=1"
   //PostgreSQL "Host=localhost;Port=5432;Username=postgres;Password=; Database=postgres;Pooling=true;Minimum Pool Size=1",
   "createDbConnectionString": "Server=localhost; Port=3306; Database=mysql; Uid=root; Pwd=pwd; Charset=utf8mb4;",
   //建库脚本
@@ -33,7 +33,7 @@
   "type": "Sqlite",
   //连接字符串
   //MySql "Server=localhost; Port=3306; Database=admindb; Uid=root; Pwd=pwd; Charset=utf8mb4;"
-  //SqlServer "SqlServer "Data Source=.;User Id=sa;Password=pwd;Initial Catalog=admindb;TrustServerCertificate=true;Pooling=true;Min Pool Size=1""
+  //SqlServer "Data Source=.;User Id=sa;Password=pwd;Initial Catalog=admindb;TrustServerCertificate=true;Pooling=true;Min Pool Size=1"
   //PostgreSQL "Host=localhost;Port=5432;Username=postgres;Password=; Database=admindb;Pooling=true;Minimum Pool Size=1"
   //Sqlite "Data Source=|DataDirectory|\\admindb.db; Pooling=true;Min Pool Size=1"
   "connectionString": "Data Source=|DataDirectory|\\admindb.db; Pooling=true;Min Pool Size=1",

+ 5 - 1
src/platform/ZhonTai.Admin/Core/Db/DbHelper.cs

@@ -46,7 +46,11 @@ namespace ZhonTai.Admin.Core.Db
                 var filePath = Path.Combine(AppContext.BaseDirectory, "Configs/createdbsql.txt").ToPath();
                 if (File.Exists(filePath))
                 {
-                    dbConfig.CreateDbSql = FileHelper.ReadFile(filePath);
+                    var createDbSql = FileHelper.ReadFile(filePath);
+                    if (createDbSql.NotNull())
+                    {
+                        dbConfig.CreateDbSql = createDbSql;
+                    }
                 }
 
                 await db.Ado.ExecuteNonQueryAsync(dbConfig.CreateDbSql);