소스 검색

登录代码调整

CrazyIter 5 년 전
부모
커밋
baecfc9cf5

+ 2 - 2
TEAMModelOS.SDK/Module/AzureTable/Configuration/AzureTableServiceCollectionExtensions.cs

@@ -30,7 +30,7 @@ namespace TEAMModelOS.SDK.Module.AzureTable.Configuration
             {
                 Builder = services.AddServerBuilder();
             }
-            //services.AddSingleton<IAzureTableDBRepository, AzureTableDBRepository>();
+            services.AddSingleton<IAzureTableDBRepository, AzureTableDBRepository>();
             return Builder;
         }
 
@@ -42,7 +42,7 @@ namespace TEAMModelOS.SDK.Module.AzureTable.Configuration
         /// <returns></returns>
         public static AzureTableServiceBuilder AddConnection(this AzureTableServiceBuilder builder, AzureTableOptions databaseOptions)
         {
-            //builder.Services.AddSingleton(databaseOptions);
+            builder.Services.AddSingleton(databaseOptions);
             return builder;
         }
         

+ 6 - 4
TEAMModelOS/Controllers/Core/LoginController.cs

@@ -23,7 +23,9 @@ using TEAMModelOS.Service.Models.Core;
 
 namespace TEAMModelOS.Controllers.Core
 {
-    public class LoginController
+    [Route("api/[controller]")]
+    [ApiController]
+    public class LoginController :BaseController
     {
         private readonly IAzureTableDBRepository azureTableDBRepository;
         private readonly IAzureCosmosDBRepository azureCosmosDBRepository;
@@ -81,7 +83,7 @@ namespace TEAMModelOS.Controllers.Core
                 if (login != null && !string.IsNullOrEmpty(login.Token))
                 {
                     result.CheckTicket = true;
-                    JwtResponse token = await CreateJwtToken(login);
+                    JwtResponse token =  CreateJwtToken(login);
                     result.JwtToken = token;
                     login.Token = token.Access_token;
                     result.JwtToken.Scope = login.Scope;
@@ -116,7 +118,7 @@ namespace TEAMModelOS.Controllers.Core
                 user.name = ticketInfo.Name;
                 user.TEAMModelId = ticketInfo.TEAMModelId;
                 user.areaCode = "86";
-                JwtResponse jwtToken = await CreateJwtToken(loginInfo);
+                JwtResponse jwtToken =   CreateJwtToken(loginInfo);
                 loginInfo.Token = jwtToken.Access_token;
                 loginInfo.Scope = jwtToken.Scope;
                 result.JwtToken = jwtToken;
@@ -213,7 +215,7 @@ namespace TEAMModelOS.Controllers.Core
                 }
             }
         }
-        public async Task<JwtResponse> CreateJwtToken(LoginInfo loginInfo)
+        public  JwtResponse CreateJwtToken(LoginInfo loginInfo)
         {
             string role = "Teacher";
             ClaimModel model = new ClaimModel