Shun 2 years ago
parent
commit
3872781539

File diff suppressed because it is too large
+ 1 - 1
src/YSAI.DAQ/YSAI.Can.Pack/YSAI.Can.Pack.csproj


+ 0 - 5
src/YSAI.DAQ/YSAI.Can/CanData.cs

@@ -1,11 +1,6 @@
 using Newtonsoft.Json.Converters;
-using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
 using System.Text.Json.Serialization;
-using System.Threading.Tasks;
 
 namespace YSAI.Can
 {

File diff suppressed because it is too large
+ 1 - 1
src/YSAI.DAQ/YSAI.DB.Pack/YSAI.DB.Pack.csproj


+ 1 - 1
src/YSAI.DAQ/YSAI.DaqManage/DaqManageOperate.cs

@@ -948,7 +948,7 @@ namespace YSAI.DaqManage
                 });
                 if (FailMessage.Count > 0)
                 {
-                    return Break("SettingLib", false, $"存在{FailMessage.Count}个失败信息",FailMessage,ResultType.Json);
+                    return Break("SettingLib", false, $"存在 {FailMessage.Count} 个失败信息",FailMessage,ResultType.Json);
                 }
                 return Break("SettingLib", true);
             }

File diff suppressed because it is too large
+ 1 - 1
src/YSAI.DAQ/YSAI.Kafka.Pack/YSAI.Kafka.Pack.csproj


+ 3 - 1
src/YSAI.DAQ/YSAI.Manage/Controllers/DaqOperateController.cs

@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Cors;
+using Microsoft.AspNetCore.Mvc;
 using YSAI.Core.data;
 using YSAI.Core.@enum;
 using YSAI.DaqManage;
@@ -10,6 +11,7 @@ namespace YSAI.Manage.Controllers
     /// </summary>
     [ApiController]
     [Route("api/[controller]/[action]")]
+    [EnableCors("CorsPolicy")]//配置Cors,允许跨域
     public class DaqOperateController : Controller
     {
         /// <summary>

+ 3 - 1
src/YSAI.DAQ/YSAI.Manage/Controllers/FileOperateController.cs

@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Cors;
+using Microsoft.AspNetCore.Mvc;
 using YSAI.Core.data;
 using YSAI.DaqManage;
 
@@ -9,6 +10,7 @@ namespace YSAI.Manage.Controllers
     /// </summary>
     [ApiController]
     [Route("api/[controller]/[action]")]
+    [EnableCors("CorsPolicy")]//配置Cors,允许跨域
     public class FileOperateController : Controller
     {
         /// <summary>

+ 2 - 0
src/YSAI.DAQ/YSAI.Manage/Controllers/InfoOperateController.cs

@@ -3,6 +3,7 @@ using YSAI.Core.@enum;
 using YSAI.Core.data;
 using YSAI.Unility;
 using Newtonsoft.Json.Linq;
+using Microsoft.AspNetCore.Cors;
 
 namespace YSAI.Manage.Controllers
 {
@@ -11,6 +12,7 @@ namespace YSAI.Manage.Controllers
     /// </summary>
     [ApiController]
     [Route("api/[controller]/[action]")]
+    [EnableCors("CorsPolicy")]//配置Cors,允许跨域
     public class InfoOperateController : Controller
     {
         /// <summary>

+ 3 - 1
src/YSAI.DAQ/YSAI.Manage/Controllers/RelayOperateController.cs

@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Cors;
+using Microsoft.AspNetCore.Mvc;
 using YSAI.Core.data;
 
 namespace YSAI.Manage.Controllers
@@ -8,6 +9,7 @@ namespace YSAI.Manage.Controllers
     /// </summary>
     [ApiController]
     [Route("api/[controller]/[action]")]
+    [EnableCors("CorsPolicy")]//配置Cors,允许跨域
     public class RelayOperateController : Controller
     {
         /// <summary>

File diff suppressed because it is too large
+ 1 - 1
src/YSAI.DAQ/YSAI.Modbus.Pack/YSAI.Modbus.Pack.csproj


File diff suppressed because it is too large
+ 1 - 1
src/YSAI.DAQ/YSAI.Mqtt.Pack/YSAI.Mqtt.Pack.csproj


File diff suppressed because it is too large
+ 1 - 1
src/YSAI.DAQ/YSAI.Opc.Pack/YSAI.Opc.Pack.csproj


File diff suppressed because it is too large
+ 1 - 1
src/YSAI.DAQ/YSAI.RabbitMQ.Pack/YSAI.RabbitMQ.Pack.csproj


File diff suppressed because it is too large
+ 1 - 1
src/YSAI.DAQ/YSAI.S7.Pack/YSAI.S7.Pack.csproj