1

src/YSAI.DAQ/YSAI.DAQ.sln

@@ -27,9 +27,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lib", "lib", "{0A264424-1AD
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.Test", "YSAI.Test\YSAI.Test.csproj", "{26BEA521-56B3-4BE8-9F5C-62BCA2323ABD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YSAI.TestConsole", "YSAI.TestConsole\YSAI.TestConsole.csproj", "{6F261956-DB97-43E4-A982-FBA2FB78AE15}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.TestConsole", "YSAI.TestConsole\YSAI.TestConsole.csproj", "{6F261956-DB97-43E4-A982-FBA2FB78AE15}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YSAI.RabbitMQ", "YSAI.RabbitMQ\YSAI.RabbitMQ.csproj", "{8CE7E64C-7A6A-4581-A9B3-C05214986B4F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.RabbitMQ", "YSAI.RabbitMQ\YSAI.RabbitMQ.csproj", "{8CE7E64C-7A6A-4581-A9B3-C05214986B4F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/YSAI.DAQ/YSAI.Opc/ua/service/OpcUaServiceOperate.cs

@@ -207,7 +207,12 @@ namespace YSAI.Opc.ua.service
         public override string LogHead => "[ OpcUaServiceOperate 操作 ]";
         public override string ClassName => "OpcUaServiceOperate";
 
-        public async Task<OperateResult> OnAsync()
+        public Task<OperateResult> OnAsync()
+        {
+            return Task.Run(() => On());
+        }
+
+        public OperateResult On()
         {
             //开始记录运行时间
             RunTimeTool.Instance("OpcUaServiceOperate.On").StartRecord();
@@ -222,13 +227,13 @@ namespace YSAI.Opc.ua.service
                 AI.ConfigSectionName = "Opc.Ua.Service";
 
                 //加载应用程序配置
-                ApplicationConfiguration config = await AI.LoadApplicationConfiguration(false);
+                ApplicationConfiguration config = AI.LoadApplicationConfiguration(false).Result;
                 if (!config.SecurityConfiguration.AutoAcceptUntrustedCertificates)
                 {
                     config.CertificateValidator.CertificateValidation += new CertificateValidationEventHandler(CertificateValidator_CertificateValidation);
                 }
                 //检查申请证书
-                bool haveAppCertificate = await AI.CheckApplicationInstanceCertificate(false, 0);
+                bool haveAppCertificate = AI.CheckApplicationInstanceCertificate(false, 0).Result;
                 if (!haveAppCertificate)
                 {
                     return Break("On", false, "应用实例证书无效");
@@ -238,7 +243,7 @@ namespace YSAI.Opc.ua.service
 
 
                 //启动服务
-                await AI.Start(service);
+                AI.StartAsService(service);
 
                 //打印信息
                 var endpoints = AI.Server.GetEndpoints().Select(e => e.EndpointUrl).Distinct();
@@ -271,11 +276,6 @@ namespace YSAI.Opc.ua.service
             }
         }
 
-        public OperateResult On()
-        {
-            return OnAsync().Result;
-        }
-
         public Task<OperateResult> OffAsync()
         {
             return Task.Run(() => Off());