lixun 2 年之前
父節點
當前提交
0f12ab4ba0

+ 5 - 5
src/YSAI.DAQ/YSAI.DAQ.sln

@@ -31,7 +31,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.TestConsole", "YSAI.Te
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YSAI.RabbitMQ", "YSAI.RabbitMQ\YSAI.RabbitMQ.csproj", "{8CE7E64C-7A6A-4581-A9B3-C05214986B4F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YSAI.Manage", "YSAI.Manage\YSAI.Manage.csproj", "{25525A20-C60D-4B98-BD61-8CCA83BB45BB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YSAI.Manage", "YSAI.Manage\YSAI.Manage.csproj", "{6E9667C0-303C-472D-949B-60F812E6C659}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -91,10 +91,10 @@ Global
 		{8CE7E64C-7A6A-4581-A9B3-C05214986B4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8CE7E64C-7A6A-4581-A9B3-C05214986B4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8CE7E64C-7A6A-4581-A9B3-C05214986B4F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{25525A20-C60D-4B98-BD61-8CCA83BB45BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{25525A20-C60D-4B98-BD61-8CCA83BB45BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{25525A20-C60D-4B98-BD61-8CCA83BB45BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{25525A20-C60D-4B98-BD61-8CCA83BB45BB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6E9667C0-303C-472D-949B-60F812E6C659}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6E9667C0-303C-472D-949B-60F812E6C659}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6E9667C0-303C-472D-949B-60F812E6C659}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6E9667C0-303C-472D-949B-60F812E6C659}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

+ 1 - 1
src/YSAI.DAQ/YSAI.DB/YSAI.DB.csproj

@@ -8,7 +8,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Dapper" Version="2.0.143" />
-		<PackageReference Include="MySql.Data" Version="8.0.33" />
+		<PackageReference Include="MySql.Data" Version="8.1.0" />
 		<PackageReference Include="System.Data.OracleClient" Version="1.0.8" />
 		<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
 		<PackageReference Include="System.Data.SQLite" Version="1.0.118" />

+ 19 - 0
src/YSAI.DAQ/YSAI.Manage/Controllers/HomeController.cs

@@ -0,0 +1,19 @@
+using Microsoft.AspNetCore.Mvc;
+
+namespace YSAI.Manage.Controllers
+{
+    [ApiController]
+    [Route("[controller]")]
+    public class HomeController : Controller
+    {
+        [HttpGet]
+        public string Go(string SN)
+        {
+            if (!string.IsNullOrWhiteSpace(SN))
+            {
+                return $"欢迎回家“{SN}”";
+            }
+            return "滚犊子";
+        }
+    }
+}

+ 0 - 33
src/YSAI.DAQ/YSAI.Manage/Controllers/WeatherForecastController.cs

@@ -1,33 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace YSAI.Manage.Controllers
-{
-    [ApiController]
-    [Route("[controller]")]
-    public class WeatherForecastController : ControllerBase
-    {
-        private static readonly string[] Summaries = new[]
-        {
-        "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
-    };
-
-        private readonly ILogger<WeatherForecastController> _logger;
-
-        public WeatherForecastController(ILogger<WeatherForecastController> logger)
-        {
-            _logger = logger;
-        }
-
-        [HttpGet(Name = "GetWeatherForecast")]
-        public IEnumerable<WeatherForecast> Get()
-        {
-            return Enumerable.Range(1, 5).Select(index => new WeatherForecast
-            {
-                Date = DateTime.Now.AddDays(index),
-                TemperatureC = Random.Shared.Next(-20, 55),
-                Summary = Summaries[Random.Shared.Next(Summaries.Length)]
-            })
-            .ToArray();
-        }
-    }
-}

+ 3 - 3
src/YSAI.DAQ/YSAI.Manage/Properties/launchSettings.json

@@ -4,8 +4,8 @@
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
     "iisExpress": {
-      "applicationUrl": "http://localhost:51710",
-      "sslPort": 44373
+      "applicationUrl": "http://localhost:8381",
+      "sslPort": 44397
     }
   },
   "profiles": {
@@ -14,7 +14,7 @@
       "dotnetRunMessages": true,
       "launchBrowser": true,
       "launchUrl": "swagger",
-      "applicationUrl": "https://localhost:7098;http://localhost:5231",
+      "applicationUrl": "https://localhost:7205;http://localhost:5237",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

+ 0 - 13
src/YSAI.DAQ/YSAI.Manage/WeatherForecast.cs

@@ -1,13 +0,0 @@
-namespace YSAI.Manage
-{
-    public class WeatherForecast
-    {
-        public DateTime Date { get; set; }
-
-        public int TemperatureC { get; set; }
-
-        public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
-
-        public string? Summary { get; set; }
-    }
-}

+ 4 - 0
src/YSAI.DAQ/YSAI.Manage/YSAI.Manage.csproj

@@ -10,4 +10,8 @@
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\YSAI.Core\YSAI.Core.csproj" />
+  </ItemGroup>
+
 </Project>

+ 7 - 4
src/YSAI.DAQ/YSAI.Test/YSAI.Test.csproj

@@ -11,10 +11,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
-    <PackageReference Include="coverlet.collector" Version="3.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>