SVN版本合并上传

JmpModel/JmpModel.csproj

@@ -8,6 +8,7 @@
     <Compile Remove="Model\DataContext\DbContextExtensions.cs" />
     <Compile Remove="Model\DataContext\IJunmppolicesqlContextProcedures.cs" />
     <Compile Remove="Model\DataContext\JunmppolicesqlContextProcedures.cs" />
+    <Compile Remove="Model\UseCountResult.cs" />
   </ItemGroup>
 
   <ItemGroup>

JmpModel/Model/DataContext/JunmppolicesqlContext.cs

@@ -4,6 +4,7 @@ using System;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata;
 using JmpModel.Model;
+using JmpModel.TempModel;
 
 namespace JmpModel.Model.DataContext
 {

JmpModel/Model/Repository/BaseRepository.cs

 using JmpModel.Model;
 using JmpModel.Model.DataContext;
+using JmpModel.TempModel;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata.Internal;

JmpModel/TempModel/UseCountResult.cs

+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Text;
+
+namespace JmpModel.TempModel
+{
+    [Table("useCount")]
+    public partial class useCountResult
+    {
+        [Column("result")]
+        public string result { get; set; }
+
+    }
+
+
+}

JunmpPoliceStation/Controllers/TjController.cs

@@ -19,6 +19,7 @@ using System.Net.Http;
 using System.Net.WebSockets;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore.Internal;
+using JmpModel.TempModel;
 
 namespace JunmpPoliceStation.Controllers
 {

JunmpPoliceStation/JunmpPoliceStation.csproj

@@ -117,7 +117,7 @@
     <ProjectReference Include="..\JmpMsgService\JmpMsgService.csproj" />
   </ItemGroup>
 
-  <ProjectExtensions><VisualStudio><UserProperties appsettings_1json__JsonSchema="" properties_4launchsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>
+  <ProjectExtensions><VisualStudio><UserProperties properties_4launchsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>
 
 
 </Project>

JunmpPoliceStation/Properties/launchSettings.json

 {
   "iisSettings": {
-    "windowsAuthentication": false,
+    "windowsAuthentication": true,
     "anonymousAuthentication": true,
     "iisExpress": {
-      "applicationUrl": "http://localhost:53692/",
-      "sslPort": 44399
+      "applicationUrl": "http://localhost:5000",
+      "sslPort": 5000
     }
   },
+  "$schema": "http://json.schemastore.org/launchsettings.json",
   "profiles": {
     "IIS Express": {
       "commandName": "IISExpress",
       "launchBrowser": true,
+      "launchUrl": "swagger/index.html",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      }
+      },
+      "applicationUrl": "http://192.168.3.1:5000;http://192.168.10.88:5000;http://localhost:5001;http://localhost:5000;"
     },
     "JunmpPoliceStation": {
       "commandName": "Project",
       "launchBrowser": true,
+      "launchUrl": "swagger/index.html",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
-      "applicationUrl": "http://192.168.3.74:5000;http://localhost:5000"
+      "applicationUrl": "http://192.168.3.1:5000;http://192.168.10.88:5000;http://localhost:5001;http://localhost:5000;http://0.0.0.0:5001;"
+    },
+    "Docker": {
+      "commandName": "Docker",
+      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}",
+      "publishAllPorts": true,
+      "useSSL": true
     }
   }
 }
\ No newline at end of file

JunmpPoliceStation/appsettings.Development.json

+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Debug",
+      "System": "Information",
+      "Microsoft": "Information"
+    }
+  }
+}
\ No newline at end of file