From ecc32d4173c177ed13bdfced58f4bbb1c9c2e630 Mon Sep 17 00:00:00 2001
From: yubaolee <yubaolee@163.com>
Date: Thu, 4 Feb 2021 13:51:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=9A=E6=97=B6=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E4=B8=8D=E8=83=BD=E8=BF=90=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpenAuth.App/Test/TestJob.cs             | 13 ++++++++++
 OpenAuth.Repository/OpenAuthDBContext.cs | 32 ++++++++++++------------
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/OpenAuth.App/Test/TestJob.cs b/OpenAuth.App/Test/TestJob.cs
index 0f2b0183..eb4e76e5 100644
--- a/OpenAuth.App/Test/TestJob.cs
+++ b/OpenAuth.App/Test/TestJob.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 using Infrastructure;
 using Infrastructure.Cache;
 using Microsoft.AspNetCore.Http;
@@ -37,5 +38,17 @@ namespace OpenAuth.App.Test
             var result = app.QueryLocalHandlers();
             Console.WriteLine(JsonHelper.Instance.Serialize(result));
         }
+
+        [Test]
+        public void ChangeStatus()
+        {
+            var app = _autofacServiceProvider.GetService<OpenJobApp>();
+            app.ChangeJobStatus(new ChangeJobStatusReq
+            {
+                Id = "f40fe48d-71a4-4f47-b324-6178d97abfb9",
+                Status = 1
+            });
+            Thread.Sleep(60000);
+        }
     }
 }
diff --git a/OpenAuth.Repository/OpenAuthDBContext.cs b/OpenAuth.Repository/OpenAuthDBContext.cs
index e7969b30..547e1fcb 100644
--- a/OpenAuth.Repository/OpenAuthDBContext.cs
+++ b/OpenAuth.Repository/OpenAuthDBContext.cs
@@ -40,24 +40,24 @@ namespace OpenAuth.Repository
         //初始化多租户信息，根据租户id调整数据库
         private void InitTenant(DbContextOptionsBuilder optionsBuilder)
         {
-            if (_httpContextAccessor == null || _httpContextAccessor.HttpContext == null)
+            string tenantId = "OpenAuthDBContext";
+            
+            if (_httpContextAccessor != null && _httpContextAccessor.HttpContext != null)
             {
-                return;
+                //读取多租户ID
+                var httpTenantId = _httpContextAccessor.HttpContext.Request.Query[Define.TENANT_ID];
+                if (string.IsNullOrEmpty(httpTenantId))
+                {
+                    httpTenantId = _httpContextAccessor.HttpContext.Request.Headers[Define.TENANT_ID];
+                }
+                
+                //如果没有租户id，或租户用的是默认的OpenAuthDBContext,则不做任何调整
+                if (!string.IsNullOrEmpty(httpTenantId))
+                {
+                    tenantId = httpTenantId;
+                }
             }
-
-            //读取多租户ID
-            string tenantId = _httpContextAccessor.HttpContext.Request.Query[Define.TENANT_ID];
-            if (string.IsNullOrEmpty(tenantId))
-            {
-                tenantId = _httpContextAccessor.HttpContext.Request.Headers[Define.TENANT_ID];
-            }
-
-            //如果没有租户id，或租户用的是默认的OpenAuthDBContext,则不做任何调整
-            if (string.IsNullOrEmpty(tenantId))
-            {
-                tenantId = "OpenAuthDBContext";
-            }
-
+            
             string connect = _configuration.GetConnectionString(tenantId);
             if (string.IsNullOrEmpty(connect))
             {