udpate

CoceSdk/CoceController.cs

@@ -1,14 +1,16 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.DependencyInjection;
 using SimApi.Attributes;
-using SimApi.CoceSdk;
 using SimApi.Communications;
+using SimApi.Controllers;
 using SimApi.Helpers;
 
-namespace SimApi.Controllers;
+namespace SimApi.CoceSdk;
 
-public class SimApiCoceController(CoceApp coce,SimApiAuth auth) : SimApiBaseController
+public class CoceController(CoceApp coce, SimApiAuth auth, IServiceProvider sp) : SimApiBaseController
 {
     [HttpPost]
     public SimApiBaseResponse<ConfigResponse> GetConfig()
@@ -33,8 +35,9 @@ public class SimApiCoceController(CoceApp coce,SimApiAuth auth) : SimApiBaseCont
         {
             Id = data.UserId,
             Meta = meta,
-            Extra = groups
         };
+        var processor = sp.GetService<ICoceLoginProcessor>();
+        processor?.Process(loginItem, groups.ToArray());
         return new SimApiBaseResponse<string>(auth.Login(loginItem));
     }
 

CoceSdk/ICoceLoginProcessor.cs

@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+using SimApi.Communications;
+
+namespace SimApi.CoceSdk;
+
+public interface ICoceLoginProcessor
+{
+    SimApiLoginItem Process(SimApiLoginItem loginItem, GroupInfo[] groups);
+}

Communications/SimApiLoginItem.cs

@@ -7,8 +7,8 @@ namespace SimApi.Communications;
 /// </summary>
 public class SimApiLoginItem
 {
-    public string? Id { get; set; }
-    public string[] Type { get; set; } = new[] { "user" };
-    public Dictionary<string, string>? Meta { get; set; } = null;
-    public object? Extra { get; set; } = null;
+    public string Id { get; set; } = null!;
+    public string[] Type { get; set; } = ["user"];
+    public Dictionary<string, string> Meta { get; set; } = new();
+    public object? Extra { get; set; }
 };

Configurations/SimApiOptions.cs

@@ -10,13 +10,7 @@ public class SimApiOptions
     /// <summary>
     /// 是否启用后台任务系统 *基于Hangfire
     /// </summary>
-    public bool EnableJob { get; set; } = false;
-
-    /// <summary>
-    /// 启用全部Cors，对于开发前后分离的时候很有用。
-    /// default: true
-    /// </summary>
-    public bool EnableCors { get; set; } = true;
+    public bool EnableJob { get; set; }
 
     /// <summary>
     /// 启用SimApiAuth，一个简单的基于Header Token的认证方式。
@@ -24,13 +18,16 @@ public class SimApiOptions
     /// </summary>
     public bool EnableSimApiAuth { get; set; }
 
-
     /// <summary>
     /// 是否使用CoceSdk
     /// </summary>
     public bool EnableCoceSdk { get; set; }
 
-    public CoceAppSdkOption CoceSdkOptions { get; set; } = new();
+    /// <summary>
+    /// 开启S3兼容的存储系统。
+    /// default: false
+    /// </summary>
+    public bool EnableSimApiStorage { get; set; }
 
     /// <summary>
     /// 启用在线文档，启用后 访问 /swagger 可以查看对应的api文档。
@@ -38,6 +35,20 @@ public class SimApiOptions
     /// </summary>
     public bool EnableSimApiDoc { get; set; }
 
+    /// <summary>
+    /// 是否启用Synapse
+    /// </summary>
+    public bool EnableSynapse { get; set; }
+
+    /// <summary>
+    /// 启用全部Cors，对于开发前后分离的时候很有用。
+    /// default: true
+    /// </summary>
+    public bool EnableCors { get; set; } = true;
+
+
+    public CoceAppSdkOption CoceSdkOptions { get; set; } = new();
+
     /// <summary>
     /// 启用异常拦截,启用后，所有的异常将被通过json反馈。
     /// default: true
@@ -49,11 +60,6 @@ public class SimApiOptions
     /// </summary>
     public bool EnableSimApiResponseFilter { get; set; } = true;
 
-    /// <summary>
-    /// 开启S3兼容的存储系统。
-    /// default: false
-    /// </summary>
-    public bool EnableSimApiStorage { get; set; }
 
     /// <summary>
     /// 开启ForwardHeaders,开启后可以透传负载均衡的Headers
@@ -67,16 +73,13 @@ public class SimApiOptions
     /// </summary>
     public bool EnableLowerUrl { get; set; } = true;
 
+
     /// <summary>
     /// 启用格式化的 Console Logger
     /// default: false
     /// </summary>
-    public bool EnableLogger { get; set; }
+    public bool EnableLogger { get; set; } = true;
 
-    /// <summary>
-    /// 是否启用Synapse
-    /// </summary>
-    public bool EnableSynapse { get; set; }
 
     /// <summary>
     /// 配置Job

Helpers/SimApiAuth.cs

@@ -1,6 +1,4 @@
-#nullable enable
 using System;
-using System.Collections.Generic;
 using System.Text.Json;
 using Microsoft.Extensions.Caching.Distributed;
 using SimApi.Communications;
@@ -33,7 +31,7 @@ public class SimApiAuth(IDistributedCache cache)
     public SimApiLoginItem? GetLogin(string token)
     {
         var login = cache.GetString(token);
-        return login != null ? JsonSerializer.Deserialize<SimApiLoginItem>(login) : default;
+        return login != null ? JsonSerializer.Deserialize<SimApiLoginItem>(login) : null;
     }
 
     /// <summary>

Helpers/SimApiCache.cs

@@ -5,7 +5,7 @@ namespace SimApi.Helpers;
 
 public class SimApiCache(IDistributedCache cache)
 {
-    private const string Prefix = "SimApi:Cache";
+    private const string Prefix = "SimApi:Cache:";
 
     public void Set(string key, object value, DistributedCacheEntryOptions? options = null)
     {

Helpers/SimApiJobWebAuth.cs

@@ -14,7 +14,7 @@ public class SimApiJobWebAuth(string user, string pass) : IDashboardAuthorizatio
         var authHeader = httpContext.Request.Headers["Authorization"].FirstOrDefault();
         if (authHeader != null && authHeader.StartsWith("Basic "))
         {
-            var encodedUsernamePassword = authHeader.Split(' ', 2, StringSplitOptions.RemoveEmptyEntries)[1]?.Trim();
+            var encodedUsernamePassword = authHeader.Split(' ', 2, StringSplitOptions.RemoveEmptyEntries)[1].Trim();
             var decodedUsernamePassword = Encoding.UTF8.GetString(Convert.FromBase64String(encodedUsernamePassword));
             var username = decodedUsernamePassword.Split(':', 2)[0];
             var password = decodedUsernamePassword.Split(':', 2)[1];

Helpers/SimApiUtil.cs

@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
@@ -7,6 +8,7 @@ using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Text.RegularExpressions;
 using System.Text.Unicode;
+using System.Xml.Serialization;
 
 namespace SimApi.Helpers;
 
@@ -22,6 +24,7 @@ public static class SimApiUtil
     /// </summary>
     public static JsonSerializerOptions JsonOption => new()
     {
+        ReferenceHandler = ReferenceHandler.Preserve,
         Encoder = JavaScriptEncoder.Create(UnicodeRanges.All),
         PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
         DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
@@ -62,12 +65,43 @@ public static class SimApiUtil
         return stringBuilder.ToString();
     }
 
+    /// <summary>
+    /// sha1加密字符串
+    /// </summary>
+    /// <param name="source">源字符串</param>
+    /// <param name="mode">加密结果"x2"结果为32位,"x3"结果为48位,"x4"结果为64位</param>
+    /// <returns></returns>
+    public static string Sha1(string source, string mode = "x2")
+    {
+        var hash = SHA1.HashData(Encoding.UTF8.GetBytes(source));
+        var sb = new StringBuilder(hash.Length * 2);
+        foreach (var b in hash)
+        {
+            sb.Append(b.ToString(mode));
+        }
+
+        return sb.ToString();
+    }
+
+    /// <summary>
+    /// 将XML字符串序列化为对象
+    /// </summary>
+    /// <param name="source"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public static T XmlDeserialize<T>(string source)
+    {
+        var xmlConvertor = new XmlSerializer(typeof(T));
+        using var reader = new StringReader(source);
+        return (T)xmlConvertor.Deserialize(reader)!;
+    }
+
     /// <summary>
     /// 将对象序列化成JSON （控制台输出中文不会被编码）
     /// </summary>
     /// <param name="obj"></param>
     /// <returns></returns>
-    public static string Json(object obj)
+    public static string Json(object? obj)
     {
         return JsonSerializer.Serialize(obj, JsonOption);
     }

SimApi.csproj

@@ -23,14 +23,14 @@
         <Folder Include="Exceptions\"/>
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Hangfire.AspNetCore" Version="1.8.17" />
+        <PackageReference Include="Hangfire.AspNetCore" Version="1.8.18" />
         <PackageReference Include="Hangfire.Console" Version="1.4.3" />
-        <PackageReference Include="Hangfire.Redis.StackExchange" Version="1.9.4" />
-        <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.1" />
+        <PackageReference Include="Hangfire.Redis.StackExchange" Version="1.12.0" />
+        <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.5" />
         <PackageReference Include="Minio" Version="6.0.4" />
         <PackageReference Include="MQTTnet" Version="5.0.1.1416" />
-        <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="7.2.0" />
-        <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="7.2.0" />
+        <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="8.1.1" />
+        <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="8.1.1" />
     </ItemGroup>
     <ProjectExtensions>
         <MonoDevelop>

SimApiExtensions.cs

@@ -3,6 +3,7 @@ using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
 using System.Text.Json;
+using System.Text.Json.Serialization;
 using Hangfire;
 using Hangfire.Console;
 using Hangfire.Redis.StackExchange;
@@ -246,7 +247,12 @@ public static class SimApiExtensions
         if (simApiOptions.EnableSimApiResponseFilter)
         {
             builder.AddControllers(opt => opt.Filters.Add<SimApiResponseFilter>())
-                .AddJsonOptions(opt => opt.JsonSerializerOptions.PropertyNamingPolicy = JsonNamingPolicy.CamelCase);
+                .AddXmlSerializerFormatters()
+                .AddJsonOptions(opt =>
+                {
+                    opt.JsonSerializerOptions.PropertyNamingPolicy = JsonNamingPolicy.CamelCase;
+                    opt.JsonSerializerOptions.ReferenceHandler = ReferenceHandler.Preserve;
+                });
         }
 
         builder.AddSingleton(simApiOptions);
@@ -319,6 +325,7 @@ public static class SimApiExtensions
         if (options.EnableSimApiResponseFilter)
         {
             logger.LogInformation("开始配置SimApiResponseFilter...");
+            builder.MapControllers();
         }
 
         if (options.EnableSimApiAuth)
@@ -326,22 +333,46 @@ public static class SimApiExtensions
             logger.LogInformation("开始配置SimApiAuth...");
             builder.UseMiddleware<SimApiAuthMiddleware>();
             builder.MapControllerRoute(name: "GetUserInfo", pattern: "/user/info",
-                defaults: new { controller = "SimApiCommon", action = "UserInfo" });
+                defaults: new
+                {
+                    controller = "SimApiCommon",
+                    action = "UserInfo"
+                });
             builder.MapControllerRoute(name: "CheckLogin", pattern: "/auth/check",
-                defaults: new { controller = "SimApiCommon", action = "CheckLogin" });
+                defaults: new
+                {
+                    controller = "SimApiCommon",
+                    action = "CheckLogin"
+                });
             builder.MapControllerRoute(name: "Logout", pattern: "/auth/logout",
-                defaults: new { controller = "SimApiCommon", action = "Logout" });
+                defaults: new
+                {
+                    controller = "SimApiCommon",
+                    action = "Logout"
+                });
             if (options.EnableCoceSdk)
             {
                 logger.LogInformation("开始配置CoceAppSdk...\nApi入口: {ApiUrl}\nAuth入口:{AuthUrl}n\nAppId: {AppId}",
                     options.CoceSdkOptions.ApiEndpoint, options.CoceSdkOptions.AuthEndpoint,
                     options.CoceSdkOptions.AppId);
                 builder.MapControllerRoute(name: "LoginUseCoce", pattern: "/auth/login",
-                    defaults: new { controller = "SimApiCoce", action = "Login" });
+                    defaults: new
+                    {
+                        controller = "Coce",
+                        action = "Login"
+                    });
                 builder.MapControllerRoute(name: "LoginUseCoce", pattern: "/user/groups",
-                    defaults: new { controller = "SimApiCoce", action = "ListGroups" });
+                    defaults: new
+                    {
+                        controller = "Coce",
+                        action = "ListGroups"
+                    });
                 builder.MapControllerRoute(name: "LoginUseCoce", pattern: "/auth/config",
-                    defaults: new { controller = "SimApiCoce", action = "GetConfig" });
+                    defaults: new
+                    {
+                        controller = "Coce",
+                        action = "GetConfig"
+                    });
             }
         }