fly 2 years ago
parent
commit
a19960f47f

+ 1 - 0
Publish.ps1

@@ -56,6 +56,7 @@ BuildService "WingAIDiagnosisService" 1 0 "../WingAIDiagnosisService"
 
 BuildService "WingLiveConsultationService" 1 0 "../WingLiveConsultationService"
 
+BuildService "WingRtcService" 1 0 "../WingRtcService"
 
 Write-Host 'Finished!' -NoNewline
 $null = [Console]::ReadKey('?')

+ 3 - 2
clone&pull tool.bat

@@ -1,7 +1,7 @@
 @echo off & color 0A
 @title git tool
 
-rem 当前文件夹名称
+rem 锟斤拷前锟侥硷拷锟斤拷锟斤拷锟斤拷
 pushd %1 & for %%i in (.) do set curr=%%~ni
 if "%curr%"=="WingCloudServer" (
 	cd ..
@@ -13,7 +13,7 @@ if "%curr%"=="WingCloudServer" (
 )
 
 :Main
-echo [正在检查获取远程代码,请勿关闭当前操作页]	
+echo [锟斤拷锟节硷拷锟斤拷取远锟教达拷锟诫,锟斤拷锟斤拷乇盏锟角帮拷锟斤拷锟揭砞	
 for /d %%i in (*) do (
 	cd %%i			
 	if exist *.git (
@@ -42,6 +42,7 @@ if not exist WingUserModule (git clone http://git.ius.plus:88/Project-Wing/WingU
 if not exist WingVinnoImageData (git clone http://git.ius.plus/Project-Wing/WingVinnoImageData.git && echo;)
 if not exist WingLiveConsultationService (git clone http://git.ius.plus/arthur.wu/WingLiveConsultationService.git && echo;)
 if not exist WingRtmpService (git clone http://git.ius.plus/arthur.wu/WingRtmpService.git && echo;)
+if not exist WingRtcService (git clone http://git.ius.plus/fly.wang/WingRtcService.git && echo;)
 
 echo Finished!
 pause>nul

+ 6 - 2
src/Plugin/TokenVerifyPluginService.cs

@@ -70,7 +70,11 @@ namespace WingCloudServer.Plugin
             "IVinnoServerService/EchoAsync",
             "IVinnoServerService/UpdateServerIPListAsync",
             "IAIDiagnosisService/DiagnosisImageAsync",
-            "IReportService/CreateReportTemplatePreviewAsync"
+            "IReportService/CreateReportTemplatePreviewAsync",
+            "IWingRtcService/GetRoomIdAsync",
+            "IWingRtcService/GenerateRoomUrlAsync",
+            "IWingRtcService/GetRtcSettingAsync",
+            "IWingRtcService/GetUserSignAsync",
         };
 
         public PluginProcessResult PreProcess(IJsonRpcHttpContext context, byte[] requestData)
@@ -78,7 +82,7 @@ namespace WingCloudServer.Plugin
             var dataLength = (int)context.GetRequestContentLength();
             var requests = JsonRpcCodec.DecodeRequestsAsync(requestData, new System.Threading.CancellationToken(), dataLength).Result;
             var apiName = $"{context.GetRequestPath().Trim('/')}/{requests[0].Method.Trim('/')}";
-            if (context.GetRequestPath() != "/IAuthenticationService" && context.GetRequestPath() != "/IMasterInteractionCenterService" && !NotValidationRequiredList.Contains(apiName))
+            if (context.GetRequestPath() != "/IAuthenticationService" && context.GetRequestPath() != "/IMasterInteractionCenterService" && !NotValidationRequiredList.Contains(apiName)&&!context.GetRequestPath().Contains("IDynamicSlaveService") )
             {
                 var tokenRequest = new ValidateTokenRequest();
                 try

+ 4 - 1
src/WingCloudServer.csproj

@@ -3,9 +3,11 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
+    <SatelliteResourceLanguages>noneed</SatelliteResourceLanguages>
   </PropertyGroup>
 
-  <ItemGroup>    
+  <ItemGroup>   
+    <PackageReference Include="CS-Script.Core" Version="2.0.0" />     
     <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="5.0.0" />
     <PackageReference Include="WingInterfaceLibrary" Version="1.1.1.1" />
     <PackageReference Include="WingServerCommon" Version="1.1.1.1" />
@@ -21,6 +23,7 @@
     <PackageReference Include="JsonRpcLite" Version="1.1.0.4" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
     <PackageReference Include="System.Runtime.Caching" Version="6.0.0" />
+    <PackageReference Include="zlib.net-mutliplatform" Version="1.0.6" />
     
     <Reference Include="AI.Common">
       <HintPath>..\AIDiagnosis\AI.Common.dll</HintPath>

+ 5 - 2
src/WingServer.cs

@@ -370,10 +370,13 @@ namespace WingCloudServer
                     }
                     return slaveList;
                 }
-
             }
             ";
-
+            Assembly compilecode = eval.CompileCode(str);
+            var ps = compilecode.GetType("css_root+GetUrlListService");
+            var obj = compilecode.CreateInstance("css_root+GetUrlListService");
+            var mes = ps.GetMethod("GetSlaveList");
+            mes.Invoke(obj, new object[] { slaveList });
             //动态注册副服务器服务
             foreach (var item in slaveList)
             {

+ 1 - 1
src/appsettings.json

@@ -17,7 +17,7 @@
     "CollectionName": "logs"
   },
   "Services": {
-    "InProcess": "WingEmailModule,WingMongoDBModule,WingSessionModule,WingSMSModule,WingNotificationModule,WingAIDiagnosisService",
+    "InProcess": "WingEmailModule,WingMongoDBModule,WingSessionModule,WingSMSModule,WingNotificationModule,WingAIDiagnosisService,WingRtcService",
     "JsonRpcHttp": "WingManagementModule,WingStorageModule,WingUserModule,WingDeviceService,WingRemedicalModule,ReportService,WingLiveConsultationService",
     "Remote": ""
   },