Browse Source

升级Freesql,调整数据库配置,以生产环境为主

xiaoxue 5 năm trước cách đây
mục cha
commit
42e344e4b4

+ 6 - 6
Admin.Core.Common/Admin.Core.Common.csproj

@@ -6,12 +6,12 @@
 
   <ItemGroup>
     <PackageReference Include="CSRedisCore" Version="3.5.5" />
-    <PackageReference Include="FreeSql" Version="1.3.2" />
-    <PackageReference Include="FreeSql.Provider.MySql" Version="1.3.2" />
-    <PackageReference Include="FreeSql.Provider.Oracle" Version="1.3.2" />
-    <PackageReference Include="FreeSql.Provider.Sqlite" Version="1.3.2" />
-    <PackageReference Include="FreeSql.Provider.SqlServer" Version="1.3.2" />
-    <PackageReference Include="FreeSql.Repository" Version="1.3.2" />
+    <PackageReference Include="FreeSql" Version="1.4.0-preview20200401" />
+    <PackageReference Include="FreeSql.Provider.MySql" Version="1.4.0-preview20200401" />
+    <PackageReference Include="FreeSql.Provider.Oracle" Version="1.4.0-preview20200401" />
+    <PackageReference Include="FreeSql.Provider.Sqlite" Version="1.4.0-preview20200401" />
+    <PackageReference Include="FreeSql.Provider.SqlServer" Version="1.4.0-preview20200401" />
+    <PackageReference Include="FreeSql.Repository" Version="1.4.0-preview20200401" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.3" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.3" />

+ 1 - 27
Admin.Core/configs/dbconfig.Development.json

@@ -1,32 +1,6 @@
 {
-  //生成数据
-  "generateData": false,
   //监听所有操作
   "monitorCommand": false,
   //监听Curd操作
-  "curd": true,
-
-  //同步结构
-  "syncStructure": true,
-  //同步数据
-  "syncData": true,
-  //建库
-  "createDb": true,
-  //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"
-  "createDbConnectionString": "Data Source=.;Integrated Security=True;Initial Catalog=master;Pooling=true;Min Pool Size=1",
-  //建库脚本
-  //MySql "CREATE DATABASE `admindb` CHARACTER SET 'utf8mb4' COLLATE 'utf8mb4_general_ci'"
-  //SqlServer "CREATE DATABASE [admindb]"
-  "createDbSql": "CREATE DATABASE [admindb]",
-
-  //数据库类型 MySql = 0, SqlServer = 1, PostgreSQL = 2, Oracle = 3, Sqlite = 4, OdbcOracle = 5, OdbcSqlServer = 6, OdbcMySql = 7, OdbcPostgreSQL = 8, Odbc = 9, OdbcDameng = 10, MsAccess = 11
-  "type": 4,
-  //连接字符串
-  //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"
-  //Sqlite "Data Source=|DataDirectory|\\admindb.db; Pooling=true;Min Pool Size=1"
-  "connectionString": "Data Source=|DataDirectory|\\admindb.db; Pooling=true;Min Pool Size=1"
+  "curd": true
 }

+ 24 - 3
Admin.Core/configs/dbconfig.json

@@ -1,8 +1,29 @@
 {
+  //生成数据
+  "generateData": false,
+
+  //同步结构
+  "syncStructure": false,
+  //同步数据
+  "syncData": false,
+
+  //建库
+  "createDb": false,
+  //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"
+  "createDbConnectionString": "Server=localhost; Port=3306; Database=mysql; Uid=root; Pwd=pwd; Charset=utf8mb4;",
+  //建库脚本
+  //MySql "CREATE DATABASE `admindb` CHARACTER SET 'utf8mb4' COLLATE 'utf8mb4_general_ci'"
+  //SqlServer "CREATE DATABASE [admindb]"
+  "createDbSql": "CREATE DATABASE `admindb` CHARACTER SET 'utf8mb4' COLLATE 'utf8mb4_general_ci'",
+
   //数据库类型 MySql = 0, SqlServer = 1, PostgreSQL = 2, Oracle = 3, Sqlite = 4, OdbcOracle = 5, OdbcSqlServer = 6, OdbcMySql = 7, OdbcPostgreSQL = 8, Odbc = 9, OdbcDameng = 10, MsAccess = 11
-  "type": 0,
+  "type": 4,
   //连接字符串
   //MySql "Server=localhost; Port=3306; Database=admindb; Uid=root; Pwd=pwd; Charset=utf8mb4;"
-  //Sqlite "Data Source=|DataDirectory|\\admindb.db; Pooling=true;Min Pool Size=1" "Data Source=F:\\data\\admindb.db; Pooling=true;Min Pool Size=1"
-  "connectionString": "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"
+  //Sqlite "Data Source=|DataDirectory|\\admindb.db; Pooling=true;Min Pool Size=1"
+  "connectionString": "Data Source=|DataDirectory|\\admindb.db; Pooling=true;Min Pool Size=1"
 }