ソースを参照

Merge branch 'develop' of http://163.228.141.122:3000/TEAMMODEL/TEAMModelOS into develop

Eden 2 ヶ月 前
コミット
d3fa6a2445

+ 1 - 0
.gitignore

@@ -278,3 +278,4 @@ TEAMModelBI/Properties/ServiceDependencies/teammodelbi-RC - Web Deploy/profile.a
 /TEAMModelOS.Extension/IES.Exam/IES.ExamClient/server
 /TEAMModelOS.Extension/IES.Exam/wwwroot
 /TEAMModelOS.Extension/IES.Exam/IES.ExamClient/IES.ExamServer.zip
+/TEAMModelOS.Extension/IES.Exam/IES.ExamServer/start.json

+ 2 - 2
TEAMModelOS.Extension/IES.Exam/IES.ExamServer/DI/ServiceInitializer.cs

@@ -145,8 +145,8 @@ namespace IES.ExamServer.DI
                 ip = dataModify.primaryNetwork?.ip,
                 read=0
             };
-            string filePath = Path.Combine(Directory.GetCurrentDirectory(),"start.json");
-            await File.WriteAllTextAsync(filePath, dataFile.ToJsonString());
+            string startPath = Path.Combine(Directory.GetCurrentDirectory(),"start.json");
+            await File.WriteAllTextAsync(startPath, dataFile.ToJsonString());
             StringBuilder sb = new StringBuilder();
             _lifetime.ApplicationStarted.Register(() =>
             {

+ 2 - 1
TEAMModelOS.Extension/IES.Exam/IES.ExamServer/DI/SignalRHost/SignalRExamServerHub.cs

@@ -32,7 +32,8 @@ namespace IES.ExamServer.DI.SignalRHost
                     grant_type = grant_type,
                     time = DateTimeOffset.Now.ToUnixTimeMilliseconds(),
                     type = Constant._Message_type_message,
-                    contents = content.contents
+                    contents = content.contents,
+                    step=content.step
                 };
                 if (signalRClient != null)
                 {

+ 5 - 2
TEAMModelOS.Extension/IES.Exam/IES.ExamServer/Models/SignalRClient.cs

@@ -63,8 +63,11 @@
 
     public class CheckFileMessageBody : MessageBody
     {
-       
-       
+        /// <summary>
+        /// 步骤
+        /// </summary>
+        public int step { get; set; }
+
     }
     public class MessageContent
     {