Explorar o código

支持创建数据库脚本单独配置

zhontai %!s(int64=2) %!d(string=hai) anos
pai
achega
a1e6d93a18

+ 1 - 1
build/pkg.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>2.1.1</Version>
+    <Version>2.1.2</Version>
 	<TargetFramework>net6.0</TargetFramework>
 	<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
 	<GenerateDocumentationFile>true</GenerateDocumentationFile>

+ 1 - 0
src/hosts/ZhonTai.Host/Configs/createdbsql.txt

@@ -0,0 +1 @@
+

+ 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 "Data Source=.;Integrated Security=True;Initial Catalog=master;Pooling=true;Min Pool Size=1"
+  //SqlServer "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 "Data Source=.;Integrated Security=True;Initial Catalog=admindb;Pooling=true;Min Pool Size=1"
+  //SqlServer "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",

+ 10 - 0
src/hosts/ZhonTai.Host/ZhonTai.Host.csproj

@@ -9,6 +9,16 @@
 		<NoWarn>1701;1702;1591</NoWarn>
 	</PropertyGroup>
 
+	<ItemGroup>
+	  <None Remove="Configs\createdbsql.txt" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <Content Include="Configs\createdbsql.txt">
+	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+	  </Content>
+	</ItemGroup>
+
 	<ItemGroup>
 		<ProjectReference Include="..\..\platform\ZhonTai.Admin\ZhonTai.Admin.csproj" />
 		<ProjectReference Include="..\..\platform\ZhonTai.ApiUI\ZhonTai.ApiUI.csproj" />

+ 8 - 0
src/platform/ZhonTai.Admin/Core/Db/DbHelper.cs

@@ -12,6 +12,8 @@ using ZhonTai.Admin.Core.Configs;
 using ZhonTai.Admin.Core.Entities;
 using ZhonTai.Admin.Core.Attributes;
 using ZhonTai.Admin.Core.Auth;
+using System.IO;
+using ZhonTai.Common.Helpers;
 
 namespace ZhonTai.Admin.Core.Db
 {
@@ -41,6 +43,12 @@ namespace ZhonTai.Admin.Core.Db
             try
             {
                 Console.WriteLine("\r\n create database started");
+                var filePath = Path.Combine(AppContext.BaseDirectory, "Configs/createdbsql.txt").ToPath();
+                if (File.Exists(filePath))
+                {
+                    dbConfig.CreateDbSql = FileHelper.ReadFile(filePath);
+                }
+
                 await db.Ado.ExecuteNonQueryAsync(dbConfig.CreateDbSql);
                 Console.WriteLine(" create database succeed");
             }