解衝突

TEAMModelBI/Controllers/RepairApi/SchoolRepController.cs

@@ -576,19 +576,33 @@ namespace TEAMModelBI.Controllers.RepairApi
         /// <returns></returns>
         [ProducesDefaultResponseType]
         [HttpPost("set-allProdAnalysis")]
-        public async Task<IActionResult> SetAllProdAnalysis()
+        public async Task<IActionResult> SetAllProdAnalysis(JsonElement jsonElement)
         {
             var _azureCosmosClient = _azureCosmos.GetCosmosClient();
             var _azureCosmosClientCsv2 = _azureCosmos.GetCosmosClient(name: "CoreServiceV2");
             var _azureCosmosClientCsv2Read = _azureCosmos.GetCosmosClient(name: "CoreServiceV2CnRead");
             var datetime = DateTimeOffset.UtcNow;
             var y = $"{datetime.Year}";
+            string month = (jsonElement.TryGetProperty("month", out JsonElement _month)) ? $"{_month}" : string.Empty;
+            string day = (jsonElement.TryGetProperty("day", out JsonElement _day)) ? $"{_day}" : string.Empty;
             var redisClinet2 = _azureRedis.GetRedisClient(2);
             var keys = new HashSet<RedisKey>();
             int nextCursor = 0;
             do
             {
-                RedisResult redisResult = redisClinet2.Execute("SCAN", nextCursor.ToString(), "MATCH", "TeachingData:*", "COUNT", "1000");
+                string sql = "TeachingData:*";
+                if (!string.IsNullOrWhiteSpace(month)) {
+                    int _m = 0;
+                    string mString = (Int32.TryParse(month, out _m) && _m > 0 && _m < 10) ? $"0{_m}" : $"{_m}";
+                    sql = $"TeachingData:{mString}*"; //[例]TeachingData:08*
+                    if(!string.IsNullOrWhiteSpace(day))
+                    {
+                        int _d = 0;
+                        string dString = (Int32.TryParse(day, out _d) && _d > 0 && _d < 10) ? $"0{_d}" : $"{_d}";
+                        sql = $"TeachingData:{mString}{dString}"; //[例]TeachingData:0801
+                    }
+                }
+                RedisResult redisResult = redisClinet2.Execute("SCAN", nextCursor.ToString(), "MATCH", $"{sql}", "COUNT", "1000");
                 var innerResult = (RedisResult[])redisResult;
                 nextCursor = int.Parse((string)innerResult[0]);
                 List<RedisKey> resultLines = ((RedisKey[])innerResult[1]).ToList();

TEAMModelBI/TEAMModelBI.csproj

@@ -65,9 +65,9 @@
 		<SpaRoot>ClientApp\</SpaRoot>
 		<DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
 		<UserSecretsId>078b5d89-7d90-4f6a-88fc-7d96025990a8</UserSecretsId>
-		<Version>5.2407.31</Version>
-		<AssemblyVersion>5.2407.31.1</AssemblyVersion>
-		<FileVersion>5.2407.31.1</FileVersion>
+		<Version>5.2408.14</Version>
+		<AssemblyVersion>5.2408.14.1</AssemblyVersion>
+		<FileVersion>5.2408.14.1</FileVersion>
 		<Description>TEAMModelBI(BI)</Description>
 		<PackageReleaseNotes>BI版本说明版本切换标记2022000908</PackageReleaseNotes>
 		<PackageId>TEAMModelBI</PackageId>

TEAMModelContest/Contest.Server/Contest.Server.csproj

@@ -1,16 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <SpaRoot>..\contest.client</SpaRoot>
+    <SpaRoot>..\Contest.Client</SpaRoot>
     <SpaProxyLaunchCommand>npm run dev</SpaProxyLaunchCommand>
     <SpaProxyServerUrl>https://localhost:5173</SpaProxyServerUrl>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\contest.client\contest.client.esproj">
+    <ProjectReference Include="..\Contest.Client\Contest.Client.esproj">
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>

TEAMModelOS.Extension/HTEX.Complex/Controllers/IndexController.cs

@@ -0,0 +1,198 @@
+using Azure.Storage.Blobs.Models;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using static TEAMModelOS.SDK.Models.Service.SystemService;
+using System.Collections.Concurrent;
+using System.Text.Json;
+using System.Text;
+using TEAMModelOS.SDK.DI;
+using TEAMModelOS.SDK.Models.Service;
+using TEAMModelOS.SDK;
+using TEAMModelOS.SDK.Extension;
+using Azure.Storage.Blobs.Specialized;
+
+namespace HTEX.Complex.Controllers
+{
+    [ApiController]
+    [Route("api")]
+    public class IndexController : ControllerBase
+    {
+        private readonly DingDing _dingDing;
+        private readonly IHttpClientFactory _httpClient;
+        private readonly IConfiguration _configuration;
+        private readonly AzureStorageFactory _azureStorage;
+        private readonly AzureRedisFactory _azureRedis;
+        private readonly IPSearcher _ipSearcher;
+        private readonly Region2LongitudeLatitudeTranslator _longitudeLatitudeTranslator;
+        public IndexController(AzureRedisFactory azureRedis, Region2LongitudeLatitudeTranslator longitudeLatitudeTranslator, IHttpClientFactory httpClient, IConfiguration configuration, AzureStorageFactory azureStorage, IPSearcher searcher, DingDing dingDing)
+        {
+            _httpClient = httpClient;
+            _configuration = configuration;
+            _azureStorage = azureStorage;
+            _ipSearcher = searcher;
+            _dingDing = dingDing;
+            _azureRedis=azureRedis;
+            _longitudeLatitudeTranslator = longitudeLatitudeTranslator;
+        }
+        /// <summary>
+        ///  上传到blob
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost("http-log")]
+
+        [RequestSizeLimit(102_400_000_00)] //最大10000m左右
+        public async Task<IActionResult> HttpLog(JsonElement json)
+        {
+            try
+            {
+                string data = json.ToJsonString();
+                var gmt8Time = DateTimeOffset.Now.GetGMTTime(8);
+                var appendBlob = _azureStorage.GetBlobContainerClient("0-service-log").GetAppendBlobClient($"http-log/{gmt8Time:yyyy}/{gmt8Time:MM}/{gmt8Time:dd}/{gmt8Time:HH}.log");
+                if (!await appendBlob.ExistsAsync())
+                {
+                    await appendBlob.CreateAsync();
+                }
+                using (var stream = new MemoryStream(Encoding.UTF8.GetBytes($"{data},\n")))
+                {
+                    await appendBlob.AppendBlockAsync(stream);
+                }
+                return Ok(new { code = 1 });
+            }
+            catch (Exception ex)
+            {
+                return Ok(new { code = 1 });
+            }
+        }
+
+        [HttpPost("report-api-settle")]
+
+        [AllowAnonymous]
+        [RequestSizeLimit(102_400_000_00)] //最大10000m左右
+        public async Task<IActionResult> ReportApiSettle(JsonElement json)
+        {
+
+            List<string> times = json.GetProperty("times").ToObject<List<string>>();
+
+            return Ok(new { });
+        }
+        [HttpPost("report-api-reload")]
+
+        [AllowAnonymous]
+        [RequestSizeLimit(102_400_000_00)] //最大10000m左右
+        public async Task<IActionResult> ReportApiTest(JsonElement json)
+        {
+            try
+            {
+                List<string> times = json.GetProperty("times").ToObject<List<string>>();
+                foreach (var timeDate in times)
+                {
+                    if (DateTimeOffset.TryParse(timeDate, out DateTimeOffset date))
+                    {
+                        var gmt8Time = date.GetGMTTime(8);
+                        var nowGmt8Time = DateTimeOffset.Now.GetGMTTime(8);
+                        List<string> logs = await _azureStorage.GetBlobContainerClient("0-service-log").List($"http-log/{date:yyyy}/{date:MM}/{date:dd}");
+                        List<HttpLog> httpLogs = new List<HttpLog>();
+                        foreach (var log in logs)
+                        {
+                            string nowPath = $"{nowGmt8Time:yyyy/MM/dd/HH}.log";
+                            if (!log.Contains("index.log")  && !log.Contains(".json") &&!log.Contains(nowPath))
+                            {
+                                BlobDownloadResult result = await _azureStorage.GetBlobContainerClient("0-service-log").GetBlobBaseClient(log).DownloadContentAsync();
+                                var content = result.Content.ToString();
+                                content= content.Substring(0, content.Length-2);
+                                if (content.EndsWith("}"))
+                                {
+                                    content=$"[{content}]";
+                                }
+                                else
+                                {
+                                    content=$"[{content}}}]";
+                                }
+                                httpLogs.AddRange(content.ToObject<List<HttpLog>>());
+                            }
+                        }
+                        (ConcurrentBag<ApiVisit> visits, ConcurrentBag<(string uuid, HttpLog httpLog, List<string> tmdid, List<string> school)> uuidInfo)   =
+                            await SystemService.ConvertHttpLog(httpLogs, _azureRedis, _ipSearcher, _longitudeLatitudeTranslator, gmt8Time, true);
+                        if (visits!=null  && visits.Count>0)
+                        {
+                            var appendDayBlob = _azureStorage.GetBlobContainerClient("0-service-log").GetAppendBlobClient($"http-log/{gmt8Time:yyyy}/{gmt8Time:MM}/{gmt8Time:dd}/index.log");
+                            if (!await appendDayBlob.ExistsAsync())
+                            {
+
+                                await appendDayBlob.CreateAsync();
+                            }
+                            else
+                            {
+                                await appendDayBlob.DeleteAsync();
+                                await appendDayBlob.CreateAsync();
+                            }
+                            int maxSize = 4*1024 * 1024; // 1M
+                            List<string> parts = new List<string>();
+                            StringBuilder sb = new StringBuilder();
+
+                            foreach (var item in visits)
+                            {
+                                string jsonString = $"{item.ToJsonString()},\n";
+                                int currentSize = Encoding.UTF8.GetByteCount(sb.ToString());
+
+                                if (currentSize + Encoding.UTF8.GetByteCount(jsonString) > maxSize)
+                                {
+                                    parts.Add(sb.ToString());
+                                    sb.Clear();
+                                }
+
+                                sb.Append(jsonString);
+                            }
+
+                            if (sb.Length > 0)
+                            {
+                                parts.Add(sb.ToString());
+                            }
+
+                            foreach (string part in parts)
+                            {
+                                using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(part)))
+                                {
+                                    await appendDayBlob.AppendBlockAsync(stream);
+                                }
+                            }
+
+
+                            //using (var stream = new MemoryStream(Encoding.UTF8.GetBytes($"{sb}")))
+                            //{
+                            //    await appendDayBlob.AppendBlockAsync(stream);
+                            //}
+                        }
+                    }
+                }
+
+                //全网：用户访问数，学校访问数，学生访问数，不同业务访问量，
+                return Ok(new { });
+            }
+            catch (Exception ex)
+            {
+                await _dingDing.SendBotMsg($"{ex.Message}\n{ex.StackTrace}", GroupNames.成都开发測試群組);
+            }
+            return Ok();
+        }
+
+        /// <summary>
+        /// 使用时长，一天内累计
+        /// </summary>
+        /// <param name="json"></param>
+        /// <returns></returns>
+        [HttpPost("report-api")]
+
+        [AllowAnonymous]
+        [RequestSizeLimit(102_400_000_00)] //最大10000m左右
+        public async Task<IActionResult> ReportApi(JsonElement json)
+        {
+            var force = json.GetProperty("force").GetString();
+            List<string> times = json.GetProperty("times").ToObject<List<string>>();
+            await SystemService.VisitSettle(times, _azureStorage, _azureRedis, _longitudeLatitudeTranslator, _ipSearcher, $"{force}");
+            return Ok(new { code = 200 });
+        }
+
+    }
+}

TEAMModelOS.Extension/HTEX.Complex/Controllers/OfficialController.cs

@@ -0,0 +1,220 @@
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Azure.Cosmos;
+using System.Text.Json;
+using TEAMModelOS.SDK.DI;
+using TEAMModelOS.SDK.Models;
+using TEAMModelOS.SDK;
+
+namespace HTEX.Complex.Controllers
+{
+    [Route("official")]
+    [ApiController]
+    public class OfficialController : ControllerBase
+    {
+
+        private readonly DingDing _dingDing;
+        // private readonly SnowflakeId _snowflakeId;
+        // private readonly ServerSentEventsService _sse;
+        private readonly AzureCosmosFactory _azureCosmos3Factory;
+        private readonly System.Net.Http.IHttpClientFactory _httpClientFactory;
+        //private readonly Models.Option _option;
+        // private readonly MailFactory _mailFactory;
+        private readonly AzureRedisFactory _azureRedis;
+        private readonly AzureStorageFactory _azureStorage;
+        private readonly IWebHostEnvironment _environment;
+        private readonly IConfiguration _configuration;
+        // private readonly CoreAPIHttpService _coreAPIHttpService;
+        private readonly IPSearcher _searcher;
+        public OfficialController(IWebHostEnvironment environment, IConfiguration configuration,
+            AzureStorageFactory azureStorage, AzureRedisFactory azureRedis, System.Net.Http.IHttpClientFactory httpClientFactory, AzureCosmosFactory azureCosmos3Factory,
+            // IOptionsSnapshot<Option> option,  
+            DingDing dingDing, IPSearcher searcher)
+        {
+            _dingDing = dingDing;
+            _azureCosmos3Factory = azureCosmos3Factory;
+            _httpClientFactory = httpClientFactory;
+            _azureRedis = azureRedis;
+            _azureStorage = azureStorage;
+            _environment = environment;
+            _configuration = configuration;
+            _searcher = searcher;
+        }
+
+        [ProducesDefaultResponseType]
+        [RequestSizeLimit(102_400_000_00)] //最大10000m左右
+        [HttpPost("video-ls")]
+        public async Task<IActionResult> VideoUpload()
+        {
+            List<string> students = new List<string>();
+            //var result= await _azureCosmos3Factory.GetCosmosClient().GetContainer("winteachos", Constant.Teacher)
+            //    .GetList<Teacher>( "select value c from c", "Base");
+
+            await foreach (var item in _azureCosmos3Factory.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Student)
+                .GetItemQueryIteratorSql<string>(queryText: "select value c.id from c", requestOptions: new QueryRequestOptions { MaxItemCount=5, PartitionKey = new PartitionKey("Base-hbcn") }))
+            {
+                students.Add(item);
+            }
+            return Ok(students);
+        }
+
+        [ProducesDefaultResponseType]
+        [HttpPost("video-list")]
+        public async Task<IActionResult> VideoList(JsonElement json)
+        {
+            List<OfficialVideo> videos = new List<OfficialVideo>();
+            var table = _azureStorage.TableServiceClient().GetTableClient("ShortUrl");
+
+            if (json.TryGetProperty("rowKey", out JsonElement _rowKey) && !string.IsNullOrWhiteSpace($"{_rowKey}"))
+            {
+                videos =    table.Query<OfficialVideo>($"{Constant.PartitionKey} {Constant.Equal} 'OfficialVideo' and {Constant.RowKey} {Constant.Equal} '{_rowKey}'").ToList();
+
+
+            }
+            else
+            {
+                videos =    table.Query<OfficialVideo>(filter: $"{Constant.PartitionKey} eq  'OfficialVideo'").ToList();
+
+            }
+            return Ok(new { videos });
+        }
+
+        [ProducesDefaultResponseType]
+        [RequestSizeLimit(102_400_000_00)] //最大10000m左右
+        [HttpPost("video-upload")]
+        public async Task<IActionResult> VideoUpload([FromForm] string name, [FromForm] string type, [FromForm] string? rowKey = null, [FromForm] IFormFile? videoFile = null)
+        {
+            OfficialVideo video = null;
+            string url = string.Empty;
+            var table = _azureStorage.TableServiceClient().GetTableClient("ShortUrl");
+            if (videoFile == null)
+            {
+                if (!string.IsNullOrWhiteSpace(rowKey))
+                {
+                    try
+                    {
+                        video=await table.GetEntityAsync<OfficialVideo>("OfficialVideo", rowKey);
+                    }
+                    catch { return BadRequest(); }
+                }
+                else
+                {
+                    return BadRequest();
+                }
+            }
+            else
+            {
+                if (!string.IsNullOrWhiteSpace(rowKey))
+                {
+                    try
+                    {
+                        video=await table.GetEntityAsync<OfficialVideo>("OfficialVideo", rowKey);
+                    }
+                    catch { }
+                }
+                if (video== null)
+                {
+                    video= new OfficialVideo { RowKey=$"{DateTimeOffset.UtcNow.ToUnixTimeMilliseconds()}", PartitionKey="OfficialVideo" };
+                }
+                string fileExt = FileType.GetExtention(videoFile.FileName).ToLower();
+                if (fileExt.Equals("mp4", StringComparison.OrdinalIgnoreCase))
+                {
+                    var url_blob = await _azureStorage.GetBlobContainerClient("0-public").UploadFileByContainer(videoFile.OpenReadStream(), "official", $"{video.RowKey}.{fileExt}", false);
+                    url=url_blob;
+                }
+            }
+            video.name= name;
+            video.type= type;
+            video.url=string.IsNullOrWhiteSpace(url) ? video.url : url;
+            table.UpsertEntity<OfficialVideo>(video);
+            return Ok(new { video });
+        }
+    }
+    //[TableName(Name = "ShortUrl")]
+    public class OfficialVideo : HTableEntity
+    {
+        ///// <summary>
+        ///// OfficialVideo
+        ///// </summary>
+        //public string PartitionKey { get; set; }
+        ///// <summary>
+        ///// 视频id
+        ///// </summary>
+        //public string RowKey { get; set; }
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string? name { get; set; }
+        /// <summary>
+        /// 类型
+        /// </summary>
+        public string? type { get; set; }
+        /// <summary>
+        /// 地址
+        /// </summary>
+        public string? url { get; set; }
+    }
+    public class Student : CosmosEntity
+    {
+        public string mail { get; set; }
+        public string mobile { get; set; }
+        public string country { get; set; }
+        public string name { get; set; }
+        public string picture { get; set; }
+        public string schoolId { get; set; }
+        public string pw { get; set; }
+        public string salt { get; set; }
+        public int year { get; set; }
+        //座位号
+        public string no { get; set; }   //座位号
+        public string irs { get; set; }
+        //绑定班级Id
+        public string classId { get; set; }
+        //分组信息
+        public string groupId { get; set; }
+        public string groupName { get; set; }
+        public string periodId { get; set; }
+        /// <summary>
+        /// 性别 M( male,男) F (female 女)  N(secret 保密) 
+        /// </summary>
+        public string gender { get; set; }
+
+        //补充留级信息
+        //0在校，1毕业 
+        public int graduate { get; set; } = 0;
+
+        /// <summary>
+        /// 创建时间  十位 时间戳
+        /// </summary>
+        public long createTime { get; set; }
+
+        /// <summary>
+        /// 学生的专业id
+        /// </summary>
+        public string majorId { get; set; }
+        /// <summary>
+        /// 學生的OpenID (TW教育雲綁定ID)
+        /// </summary>
+        public string openId { get; set; }
+    }
+
+    /// <summary>
+    /// 教师
+    /// </summary>
+    public class Teacher : CosmosEntity
+    {
+        public Teacher()
+        {
+            pk = "Teacher";
+        }
+
+        /// <summary>
+        /// 系统权限信息
+        /// </summary>
+        public HashSet<string> permissions { get; set; } = new HashSet<string>();
+        /// <summary>
+        /// 组织信息
+        /// </summary>
+
+        //常用设备信息，及IP登录信息。
+    }
+}

TEAMModelOS.Extension/HTEX.Complex/Dockerfile

@@ -0,0 +1,25 @@
+#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
+
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
+USER app
+WORKDIR /app
+EXPOSE 80
+EXPOSE 443
+
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+ARG BUILD_CONFIGURATION=Release
+WORKDIR /src
+COPY ["TEAMModelOS.Extension/HTEX.Complex/HTEX.Complex.csproj", "TEAMModelOS.Extension/HTEX.Complex/"]
+RUN dotnet restore "./TEAMModelOS.Extension/HTEX.Complex/HTEX.Complex.csproj"
+COPY . .
+WORKDIR "/src/TEAMModelOS.Extension/HTEX.Complex"
+RUN dotnet build "./HTEX.Complex.csproj" -c $BUILD_CONFIGURATION -o /app/build
+
+FROM build AS publish
+ARG BUILD_CONFIGURATION=Release
+RUN dotnet publish "./HTEX.Complex.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "HTEX.Complex.dll"]

TEAMModelOS.Extension/HTEX.Complex/HTEX.Complex.csproj

@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <UserSecretsId>1cd8e994-7280-465a-bd0c-ed91a6d66717</UserSecretsId>
+    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+    <DockerfileContext>..\..</DockerfileContext>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Azure.SignalR.Management" Version="1.26.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.20.1" />
+	<PackageReference Include="Hangfire" Version="1.8.11" />
+	<PackageReference Include="Hangfire.Dashboard.BasicAuthorization" Version="1.0.2" />
+	<PackageReference Include="Hangfire.Redis.StackExchange" Version="1.9.3" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\TEAMModelOS.SDK\TEAMModelOS.SDK.csproj" />
+  </ItemGroup>
+</Project>

TEAMModelOS.Extension/HTEX.Complex/HTEX.Complex.http

@@ -0,0 +1,6 @@
+@HTEX.Complex_HostAddress = http://localhost:5181
+
+GET {{HTEX.Complex_HostAddress}}/weatherforecast/
+Accept: application/json
+
+###

TEAMModelOS.Extension/HTEX.Complex/Program.cs

@@ -0,0 +1,126 @@
+using Hangfire;
+using Hangfire.Redis.StackExchange;
+using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.IdentityModel.Tokens;
+using System.IdentityModel.Tokens.Jwt;
+using TEAMModelOS.SDK.DI;
+using TEAMModelOS.SDK;
+using HTEX.Complex.Services;
+namespace HTEX.Complex
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            var builder = WebApplication.CreateBuilder(args);
+
+
+            // Add services to the container.
+
+            JwtSecurityTokenHandler.DefaultMapInboundClaims = false;
+            builder.Services.AddAuthentication(options => options.DefaultScheme = JwtBearerDefaults.AuthenticationScheme)
+                .AddJwtBearer(options => //AzureADJwtBearer
+                {
+                    //options.SaveToken = true; //驗證令牌由服務器生成才有效，不適用於服務重啟或分布式架構
+                    options.Authority ="https://login.chinacloudapi.cn/4807e9cf-87b8-4174-aa5b-e76497d7392b/v2.0";// builder.Configuration["Option:Authority"];
+                    options.Audience = "72643704-b2e7-4b26-b881-bd5865e7a7a5";//builder.Configuration["Option:Audience"];
+                    options.RequireHttpsMetadata = true;
+                    options.TokenValidationParameters = new TokenValidationParameters
+                    {
+                        RoleClaimType = "roles",
+                        //ValidAudiences = new string[] { builder.Configuration["Option:Audience"], $"api://{builder.Configuration["Option:Audience"]}" }
+                        ValidAudiences = new string[] { "72643704-b2e7-4b26-b881-bd5865e7a7a5", $"api://72643704-b2e7-4b26-b881-bd5865e7a7a5" }
+                    };
+                    options.Events = new JwtBearerEvents();
+                    //下列事件有需要紀錄則打開
+                    //options.Events.OnMessageReceived = async context => { await Task.FromResult(0); };
+                    //options.Events.OnForbidden = async context => { await Task.FromResult(0); };
+                    //options.Events.OnChallenge = async context => { await Task.FromResult(0); };
+                    //options.Events.OnAuthenticationFailed = async context => { await Task.FromResult(0); };
+                    options.Events.OnTokenValidated = async context =>
+                    {
+                        if (!context.Principal.Claims.Any(x => x.Type.Equals("http://schemas.microsoft.com/identity/claims/scope")) //ClaimConstants.Scope
+                        && !context.Principal.Claims.Any(y => y.Type.Equals("roles"))) //ClaimConstants.Roles //http://schemas.microsoft.com/ws/2008/06/identity/claims/role
+                        {
+                            //TODO 需處理額外授權非角色及範圍的訪問異常紀錄
+                            throw new UnauthorizedAccessException("Neither scope or roles claim was found in the bearer token.");
+                        }
+                        await Task.FromResult(0);
+                    };
+                });
+            builder.Services.AddControllers();
+#if DEBUG
+            builder.WebHost.UseUrls(new[] { "https://*:7298" });
+#endif
+            // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
+            builder.Services.AddEndpointsApiExplorer();
+            //builder.Services.AddSwaggerGen();
+            builder.Services.AddHttpClient();
+            string? StorageConnectionString = builder.Configuration.GetValue<string>("Azure:Storage:ConnectionString");
+            string? RedisConnectionString = builder.Configuration.GetValue<string>("Azure:Redis:ConnectionString");
+            string? CosmosConnectionString = builder.Configuration.GetValue<string>("Azure:Cosmos:ConnectionString");
+            //Storage
+            builder.Services.AddAzureStorage(StorageConnectionString, "Default");
+            //Redis
+            builder.Services.AddAzureRedis(RedisConnectionString, "Default");
+            //Cosmos
+            builder.Services.AddAzureCosmos(CosmosConnectionString, "Default");
+
+            //MQTT  服务端API 发送消息到MQTT客户端 https://www.cnblogs.com/weskynet/p/16441219.html
+            builder.Services.AddSignalR();
+            builder.Services.AddHttpContextAccessor();
+            builder.Services.AddHttpClient<DingDing>();
+            string path = $"{builder.Environment.ContentRootPath}/JsonFiles";
+            builder.Services.TryAddSingleton(new Region2LongitudeLatitudeTranslator(path));
+            builder.Services.AddIPSearcher(path);
+            builder.Services.AddCors(options =>
+            {
+                options.AddDefaultPolicy(
+                builder =>
+                {
+
+                    builder.AllowAnyOrigin()
+                            .AllowAnyHeader()
+                            .AllowAnyMethod();
+                });
+            });
+#if !DEBUG
+            builder.Services.AddHangfire(config => {
+                config.UseRedisStorage(builder.Configuration.GetValue<string>("Azure:Redis:ConnectionString"));
+            });
+            builder.Services.AddHangfireServer();
+#endif
+
+            builder.Services.AddControllersWithViews();
+
+            var app = builder.Build();
+
+            // Configure the HTTP request pipeline.
+            if (!app.Environment.IsDevelopment())
+            {
+                app.UseExceptionHandler("/Home/Error");
+                // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
+                app.UseHsts();
+            }
+
+            app.UseHttpsRedirection();
+            app.UseStaticFiles();
+
+            app.UseRouting();
+            app.UseCors(); //使用跨域設定
+            app.UseHttpsRedirection(); //開發中暫時關掉
+            app.UseAuthentication();
+            app.UseAuthorization();
+            //app.MapControllerRoute(
+            //    name: "default",
+            //    pattern: "{controller=Home}/{action=Index}/{id?}");
+            app.UseEndpoints(endpoints => {
+                endpoints.MapControllers();
+                endpoints.MapFallbackToFile("index.html");
+                endpoints.MapHub<SignalRScreenServerHub>("/signalr/screen").RequireCors("any");
+            });
+            app.Run();
+        }
+    }
+}

TEAMModelOS.Extension/HTEX.Complex/Properties/launchSettings.json

@@ -0,0 +1,52 @@
+{
+  "profiles": {
+    "http": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "launchUrl": "weatherforecast",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "dotnetRunMessages": true,
+      "applicationUrl": "http://localhost:5181"
+    },
+    "https": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "launchUrl": "weatherforecast",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "dotnetRunMessages": true,
+      "applicationUrl": "https://localhost:7121;http://localhost:5181"
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": false,
+      "launchUrl": "weatherforecast",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "Container (Dockerfile)": {
+      "commandName": "Docker",
+      "launchBrowser": false,
+      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/weatherforecast",
+      "environmentVariables": {
+        "ASPNETCORE_HTTPS_PORTS": "8081",
+        "ASPNETCORE_HTTP_PORTS": "8080"
+      },
+      "publishAllPorts": true,
+      "useSSL": true
+    }
+  },
+  "$schema": "http://json.schemastore.org/launchsettings.json",
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:37012",
+      "sslPort": 44329
+    }
+  }
+}

TEAMModelOS.Extension/HTEX.Complex/Services/SignalRScreenServerHub.cs

@@ -0,0 +1,188 @@
+using Grpc.Core;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.Azure.Cosmos.Linq;
+using Microsoft.Extensions.Primitives;
+using TEAMModelOS.SDK.DI;
+using TEAMModelOS.SDK.Extension;
+using TEAMModelOS.SDK;
+using System.Web;
+using System.Text;
+
+using StackExchange.Redis;
+namespace HTEX.Complex.Services
+{
+    public class SignalRScreenServerHub : Hub<IClient>
+    {
+
+        private readonly ILogger<SignalRScreenServerHub> _logger;
+        private readonly AzureRedisFactory _azureRedis;
+        public SignalRScreenServerHub(AzureRedisFactory azureRedis, ILogger<SignalRScreenServerHub> logger)
+        {
+            _logger = logger;
+            _azureRedis = azureRedis;
+        }
+
+        /// <summary>
+        /// 客户连接成功时触发
+        /// </summary>
+        /// <returns></returns>
+        public override async Task OnConnectedAsync()
+        {
+            var connid = Context.ConnectionId;
+            var httpContext = Context.GetHttpContext();
+            if (httpContext != null)
+            {
+                //wss://www.winteach.cn/signalr/notify?grant_type=wechat_qrcode&scene=0a75aca57536490ba00fe62e27bb8f6c&id=U2MNiCFNPPuVcw2gUI_gRA
+                //wss://www.winteach.cn/signalr/notify?grant_type=bookjs_api&clientid={clientid}&id=客户端自动生成的
+                httpContext.Request.Query.TryGetValue("grant_type", out StringValues grant_type);
+                httpContext.Request.Query.TryGetValue("clientid", out StringValues clientid);
+                httpContext.Request.Query.TryGetValue("device", out StringValues _device);
+
+                await Groups.AddToGroupAsync(connid, grant_type!);
+                if (!clientid.Equals(StringValues.Empty) && !grant_type.Equals(StringValues.Empty)) {
+
+                    ///连接配置，并且使用钉钉 通知。
+                    ///
+                    var client = new SignalRClient
+                    {
+                        connid = connid,
+                        grant_type = grant_type,
+                        clientid= clientid
+                    };
+                    await _azureRedis.GetRedisClient(8).HashSetAsync($"SignalRClient:connects", connid, client.ToJsonString());
+                    ClientDevice device = HttpUtility.UrlDecode(_device, Encoding.Unicode).ToObject<ClientDevice>();
+                    switch (true) 
+                    {
+                        case bool when grant_type.Equals(ScreenConstant.grant_type):
+                            ScreenClient screenClient ;
+                            var value = await _azureRedis.GetRedisClient(8).HashGetAsync($"ScreenApi:clients", client.clientid);
+                            if (value!=default  && value.HasValue)
+                            {
+                                screenClient = value.ToString().ToObject<ScreenClient>();
+                                
+                                // 这里不强制设置free ，因为如果是重连，可能正在执行任务，需要等待执行完成
+                                //screenClient.status="free";
+
+                                //先检查状态是否是在忙碌，在时间戳范围里，如果不在时间戳范围，强制free。
+                                if (!screenClient.status!.Equals(ScreenConstant.free) && screenClient.last_time  + screenClient.timeout+ screenClient.delay + ScreenConstant.time_excess < DateTimeOffset.UtcNow.ToUnixTimeMilliseconds())
+                                {
+                                    screenClient.status = ScreenConstant.free;
+                                }
+                            }
+                            else 
+                            {
+                                screenClient = new ScreenClient
+                                {
+                                    status = ScreenConstant.free,
+                                };
+                            }
+                            screenClient.connid=connid;
+                            screenClient.grant_type = grant_type;
+                            screenClient.clientid = clientid;
+                            screenClient.os = device.os;
+                            screenClient.port = device.port;
+                            screenClient.name = device.name;
+                            screenClient.region = device.region;
+                            screenClient.remote = device.remote;
+                            screenClient.networks = device.networks;
+                            screenClient.screenUrl = device.screenUrl;
+                            screenClient.delay = device.delay;
+                            screenClient.timeout = device.timeout;
+                            screenClient.last_time= DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
+                            //连接成功，发送消息给客户端。
+                            await SendConnection(connid, new ConnectionMessageContent
+                            {
+                                connid=connid,
+                                clientid = clientid,
+                                status = screenClient.status,
+                                grant_type = grant_type,
+                                message_type= MessageType.conn_success,
+                                content = $"连接成功"
+                            });
+                            _logger.LogInformation($"客户端连接成功=>{screenClient.name}，{clientid}：\n{screenClient.ToJsonString()}");
+                            if (screenClient.status!.Equals(ScreenConstant.free)) {
+                                _logger.LogInformation($"客户端当前空闲=>{screenClient.name}，{clientid},分发任务......");
+                                //连接成功，马上分发任务。
+                                //从尾部弹出元素，队列先进先出
+                                var queueValue = await _azureRedis.GetRedisClient(8).ListRightPopAsync("PDFGen:Queue");
+                                if (queueValue!=default && queueValue.HasValue)
+                                {
+                                    PDFGenQueue genQueue = queueValue.ToString().ToObject<PDFGenQueue>();
+                                    await SendMessage(connid, new ScreenProcessMessageContent
+                                    {
+                                        clientid = clientid,
+                                        status = ScreenConstant.busy,
+                                        grant_type = grant_type,
+                                        content =$"{queueValue.ToString()}",//从Redis中获取任务信息
+                                    });
+                                    screenClient.status =  ScreenConstant.busy;
+                                    screenClient.last_time = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
+                                }
+                                else {
+                                    _logger.LogInformation($"客户端当前空闲=>{screenClient.name}，{clientid},暂无任务可领取的任务......");
+                                  
+                                }
+                            }
+                            await _azureRedis.GetRedisClient(8).HashSetAsync($"ScreenApi:clients", client.clientid, screenClient.ToJsonString());
+                            break;
+                    }
+                }
+                else
+                {
+                    await SendConnection(connid, new ConnectionMessageContent
+                    {
+                        clientid = string.Empty,
+                        status =ScreenConstant.error,
+                        grant_type = grant_type,
+                        message_type= MessageType.conn_error,
+                        content = "客户端配置错误",
+                        connid = connid,
+                    });
+                }
+            }
+        }
+
+        public async override Task OnDisconnectedAsync(Exception? exception)
+        {
+            var connid = Context.ConnectionId;
+            var redisData = await _azureRedis.GetRedisClient(8).HashGetAsync($"SignalRClient:connects", connid);
+            _logger.LogInformation($"客户端断开连接=>{connid} ");
+            ///连接配置，并且使用钉钉 离线通知。
+            if (!redisData.IsNullOrEmpty)
+            {
+                var client = redisData.ToString().ToObject<SignalRClient>();
+                await _azureRedis.GetRedisClient(8).HashDeleteAsync($"SignalRClient:connects", connid);
+                if (client != null)
+                {
+                    await Groups.RemoveFromGroupAsync(connid, client.grant_type!);
+                    var value =  await _azureRedis.GetRedisClient(8).HashGetAsync($"ScreenApi:clients", client.clientid);
+                    if (value!=default  && value.HasValue) 
+                    {
+                        ScreenClient screenClient = value.ToString().ToObject<ScreenClient>() ;
+                        _logger.LogInformation($"客户端断开连接=>{connid}，{screenClient.name}，{screenClient.clientid} ");
+                        long now = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
+                        // 判断是否过期
+                        if (screenClient.status!.Equals(ScreenConstant.busy )  &&    screenClient.last_time+screenClient.timeout+screenClient.delay+ ScreenConstant.time_excess <=now)
+                        {
+                            screenClient.status=ScreenConstant.down;
+                            screenClient.connid= string.Empty;
+                            await _azureRedis.GetRedisClient(8).HashSetAsync($"ScreenApi:clients", client.clientid, screenClient.ToJsonString());
+                        }
+                    }
+                }
+            }
+        }
+        public async Task SendConnection(string connectionId, MessageBody msg)
+        {
+            await Clients.Client(connectionId).ReceiveConnection(msg);
+        }
+        public async Task SendMessage(string connectionId,  MessageBody msg)
+        {
+            await Clients.Client(connectionId).ReceiveMessage(msg);
+        }
+        public async Task SendDisConnection(string connectionId, MessageBody msg)
+        {
+            await Clients.Client(connectionId).ReceiveDisConnection(msg);
+        }
+    }
+}

TEAMModelOS.Extension/HTEX.Complex/appsettings.Development.json

@@ -0,0 +1,23 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "AllowedHosts": "*",
+  "Azure": {
+    "Storage": {
+      "ConnectionString": "DefaultEndpointsProtocol=https;AccountName=teammodeltest;AccountKey=O2W2vadCqexDxWO+px+QK7y1sHwsYj8f/WwKLdOdG5RwHgW/Dupz9dDUb4c1gi6ojzQaRpFUeAAmOu4N9E+37A==;EndpointSuffix=core.chinacloudapi.cn"
+    },
+    "ServiceBus": {
+      "ConnectionString": "Endpoint=sb://coreservicebuscn.servicebus.chinacloudapi.cn/;SharedAccessKeyName=TEAMModelOS;SharedAccessKey=xO8HcvXXuuEkuFI0KlV5uXs8o6vyuVqTR+ASbPGMhHo="
+    },
+    "Redis": {
+      "ConnectionString": "52.130.252.100:6379,password=habook,ssl=false,abortConnect=False,writeBuffer=10240"
+    },
+    "Cosmos": {
+      "ConnectionString": "AccountEndpoint=https://cdhabookdep-free.documents.azure.cn:443/;AccountKey=JTUVk92Gjsx17L0xqxn0X4wX2thDPMKiw4daeTyV1HzPb6JmBeHdtFY1MF1jdctW1ofgzqkDMFOtcqS46by31A==;"
+    }
+  }
+}

TEAMModelOS.Extension/HTEX.Complex/appsettings.json

@@ -0,0 +1,23 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "AllowedHosts": "*",
+  "Azure": {
+    "Storage": {
+      "ConnectionString": "DefaultEndpointsProtocol=https;AccountName=teammodelos;AccountKey=Dl04mfZ9hE9cdPVO1UtqTUQYN/kz/dD/p1nGvSq4tUu/4WhiKcNRVdY9tbe8620nPXo/RaXxs+1F9sVrWRo0bg==;EndpointSuffix=core.chinacloudapi.cn",
+    },
+    "ServiceBus": {
+      "ConnectionString": "Endpoint=sb://coreservicebuscn.servicebus.chinacloudapi.cn/;SharedAccessKeyName=TEAMModelOS;SharedAccessKey=xO8HcvXXuuEkuFI0KlV5uXs8o6vyuVqTR+ASbPGMhHo=",
+    },
+    "Redis": {
+      "ConnectionString": "CoreRedisCN.redis.cache.chinacloudapi.cn:6380,password=LyJWP1ORJdv+poXWofAF97lhCEQPg1wXWqvtzXGXQuE=,ssl=True,abortConnect=False",
+    },
+    "Cosmos": {
+      "ConnectionString": "AccountEndpoint=https://teammodelos.documents.azure.cn:443/;AccountKey=clF73GwPECfP1lKZTCvs8gLMMyCZig1HODFbhDUsarsAURO7TcOjVz6ZFfPqr1HzYrfjCXpMuVD5TlEG5bFGGg==;",
+    }
+  }
+}