优化统计结构。

TEAMModelBI/Controllers/BIHome/HomeStatisController.cs

@@ -13,7 +13,7 @@ using TEAMModelOS.Models;
 using System.Text;
 using StackExchange.Redis;
 using TEAMModelOS.SDK.Extension;
-using TEAMModelBI.Models;
+using TEAMModelBI.Tool;
 
 namespace TEAMModelBI.Controllers.BIHome
 {

TEAMModelBI/Controllers/BISchool/SchoolController.cs

@@ -9,7 +9,7 @@ using System.Linq;
 using System.Text.Json;
 using System.Threading.Tasks;
 using TEAMModelBI.Filter;
-using TEAMModelBI.Models;
+using TEAMModelBI.Tool;
 using TEAMModelOS.Models;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;

TEAMModelBI/Controllers/BITest/TestController.cs

@@ -38,6 +38,7 @@ using System.Numerics;
 using System.Security.Cryptography;
 using System.Runtime.InteropServices;
 using System.Runtime.CompilerServices;
+using System.IdentityModel.Tokens.Jwt;
 
 namespace TEAMModelBI.Controllers.BITest
 {
@@ -719,6 +720,11 @@ namespace TEAMModelBI.Controllers.BITest
             return Ok(new { state = 200, pydays, days, strends , str_strend1, str_strend2 , ste  });
         }
 
+        /// <summary>
+        /// 计算天数
+        /// </summary>
+        /// <param name="jsonElement"></param>
+        /// <returns></returns>
         [HttpPost("get-dateday")]
         public async Task<IActionResult> GetDateDay(JsonElement jsonElement) 
         {
@@ -769,6 +775,25 @@ namespace TEAMModelBI.Controllers.BITest
             
         }
 
+        [HttpPost("get-xauth")]
+        public async Task<IActionResult> GetXAuth() 
+        {
+            string authHeader = this.Request.Headers["Authorization"];//Header中的token
+            string _auth = HttpContext.GetXAuth("AuthToken");
+            string id = null;
+            string name = null;
+
+            if (!string.IsNullOrWhiteSpace(_auth) && JwtAuthExtension.ValidateApiToken(_auth, _option.JwtSecretKey))
+            {
+                var jwt = new JwtSecurityTokenHandler().ReadJwtToken(_auth);
+                id = jwt.Payload.Sub;
+                name = jwt.Claims.FirstOrDefault(claim => claim.Type.Equals("name"))?.Value;
+            }
+            return Ok(new { state = 200, id, name });
+
+        }
+
+
 
         public class strend
         {

TEAMModelBI/Controllers/Census/ProductStatisController.cs

@@ -7,7 +7,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
 using System.Threading.Tasks;
-using TEAMModelBI.Models;
+using TEAMModelBI.Tool;
 using TEAMModelOS.Models;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;

TEAMModelBI/Controllers/LoginController.cs

@@ -30,6 +30,7 @@ using TEAMModelOS.SDK.Models.Cosmos.BI;
 using Azure.Storage.Sas;
 using System.Net.Http.Json;
 using TEAMModelBI.Filter;
+using TEAMModelBI.Models.Extension;
 //using static DingTalk.Api.Response.OapiV2UserGetResponse;
 
 namespace TEAMModelBI.Controllers
@@ -484,6 +485,8 @@ namespace TEAMModelBI.Controllers
                             permissions = !string.IsNullOrEmpty($"{item.permissions}") ? new List<string>(item.permissions.Split(",")) : new List<string>();
                             id_token = JwtAuthExtension.CreateAuthToken(_option.HostName, item.tmdId?.ToString(), item.tmdName?.ToString(), item.picture?.ToString(), _option.JwtSecretKey, Website: "BI", scope: $"assist", roles: roles?.ToArray(), permissions: permissions?.ToArray(), ddsub: item.RowKey?.ToString());
 
+                            //id_token = JwtAuth.CreateAuthTokenBI(_option.HostName, item.tmdId?.ToString(), item.tmdName?.ToString(), item.picture?.ToString(), item.RowKey?.ToString(), item.name?.ToString(), item.avatar?.ToString(), _option.JwtSecretKey, scope: "assist", Website: "BI", roles: roles?.ToArray(), permissions: permissions?.ToArray(), expire:3);
+
                             (osblob_uri, osblob_sas) = roles.Contains("assist") ? _azureStorage.GetBlobContainerSAS("teammodelos", BlobContainerSasPermissions.Write | BlobContainerSasPermissions.Read | BlobContainerSasPermissions.List | BlobContainerSasPermissions.Delete) : _azureStorage.GetBlobContainerSAS("teammodelos", BlobContainerSasPermissions.Read | BlobContainerSasPermissions.List);
                         }
                         else

TEAMModelBI/Models/CommonFind.cs

@@ -5,7 +5,7 @@ using System.Text.Json;
 using System.Threading.Tasks;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
 
-namespace TEAMModelBI.Models
+namespace TEAMModelBI.Tool
 {
     public class CommonFind
     {