Merge branch 'master' of http://git.newlifex.com/NewLife/Stardust

NewLifeX · Nov 8, 2024 · 61fdcc6 · 61fdcc6
2 parents f08401f + c8da326
commit 61fdcc6
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 19 deletions.
diff --git a/Stardust.Server/appsettings.json b/Stardust.Server/appsettings.json
@@ -1,28 +1,34 @@
 {
   "Logging": {
     "LogLevel": {
-      "Default": "Warning",
+      "Default": "Information",
       "Microsoft": "Warning",
       "Microsoft.Hosting.Lifetime": "Information"
     }
   },
   "AllowedHosts": "*",
-  "RedisQueue": "",
+  //"RedisQueue": "server=127.0.0.1;password=123456;db=3",
   "StarServer": "http://127.0.0.1:6600",
   "ConnectionStrings": {
     "Stardust": "Data Source=..\\Data\\Stardust.db;ShowSql=false;Provider=SQLite",
     "StardustData": "Data Source=..\\Data\\StardustData.db;ShowSql=false;Provider=SQLite",
     "Membership": "Data Source=..\\Data\\Membership.db;Provider=SQLite",
 
-    // 各种数据库连接字符串模版，连接名Zero对应Zero.Data/Projects/Model.xml中的ConnName
-    //"Zero": "Server=.;Port=3306;Database=zero;Uid=root;Pwd=root;Provider=MySql",
-    //"Zero": "Data Source=.;Initial Catalog=zero;user=sa;password=sa;Provider=SqlServer",
-    //"Zero": "Server=.;Database=zero;Uid=root;Pwd=root;Provider=PostgreSql",
-    //"Zero": "Data Source=Tcp://127.0.0.1/ORCL;User Id=scott;Password=tiger;Provider=Oracle"
+    // 各种数据库连接字符串模版
+    //"Stardust": "Server=.;Port=3306;Database=star;Uid=root;Pwd=root;ShowSql=false;Provider=MySql",
+    //"StardustData": "MapTo=Stardust",
+    //"Membership": "Server=.;Port=3306;Database=star;Uid=root;Pwd=root;Provider=MySql",
 
-    //"Membership": "Server=.;Port=3306;Database=zero;Uid=root;Pwd=root;Provider=MySql",
-    //"Membership": "Data Source=.;Initial Catalog=zero;user=sa;password=sa;Provider=SqlServer",
-    //"Membership": "Server=.;Database=zero;Uid=root;Pwd=root;Provider=PostgreSql",
+    //"Stardust": "Data Source=.;Initial Catalog=star;user=sa;password=sa;ShowSql=false;Provider=SqlServer",
+    //"StardustData": "MapTo=Stardust",
+    //"Membership": "Data Source=.;Initial Catalog=star;user=sa;password=sa;Provider=SqlServer",
+
+    //"Stardust": "Server=.;Database=star;Uid=root;Pwd=root;ShowSql=false;Provider=PostgreSql",
+    //"StardustData": "MapTo=Stardust",
+    //"Membership": "Server=.;Database=star;Uid=root;Pwd=root;Provider=PostgreSql",
+
+    //"Stardust": "Data Source=Tcp://127.0.0.1/ORCL;User Id=scott;Password=tiger;ShowSql=false;Provider=Oracle"
+    //"StardustData": "MapTo=Stardust",
     //"Membership": "Data Source=Tcp://127.0.0.1/ORCL;User Id=scott;Password=tiger;Provider=Oracle"
 
     // 魔方审计日志使用Membership的连接字符串

diff --git a/Stardust.Web/appsettings.json b/Stardust.Web/appsettings.json
@@ -11,18 +11,24 @@
   "StarServer": "http://127.0.0.1:6600",
   "ConnectionStrings": {
     "Stardust": "Data Source=..\\Data\\Stardust.db;Provider=SQLite",
-    "StardustData": "Data Source=..\\Data\\StardustData.db;ShowSql=false;Provider=SQLite",
+    "StardustData": "Data Source=..\\Data\\StardustData.db;Provider=SQLite",
     "Membership": "Data Source=..\\Data\\Membership.db;Provider=SQLite",
 
-    // 各种数据库连接字符串模版，连接名Zero对应Zero.Data/Projects/Model.xml中的ConnName
-    //"Zero": "Server=.;Port=3306;Database=zero;Uid=root;Pwd=root;Provider=MySql",
-    //"Zero": "Data Source=.;Initial Catalog=zero;user=sa;password=sa;Provider=SqlServer",
-    //"Zero": "Server=.;Database=zero;Uid=root;Pwd=root;Provider=PostgreSql",
-    //"Zero": "Data Source=Tcp://127.0.0.1/ORCL;User Id=scott;Password=tiger;Provider=Oracle"
+    // 各种数据库连接字符串模版
+    //"Stardust": "Server=.;Port=3306;Database=star;Uid=root;Pwd=root;Provider=MySql",
+    //"StardustData": "MapTo=Stardust",
+    //"Membership": "Server=.;Port=3306;Database=star;Uid=root;Pwd=root;Provider=MySql",
 
-    //"Membership": "Server=.;Port=3306;Database=zero;Uid=root;Pwd=root;Provider=MySql",
-    //"Membership": "Data Source=.;Initial Catalog=zero;user=sa;password=sa;Provider=SqlServer",
-    //"Membership": "Server=.;Database=zero;Uid=root;Pwd=root;Provider=PostgreSql",
+    //"Stardust": "Data Source=.;Initial Catalog=star;user=sa;password=sa;Provider=SqlServer",
+    //"StardustData": "MapTo=Stardust",
+    //"Membership": "Data Source=.;Initial Catalog=star;user=sa;password=sa;Provider=SqlServer",
+
+    //"Stardust": "Server=.;Database=star;Uid=root;Pwd=root;Provider=PostgreSql",
+    //"StardustData": "MapTo=Stardust",
+    //"Membership": "Server=.;Database=star;Uid=root;Pwd=root;Provider=PostgreSql",
+
+    //"Stardust": "Data Source=Tcp://127.0.0.1/ORCL;User Id=scott;Password=tiger;Provider=Oracle"
+    //"StardustData": "MapTo=Stardust",
     //"Membership": "Data Source=Tcp://127.0.0.1/ORCL;User Id=scott;Password=tiger;Provider=Oracle"
 
     // 魔方审计日志使用Membership的连接字符串