夜鹰 7 månader sedan
förälder
incheckning
7a9ddd5c8a

+ 8 - 0
Admin.NET/Admin.NET.Core/Service/APIJSON/APIJSONService.cs

@@ -37,6 +37,14 @@ public class APIJSONService : IDynamicApiController, ITransient
     [DisplayName("APIJSON统一查询")]
     public JObject Query([FromBody] JObject jobject)
     {
+        var database = jobject["@database"]?.ToString();
+        if (!string.IsNullOrEmpty(database))
+        {
+            // 设置数据库 
+            var provider = _db.AsTenant().GetConnectionScope(database);
+            jobject.Remove("@database");
+            return new SelectTable(_identityService, _tableMapper, provider).Query(jobject);
+        }
         return _selectTable.Query(jobject);
     }
 

+ 3 - 2
Admin.NET/Admin.NET.Web.Core/Startup.cs

@@ -223,7 +223,7 @@ public class Startup : AppStartup
                 Type = "string",
                 Format = "date-time",
                 Example = new Microsoft.OpenApi.Any.OpenApiString(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")) // 示例值
-            });
+            }); 
         });
 
         // 将IP地址数据库文件完全加载到内存,提升查询速度(以空间换时间,内存将会增加60-70M)
@@ -364,11 +364,12 @@ public class Startup : AppStartup
             {
                 groupInfo.Description += "<br/><u><b><font color='FF0000'> 👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!</font></b></u>";
             }
+            options.ConfigureSwagger(m => { m.OpenApiVersion = Microsoft.OpenApi.OpenApiSpecVersion.OpenApi2_0; });
         });
 
 #if NET9_0_OR_GREATER
         app.UseAutoVersionUpdate();
-#endif
+#endif 
 
         app.UseEndpoints(endpoints =>
         {

+ 1 - 1
Web/api_build/build.bat

@@ -18,7 +18,7 @@ if "%1"=="approvalFlow" (
 ) else if "%1"=="goView" (
   set moduleName=goView
   set apiServicesPath=%dir%..\src\api-plugins\goView\
-  set apiUrl=http://localhost:5005/swagger/GoView%%20%%E5%%A4%%A7%%E5%%B1%%8F%%E5%%8F%%AF%%E8%%A7%%86%%E5%%8C%%96/swagger.json
+  set apiUrl=http://localhost:5005/swagger/GoView/swagger.json
 )
 
 if exist %apiServicesPath% (

+ 1 - 1
Web/api_build/build.ps1

@@ -22,7 +22,7 @@ if ($args[0] -eq "approvalFlow") {
     $moduleName = "goView"
     $apiServicesPath = Join-Path (Join-Path $scriptDir "..") "src\api-plugins\goView\"
     # 注意:PowerShell会自动处理URL编码,所以不需要手动添加%20等
-    $apiUrl = "http://localhost:5005/swagger/GoView 大屏可视化/swagger.json"
+    $apiUrl = "http://localhost:5005/swagger/GoView/swagger.json"
 }
 
 # 输出信息和删除现有目录