update

TEAMModelBI/Controllers/BITable/CompanyUserController.cs

@@ -11,6 +11,7 @@ using TEAMModelOS.SDK.Context.BI;
 using TEAMModelOS.SDK.Context.Constant;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
+using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Table;
 
 namespace TEAMModelBI.Controllers.BITable

TEAMModelBI/Controllers/DingDingStruc/TableDingDingInfoController.cs

@@ -28,6 +28,7 @@ using TEAMModelBI.Tool.CosmosBank;
 using TEAMModelBI.DI.BIAzureStorage;
 using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.Context.BI;
+using TEAMModelOS.SDK.Models;
 
 namespace TEAMModelBI.Controllers.DingDingStruc
 {

TEAMModelBI/Controllers/LoginController.cs

@@ -680,7 +680,7 @@ namespace TEAMModelBI.Controllers
                     if (hashedPw.Equals(bizUser.pwd))
                     {
                         //string id_token = JwtAuth.CreateAuthTokenBI(_option.HostName, bizUser.RowKey?.ToString(), bizUser.name?.ToString(), bizUser.picture?.ToString(), _option.JwtSecretKey, scope: "company", webSite: Website, expire: 3);
-                        string openid_token = JwtAuth.CreateAuthTokenOpenBI(_option.HostName, bizUser.RowKey?.ToString(), bizUser.name?.ToString(), bizUser.picture?.ToString(),$"{Website}-Open",_option.JwtSecretKey, expire: 3);
+                        string openid_token = JwtAuthExtension.CreateBizLoginAuthToken(_option.HostName, bizUser.RowKey?.ToString(), bizUser.name?.ToString(), bizUser.picture?.ToString(),$"{Website}-Open",_option.JwtSecretKey, expire: 3);
 
                         await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, "tabledd-update", $"{bizUser.name}【{bizUser.RowKey}】登录商务智能开放平台", _dingDing, tid: bizUser.RowKey, tname: bizUser.name, twebsite: Website?.ToString(), httpContext: HttpContext);
                         return Ok(new { state = RespondCode.Ok, openid_token, bizUser, relBizInfos });

TEAMModelBI/Models/MonthStartEnd.cs

@@ -1,133 +0,0 @@
-using System.Collections.Generic;
-using TEAMModelOS.SDK.Models;
-
-namespace TEAMModelBI.Models
-{
-    public class MonthStartEnd
-    {
-        public string yearMonth { get; set; }
-
-        public long start { get; set; }
-
-        public long end { get; set; }
-
-    }
-
-    /// <summary>
-    /// 教师列表
-    /// </summary>
-    public class SchoolTeacherRoles
-    {
-        public string tmdId { get; set; }
-        public string tmdName { get; set; }
-    }
-
-    /// <summary>
-    /// 学校信息显示
-    /// </summary>
-    public record RecSchool
-    {
-        public string id { get; set; }
-        public string name { get; set; }
-        public string picture { get; set; }
-        public int type { get; set; }
-        public int size { get; set; }
-        public int scale { get; set; }
-    }
-
-    /// <summary>
-    /// 简单的基础信息Id、名称、图片
-    /// </summary>
-    public record BaseInfo
-    {
-        public string id { get; set; }
-        public string name { get; set; }
-        public string picture { get; set; }
-    }
-
-    /// <summary>
-    /// 用户和企业角色表
-    /// </summary>
-    public record RelBizInfo 
-    {
-        public string userRowKey { get; set; }
-        public string relId { get; set; }
-        public string bizRowKey { get; set; }
-        public string bizName { get; set; }
-        public string bizCredit { get; set; }
-        public string bizPicture { get; set; }
-        public List<string> roles { get; set; }
-
-    }
-
-    /// <summary>
-    /// 课例、互动、活动的统计
-    /// </summary>
-    public record YearCnt
-    {
-        public string name { get; set; }
-        public int lessCnt { get; set; }
-        public int interCnt { get; set; }
-        public int actCnt { get; set; }
-    }
-
-    /// <summary>
-    /// 分析基础学校信息
-    /// </summary>
-    public record AnSchool 
-    {
-        public string id { get; set; }
-        public string name { get; set; }
-        public string picture { get; set; }
-
-        /// <summary>
-        /// 1 普教，2 高职教
-        /// </summary>
-        public int type { get; set; }
-
-        public string areaId { get; set; }
-        public int size { get; set; }
-        /// <summary>
-        /// 学段
-        /// </summary>
-        public List<AnPeriod> period { get; set; }
-    }
-
-
-    /// <summary>
-    /// 学段
-    /// </summary>
-    public record AnPeriod
-    {
-        public string id { get; set; }
-        public string name { get; set; }
-        //public List<Major> majors { get; set; }
-        public List<string> grades { get; set; }
-        public List<Subject> subjects { get; set; }
-        public List<Semester> semesters { get; set; }
-    }
-
-    /// <summary>
-    /// 产品和版本的
-    /// </summary>
-    public record ScProdEd: RecSchool
-    {
-        public List<string> serial { get; set; } = new List<string>();
-
-        public List<string> service { get; set; } = new List<string>();
-        public List<string> hard { get; set; } = new List<string>();
-    }
-
-    /// <summary>
-    /// 课例分析
-    /// </summary>
-    public record LessAnalyse
-    {
-        public string id { get; set; }
-        public string code { get; set; }
-        public string periodId { get; set; }
-        public string subjectId { get; set; }
-        public List<string> grade { get; set; }
-    }
-
-}

TEAMModelBI/Tool/CommonFind.cs

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

TEAMModelBI/Tool/CosmosBank/LessonStatisWay.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text.Json;
 using System.Threading.Tasks;
 using TEAMModelBI.Models;
+using TEAMModelOS.SDK.Models;
 
 namespace TEAMModelBI.Tool.CosmosBank
 {

TEAMModelBI/Tool/CosmosBank/ProductWay.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Text.Json;
 using System.Threading.Tasks;
 using TEAMModelBI.Models;
+using TEAMModelOS.SDK.Models;
 
 namespace TEAMModelBI.Tool.CosmosBank
 {

TEAMModelBI/Tool/TimeHelper.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using TEAMModelBI.Models;
+using TEAMModelOS.SDK.Models;
 
 namespace TEAMModelBI.Tool
 {
@@ -387,7 +388,7 @@ namespace TEAMModelBI.Tool
         {
             string tStart = "";
             string tEnd = "";
-            DateTimeOffset time = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1, 0, 0, 0, 0));
+            DateTimeOffset time = System.TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1, 0, 0, 0, 0));
             tStart = time.AddMilliseconds(start).ToString($"{types}");
             if (end > 0) 
             {