混元AI 和 豆包AI 共同修改处合并

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -1909,7 +1909,7 @@ namespace OASystem.API.Controllers
         /// <returns></returns>
         [HttpPost]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> GroupJuHeAPITest(int userId,int groupId)
+        public async Task<IActionResult> GroupJuHeAPITest(int userId, int groupId)
         {
 
             //添加默认币种
@@ -24520,9 +24520,35 @@ end as 'country'
                         if (visa.Any())
                         {
                             var visainfo = _sqlSugar.Queryable<Res_VisaFeeStandardDetails>()
+                            .LeftJoin<Res_VisaFeeStandard>((x, y) => x.ParentId == y.Id && y.IsDel == 0)
                             .Where(x => x.IsDel == 0 && visa.Select(x => x.Id).Contains(x.ParentId))
+                            .Select((x, y) => new
+                            {
+                                x.Id,
+                                x.ParentId,
+                                x.ProvinceId,
+                                x.VisaAddress,
+                                x.IsVisaOnArrival,
+                                x.IsElectronicSign,
+                                x.VisaTime,
+                                x.IsVisaExemptionLarge,
+                                x.LargeVisaPrice,
+                                x.LargeAgencyFee,
+                                x.IsVisaExemptionSmall,
+                                x.SmallVisaPrice,
+                                x.SmallAgencyFee,
+                                x.NormExtFee,
+                                x.UrgExtFee,
+                                x.IsUrgent,
+                                x.UrgentTime,
+                                x.UrgentPrice,
+                                x.UrgentPriceDesc,
+                                y.FeeType,
+                                x.Remark
+                            })
                             .ToList();
-                            var visaMain = visainfo.FirstOrDefault(x => x.ProvinceId == diparent.Id);
+
+                            var visaMain = visainfo.FirstOrDefault(x => x.ProvinceId == diparent.Id && x.FeeType == 0);
                             var visayinsiValue = visainfo.FirstOrDefault(x => x.ParentId == visa.FirstOrDefault(x => x.FeeType == 1)?.Id);
                             visaCountryInfoArr.Add(new
                             {

OASystem/OASystem.Api/Controllers/TaskController.cs

@@ -9,6 +9,7 @@ using OASystem.Domain.Entities.WorkOrder;
 using OASystem.Domain.ViewModels.JuHeExchangeRate;
 using OASystem.API.OAMethodLib.QiYeWeChatAPI.AppNotice;
 using Dm.util;
+using OASystem.API.OAMethodLib.DoubaoAPI;
 
 namespace OASystem.API.Controllers
 {
@@ -21,9 +22,11 @@ namespace OASystem.API.Controllers
     {
 
         readonly SqlSugarClient _sqlsugar;
-        public TaskController(SqlSugarClient sqlsugar)
+        readonly IDoubaoService _doubaoService;
+        public TaskController(SqlSugarClient sqlsugar, IDoubaoService doubaoService)
         {
             _sqlsugar = sqlsugar;
+            _doubaoService = doubaoService;
         }
 
         /// <summary>
@@ -1090,5 +1093,28 @@ namespace OASystem.API.Controllers
             return Ok(jw);
         }
 
+
+        [HttpPost]
+        public async Task<IActionResult> TestDoubao(string messages)
+        {
+            var jw = JsonView(false);
+            var result = await _doubaoService.CompleteChatAsync
+            (
+                new List<DouBaoChatMessage>()
+                {
+                     new DouBaoChatMessage() { Role = DouBaoRole.system, Content = "你是一个专业的AI助手，请根据用户的问题给出回答" },
+                     new DouBaoChatMessage() { Role = DouBaoRole.user, Content = messages }
+                },
+                new CompleteChatOptions() { 
+                    ThinkingOptions = new thinkingOptions() 
+                     { IsThinking = true, ReasoningEffort = ReasoningEffort.High }
+                 }
+            );
+
+            jw.Code = 200;
+            jw.Msg = "SUCCESS!";
+            jw.Data = result;
+            return Ok(jw);
+        }
     }
 }

OASystem/OASystem.Api/OAMethodLib/AutofacRegister.cs

@@ -1,4 +1,4 @@
-using Autofac;
+using Autofac;
 using OASystem.API.OAMethodLib.DeepSeekAPI;
 using OASystem.Domain.Dtos.Business;
 using OASystem.Domain.Dtos.Groups;
@@ -28,22 +28,31 @@ namespace OASystem.API.OAMethodLib
             #endregion
 
             builder.RegisterInstance(AppSettingsHelper.GetSection("KiMiSetting").Get<KiMiSetting>() ?? new KiMiSetting
-                 {
-                    BaseUrl = AppSettingsHelper.Get("KiMiSetting:BaseUrl"),
-                    Key = AppSettingsHelper.Get("KiMiSetting:Key"),
-                    Model = AppSettingsHelper.Get("KiMiSetting:Model")
-                 })
+            {
+                BaseUrl = AppSettingsHelper.Get("KiMiSetting:BaseUrl"),
+                Key = AppSettingsHelper.Get("KiMiSetting:Key"),
+                Model = AppSettingsHelper.Get("KiMiSetting:Model")
+            })
                  .As<KiMiSetting>()
                  .SingleInstance();
 
             builder.RegisterInstance(AppSettingsHelper.GetSection("DeepSeek").Get<DeepSeek>() ?? new DeepSeek
-                {
-                    BaseAddress = AppSettingsHelper.Get("DeepSeek:BaseAddress"),
-                    ApiKey = AppSettingsHelper.Get("DeepSeek:ApiKey")
-                })
+            {
+                BaseAddress = AppSettingsHelper.Get("DeepSeek:BaseAddress"),
+                ApiKey = AppSettingsHelper.Get("DeepSeek:ApiKey")
+            })
                 .As<DeepSeek>()
                 .SingleInstance();
 
+            builder.RegisterInstance(AppSettingsHelper.GetSection("DouBao").Get<DoubaoAPI.DoubaoSetting>() ?? new DoubaoAPI.DoubaoSetting
+            {
+                BaseAddress = AppSettingsHelper.Get("DouBao:BaseAddress"),
+                ApiKey = AppSettingsHelper.Get("DouBao:ApiKey"),
+                EndpointId = AppSettingsHelper.Get("DouBao:endpointId")
+            })
+                .As<DoubaoAPI.DoubaoSetting>()
+                .SingleInstance();
+
             #region 团组结束通知短信
             DeleReminderConfig _deleReminderConfig = new DeleReminderConfig();
             _deleReminderConfig.Test = AppSettingsHelper.Get(DeleReminderConfig.KEY, "Test");

OASystem/OASystem.Api/OAMethodLib/DoubaoAPI/DoubaoService.cs

@@ -0,0 +1,66 @@
+using Newtonsoft.Json;
+using System.Net.Http.Headers;
+using System.Text;
+
+namespace OASystem.API.OAMethodLib.DoubaoAPI
+{
+    public class DoubaoService : IDoubaoService
+    {
+        private readonly IHttpClientFactory _httpClientFactory;
+        private readonly DoubaoSetting _doubaoSetting;
+        private readonly ILogger<DoubaoService> _logger;
+
+        public DoubaoService(IHttpClientFactory httpClientFactory, DoubaoSetting doubaoSetting, ILogger<DoubaoService> logger)
+        {
+            _httpClientFactory = httpClientFactory;
+            _doubaoSetting = doubaoSetting;
+            _logger = logger;
+        }
+
+        public async Task<string> CompleteChatAsync(List<DouBaoChatMessage> messages, CompleteChatOptions? options)
+        {
+
+            if (messages == null || !messages.Any())
+            {
+                _logger.LogError("消息不能为空  " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+                return null;
+            }
+
+            if(!messages.Any(x => x.Role == DouBaoRole.system)){
+                messages.Insert(0, 
+                new DouBaoChatMessage() { 
+                    Role = DouBaoRole.system, Content = "你是一个专业的AI助手，请根据用户的问题给出回答" 
+                });
+            }
+
+            options ??= new CompleteChatOptions();
+            var httpClient = _httpClientFactory.CreateClient("Doubao");
+            httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", _doubaoSetting.ApiKey);
+
+            var body = new Dictionary<string, object>
+            {
+                ["model"] = _doubaoSetting.EndpointId,
+                ["messages"] = messages.Select(x => new { role = x.Role.ToString(), content = x.Content }).ToArray()
+            };
+
+            if (options.ThinkingOptions.IsThinking)
+            {
+                body["reasoning_effort"] = options.ThinkingOptions.ReasoningEffort.ToString().ToLower();
+                body["thinking"] = new {
+                    type = "enabled",
+                };
+            }
+
+            var json = JsonConvert.SerializeObject(body);
+            var response = await httpClient.PostAsync(
+                _doubaoSetting.BaseAddress,
+                new StringContent(json, Encoding.UTF8, "application/json")
+            );
+
+            response.EnsureSuccessStatusCode();
+            var responseContent = await response.Content.ReadAsStringAsync();
+            var doubaoResponse = JsonConvert.DeserializeObject<DoubaoResponse>(responseContent);
+            return doubaoResponse.choices[0].message.content;
+        }
+    }
+}

OASystem/OASystem.Api/OAMethodLib/DoubaoAPI/DoubaoSetting.cs

@@ -0,0 +1,9 @@
+namespace OASystem.API.OAMethodLib.DoubaoAPI
+{
+    public class DoubaoSetting
+    {
+        public string BaseAddress { get; set; }
+        public string ApiKey { get; set; }
+        public string EndpointId { get; set; }
+    }
+}

OASystem/OASystem.Api/OAMethodLib/DoubaoAPI/IDoubaoService.cs

@@ -0,0 +1,87 @@
+namespace OASystem.API.OAMethodLib.DoubaoAPI
+{
+    public enum ReasoningEffort
+    {
+        Minimal,
+        Low,
+        Medium,
+        High
+    }
+
+    public class DouBaoChatMessage
+    {
+        public DouBaoRole Role { get; set; }
+        public string Content { get; set; }
+    }
+
+    public enum DouBaoRole
+    {
+        system,
+        user,
+        assistant
+    }
+
+    public class CompleteChatOptions
+    {
+        public thinkingOptions ThinkingOptions { get; set; } = new thinkingOptions()
+        {
+            IsThinking = false,
+            ReasoningEffort = ReasoningEffort.Minimal
+        };
+    }
+
+
+    public class thinkingOptions
+    {
+        public bool IsThinking { get; set; } = false;
+        public ReasoningEffort ReasoningEffort { get; set; } = ReasoningEffort.Minimal;
+    }
+
+    public class DoubaoResponse
+    {
+        public string id { get; set; }
+        public string @object { get; set; }
+        public long created { get; set; }
+        public string model { get; set; }
+        public string service_tier { get; set; }
+        public List<Choice> choices { get; set; }
+        public Usage usage { get; set; }
+    }
+
+    public class Choice
+    {
+        public int index { get; set; }
+        public string finish_reason { get; set; }
+        public object logprobs { get; set; }  // 可以是 null 或者详细概率结构
+        public Message message { get; set; }
+    }
+
+    public class Message
+    {
+        public string role { get; set; }
+        public string content { get; set; }
+        public string reasoning_content { get; set; } // 豆包特有字段
+    }
+
+    public class Usage
+    {
+        public int completion_tokens { get; set; }
+        public int prompt_tokens { get; set; }
+        public int total_tokens { get; set; }
+        public TokenDetails prompt_tokens_details { get; set; }
+        public TokenDetails completion_tokens_details { get; set; }
+    }
+
+    public class TokenDetails
+    {
+        public int reasoning_tokens { get; set; }
+    }
+    
+
+    public interface IDoubaoService
+    {
+        Task<string> CompleteChatAsync(List<DouBaoChatMessage> messages, CompleteChatOptions? options = null);
+    }
+
+    
+}

OASystem/OASystem.Api/Program.cs

@@ -33,7 +33,7 @@ Console.Title = $"FMGJ OASystem Server";
 var builder = WebApplication.CreateBuilder(args);
 var basePath = AppContext.BaseDirectory;
 
-//引入配置文件
+//寮曞叆閰嶇疆鏂囦欢
 var _config = new ConfigurationBuilder()
                  .SetBasePath(basePath)
                  .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
@@ -42,10 +42,10 @@ var _config = new ConfigurationBuilder()
                  .Build();
 builder.Services.AddSingleton(new AppSettingsHelper(_config));
 
-//设置请求参数可不填
+//设置请求参数可不填
 builder.Services.AddControllers(options => options.SuppressImplicitRequiredAttributeForNonNullableReferenceTypes = true);
 
-//设置请求参数错误默认返回格式
+//璁剧疆璇锋眰鍙傛暟閿欒�榛樿�杩斿洖鏍煎紡
 builder.Services.AddControllers()
     .ConfigureApiBehaviorOptions(options =>
     {
@@ -74,26 +74,26 @@ builder.Services.AddControllersWithViews();
 builder.Services.AddControllers()
     .AddJsonOptions(options =>
     {
-        //空字段不响应Response
+        //绌哄瓧娈典笉鍝嶅簲Response
         //options.JsonSerializerOptions.DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull;
 
         options.JsonSerializerOptions.Converters.Add(new NullJsonConverter());
 
-        //时间格式化响应
+        //时间格式化响应
         options.JsonSerializerOptions.Converters.Add(new DateTimeJsonConverter("yyyy-MM-dd HH:mm:ss"));
 
-        //decimal 四位小数
-        //options.JsonSerializerOptions.Converters.Add(new DecimalConverter(_decimalPlaces)); // 将保留小数位数参数传递给自定义序列化器
+        //decimal 鍥涗綅灏忔暟
+        //options.JsonSerializerOptions.Converters.Add(new DecimalConverter(_decimalPlaces)); // 将保留小数位数参数传递给自定义序列化器
     });
 
 builder.Services.TryAddSingleton<IHttpContextAccessor, HttpContextAccessor>();
 
-#region 添加限流中间件服务注册
+#region 添加限流中间件服务注册
 
-// 添加内存缓存（限流需要）
+// 娣诲姞鍐呭瓨缂撳瓨锛堥檺娴侀渶瑕侊級
 builder.Services.AddMemoryCache();
 
-// 配置限流设置
+// 閰嶇疆闄愭祦璁剧疆
 builder.Services.Configure<RateLimitConfig>(
     builder.Configuration.GetSection("RateLimiting"));
 #endregion
@@ -125,14 +125,14 @@ builder.Services.AddCors(policy =>
     policy.AddPolicy("Cors", opt => opt
             .SetIsOriginAllowed(origin =>
             {
-                // 定义允许的来源列表
+                // 定义允许的来源列表
                 var allowedOrigins = new List<string>
                     {
                        "http://132.232.92.186:9002"
 
                     };
 
-                // 检查请求的来源是否在允许的列表中
+                // 检查请求的来源是否在允许的列表中
                 return allowedOrigins.Contains(origin);
             })
 
@@ -144,7 +144,7 @@ builder.Services.AddCors(policy =>
 });
 #endregion
 
-#region 上传文件 
+#region 涓婁紶鏂囦欢 
 builder.Services.AddCors(policy =>
 {
     policy.AddPolicy("Cors", opt => opt
@@ -170,15 +170,15 @@ builder.Services.Configure<KestrelServerOptions>(options =>
 
 #endregion
 
-#region 接口分组
+#region 鎺ュ彛鍒嗙粍
 var groups = new List<Tuple<string, string>>
 {
-    //new Tuple<string, string>("Group1","分组一"),
-    //new Tuple<string, string>("Group2","分组二")
+    //new Tuple<string, string>("Group1","鍒嗙粍涓€"),
+    //new Tuple<string, string>("Group2","分组二")
 };
 #endregion
 
-#region 注入数据库
+#region 注入数据库
 
 #region old
 
@@ -201,38 +201,38 @@ builder.Services.AddScoped(options =>
     }
     , db =>
     {
-        // SQL执行完
+        // SQL执行完
         db.Aop.OnLogExecuted = (sql, pars) =>
         {
-            // 超过1秒
+            // 超过1秒
             if (db.Ado.SqlExecutionTime.TotalSeconds > 1)
             {
                 var FirstMethodName = db.Ado.SqlStackTrace.FirstMethodName;
-                //执行完了可以输出SQL执行时间 (OnLogExecutedDelegate) 
+                //鎵ц�瀹屼簡鍙�互杈撳嚭SQL鎵ц�鏃堕棿 (OnLogExecutedDelegate) 
                 Console.WriteLine("NowTime:" + DateTime.UtcNow.ToString("yyyy-MM-dd HH:mm:ss"));
                 Console.WriteLine("MethodName:" + FirstMethodName);
                 Console.WriteLine("ElapsedTime:" + db.Ado.SqlExecutionTime.ToString());
                 Console.WriteLine("ExecuteSQL:" + sql);
             }
         };
-        //SQL执行前
+        //SQL执行前
         db.Aop.OnLogExecuting = (sql, pars) =>
         {
         };
-        //SQL报错
+        //SQL鎶ラ敊
         db.Aop.OnError = (exp) =>
         {
-            //获取原生SQL推荐 5.1.4.63  性能OK
+            //鑾峰彇鍘熺敓SQL鎺ㄨ崘 5.1.4.63  鎬ц兘OK
             //UtilMethods.GetNativeSql(exp.Sql, exp.Parametres);
-            //获取无参数SQL对性能有影响，特别大的SQL参数多的，调试使用
+            //获取无参数SQL对性能有影响，特别大的SQL参数多的，调试使用
             //UtilMethods.GetSqlString(DbType.SqlServer, exp.sql, exp.parameters);
 
         };
-        //修改SQL和参数的值
+        //修改SQL和参数的值
         db.Aop.OnExecutingChangeSql = (sql, pars) =>
         {
             //sql=newsql
-            //foreach(var p in pars) //修改
+            //foreach(var p in pars) //淇�敼
             return new KeyValuePair<string, SugarParameter[]>(sql, pars);
         };
     }
@@ -243,27 +243,27 @@ builder.Services.AddScoped(options =>
 
 #endregion
 
-//#region Identity 配置
+//#region Identity 閰嶇疆
 //builder.Services.AddDataProtection();
-////不要用 AddIdentity ， AddIdentity 是于MVC框架中的
+////不要用 AddIdentity ， AddIdentity 是于MVC框架中的
 //builder.Services.AddIdentityCore<User>(opt =>
 //{
-//    opt.Password.RequireDigit = false; //数字
-//    opt.Password.RequireLowercase = false;//小写字母
-//    opt.Password.RequireNonAlphanumeric = false;//特殊符号 例如 ￥#@！ 
-//    opt.Password.RequireUppercase = false; //大写字母
-//    opt.Password.RequiredLength = 6;//密码长度 6 
-//    opt.Password.RequiredUniqueChars = 1;//相同字符可以出现几次
-//    opt.Lockout.MaxFailedAccessAttempts = 5; //允许最多输入五次用户名/密码错误
-//    opt.Lockout.DefaultLockoutTimeSpan = new TimeSpan(0, 5, 0);//锁定五分钟
-//    opt.Tokens.PasswordResetTokenProvider = TokenOptions.DefaultEmailProvider; // 修改密码使用邮件【验证码模式】
+//    opt.Password.RequireDigit = false; //鏁板瓧
+//    opt.Password.RequireLowercase = false;//灏忓啓瀛楁瘝
+//    opt.Password.RequireNonAlphanumeric = false;//特殊符号 例如 ￥#@！ 
+//    opt.Password.RequireUppercase = false; //澶у啓瀛楁瘝
+//    opt.Password.RequiredLength = 6;//瀵嗙爜闀垮害 6 
+//    opt.Password.RequiredUniqueChars = 1;//鐩稿悓瀛楃�鍙�互鍑虹幇鍑犳�
+//    opt.Lockout.MaxFailedAccessAttempts = 5; //鍏佽�鏈€澶氳緭鍏ヤ簲娆＄敤鎴峰悕/瀵嗙爜閿欒�
+//    opt.Lockout.DefaultLockoutTimeSpan = new TimeSpan(0, 5, 0);//锁定五分钟
+//    opt.Tokens.PasswordResetTokenProvider = TokenOptions.DefaultEmailProvider; // 修改密码使用邮件【验证码模式】
 //    opt.Tokens.EmailConfirmationTokenProvider = TokenOptions.DefaultEmailProvider;  //// 
 //});
 //var idBuilder = new IdentityBuilder(typeof(User), typeof(UserRole), services);
 //idBuilder.AddEntityFrameworkStores<swapDbContext>().AddDefaultTokenProviders().AddRoleManager<RoleManager<UserRole>>().AddUserManager<UserManager<User>>();
 //#endregion
 
-#region 注入Swagger注释(启用)
+#region 娉ㄥ叆Swagger娉ㄩ噴(鍚�敤)
 
 if (AppSettingsHelper.Get("UseSwagger").ToBool())
 {
@@ -273,11 +273,11 @@ if (AppSettingsHelper.Get("UseSwagger").ToBool())
         {
             Version = "v1",
             Title = "Api",
-            Description = "Api接口文档"
+            Description = "Api鎺ュ彛鏂囨。"
         });
         foreach (var item in groups)
         {
-            a.SwaggerDoc(item.Item1, new OpenApiInfo { Version = item.Item1, Title = item.Item2, Description = $"{item.Item2}接口文档" });
+            a.SwaggerDoc(item.Item1, new OpenApiInfo { Version = item.Item1, Title = item.Item2, Description = $"{item.Item2}鎺ュ彛鏂囨。" });
         }
         a.DocumentFilter<SwaggerApi>();
         a.IncludeXmlComments(Path.Combine(basePath, "OASystem.Api.xml"), true);
@@ -306,7 +306,7 @@ if (AppSettingsHelper.Get("UseSwagger").ToBool())
 }
 #endregion
 
-#region 添加校验
+#region 娣诲姞鏍￠獙
 
 builder.Services.AddTransient<OASystemAuthentication>();
 builder.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
@@ -321,7 +321,7 @@ builder.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
                 ValidAudience = "OASystem.com",
                 ValidIssuer = "OASystem.com",
                 IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(_config["JwtSecurityKey"])),
-                ClockSkew = TimeSpan.FromSeconds(30), //过期时间容错值，解决服务器端时间不同步问题（秒）
+                ClockSkew = TimeSpan.FromSeconds(30), //杩囨湡鏃堕棿瀹归敊鍊硷紝瑙ｅ喅鏈嶅姟鍣ㄧ�鏃堕棿涓嶅悓姝ラ棶棰橈紙绉掞級
                 RequireExpirationTime = true,
             };
             options.Events = new JwtBearerEvents
@@ -329,7 +329,7 @@ builder.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
                 OnMessageReceived = context =>
                 {
                     var path = context.HttpContext.Request.Path;
-                    //如果是signalr请求，需要将token转存，否则JWT获取不到token。OPTIONS请求需要过滤到，因为OPTIONS请求获取不到Token，用NGINX过滤掉OPTION请求.
+                    //濡傛灉鏄痵ignalr璇锋眰锛岄渶瑕佸皢token杞�瓨锛屽惁鍒橨WT鑾峰彇涓嶅埌token銆侽PTIONS璇锋眰闇€瑕佽繃婊ゅ埌锛屽洜涓篛PTIONS璇锋眰鑾峰彇涓嶅埌Token锛岀敤NGINX杩囨护鎺塐PTION璇锋眰.
                     if (path.StartsWithSegments("/ChatHub"))
                     {
                         string accessToken = context.Request.Query["access_token"].ToString();
@@ -346,10 +346,10 @@ builder.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
 
 #endregion
 
-#region 初始化日志
+#region 初始化日志
 var environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT");
 Log.Logger = new LoggerConfiguration()
-        //不记录定时访问API
+        //涓嶈�褰曞畾鏃惰�闂瓵PI
         .Filter.ByIncludingOnly(logEvent =>
         {
             if (logEvent.Properties.TryGetValue("RequestPath", out var pathValue))
@@ -369,20 +369,20 @@ Log.Logger = new LoggerConfiguration()
 
 // 
 
-#region 出入境费用明细 专用记录器
+#region 出入境费用明细 专用记录器
 
-// 指定磁盘绝对路径（示例：D盘的AppLogs文件夹）
+// 鎸囧畾纾佺洏缁濆�璺�緞锛堢ず渚嬶細D鐩樼殑AppLogs鏂囦欢澶癸級
 var logDirectory = @"D:\OASystem\Logs\EnterExitCost";
 
-// 自动创建目录（如果不存在）
+// 自动创建目录（如果不存在）
 try
 {
     Directory.CreateDirectory(logDirectory);
-    Log.Information($"日志目录已创建/确认存在: {logDirectory}");
+    Log.Information($"日志目录已创建/确认存在: {logDirectory}");
 }
 catch (Exception ex)
 {
-    Log.Fatal($"无法创建日志目录 {logDirectory}: {ex.Message}");
+    Log.Fatal($"鏃犳硶鍒涘缓鏃ュ織鐩�綍 {logDirectory}: {ex.Message}");
     throw;
 }
 
@@ -393,20 +393,20 @@ var eec_TextLogger = new LoggerConfiguration()
 
 #endregion
 
-#region 团组步骤操作 专用记录器
+#region 团组步骤操作 专用记录器
 
-// 指定磁盘绝对路径（示例：D盘的AppLogs文件夹）
+// 鎸囧畾纾佺洏缁濆�璺�緞锛堢ず渚嬶細D鐩樼殑AppLogs鏂囦欢澶癸級
 var groupLogDir = @"D:\OASystem\Logs\GroupStepOP";
 
-// 自动创建目录（如果不存在）
+// 自动创建目录（如果不存在）
 try
 {
     Directory.CreateDirectory(groupLogDir);
-    Log.Information($"日志目录已创建/确认存在: {groupLogDir}");
+    Log.Information($"日志目录已创建/确认存在: {groupLogDir}");
 }
 catch (Exception ex)
 {
-    Log.Fatal($"无法创建日志目录 {groupLogDir}: {ex.Message}");
+    Log.Fatal($"鏃犳硶鍒涘缓鏃ュ織鐩�綍 {groupLogDir}: {ex.Message}");
     throw;
 }
 
@@ -417,20 +417,20 @@ var groupStepOP_TextLogger = new LoggerConfiguration()
 
 #endregion
 
-#region 任务分配操作 专用记录器
+#region 任务分配操作 专用记录器
 
-// 指定磁盘绝对路径（示例：D盘的AppLogs文件夹）
+// 鎸囧畾纾佺洏缁濆�璺�緞锛堢ず渚嬶細D鐩樼殑AppLogs鏂囦欢澶癸級
 var taskLogDir = @"D:\OASystem\Logs\TaskAllocation";
 
-// 自动创建目录（如果不存在）
+// 自动创建目录（如果不存在）
 try
 {
     Directory.CreateDirectory(taskLogDir);
-    Log.Information($"日志目录已创建/确认存在: {taskLogDir}");
+    Log.Information($"日志目录已创建/确认存在: {taskLogDir}");
 }
 catch (Exception ex)
 {
-    Log.Fatal($"无法创建日志目录 {taskLogDir}: {ex.Message}");
+    Log.Fatal($"鏃犳硶鍒涘缓鏃ュ織鐩�綍 {taskLogDir}: {ex.Message}");
     throw;
 }
 
@@ -441,7 +441,7 @@ var task_TextLogger = new LoggerConfiguration()
 
 #endregion
 
-// 配置Serilog为Log;
+// 閰嶇疆Serilog涓篖og;
 builder.Host.UseSerilog();
 
 builder.Services.AddSingleton<ITextFileLogger>(new TextFileLogger(eec_TextLogger));
@@ -449,7 +449,7 @@ builder.Services.AddSingleton<IGroupTextFileLogger>(new GroupTextFileLogger(grou
 builder.Services.AddSingleton<ITaskTextFileLogger>(new TaskTextFileLogger(task_TextLogger));
 #endregion
 
-#region 引入注册Autofac Module
+#region 寮曞叆娉ㄥ唽Autofac Module
 builder.Host.UseServiceProviderFactory(new AutofacServiceProviderFactory());
 var hostBuilder = builder.Host.ConfigureContainer<ContainerBuilder>(builder =>
 {
@@ -475,21 +475,28 @@ builder.Services.AddScoped<IMapper, Mapper>();
 
 #endregion
 
-#region DeepSeek AI 服务
+#region DeepSeek AI 鏈嶅姟
 
-// 配置HTTP客户端
+// 配置HTTP客户端
 builder.Services.AddHttpClient<IDeepSeekService, DeepSeekService>();
 
 #endregion
 
-#region 聚合API 服务
+#region Doubao API 鏈嶅姟
+var doubaoSetting = builder.Configuration.GetSection("DouBao").Get<OASystem.API.OAMethodLib.DoubaoAPI.DoubaoSetting>();
+builder.Services.AddSingleton(doubaoSetting);
+builder.Services.AddHttpClient("Doubao", c => c.BaseAddress = new Uri(doubaoSetting.BaseAddress));
+builder.Services.AddScoped<OASystem.API.OAMethodLib.DoubaoAPI.IDoubaoService, OASystem.API.OAMethodLib.DoubaoAPI.DoubaoService>();
+#endregion
+
+#region 鑱氬悎API 鏈嶅姟
 builder.Services.AddControllersWithViews();
 builder.Services.AddSingleton<IJuHeApiService, JuHeApiService>();
 builder.Services.AddHttpClient("PublicJuHeApi", c => c.BaseAddress = new Uri("http://web.juhe.cn"));
 builder.Services.AddHttpClient("PublicJuHeTranslateApi", c => c.BaseAddress = new Uri("http://apis.juhe.cn"));
 #endregion
 
-#region 企业微信API 服务
+#region 浼佷笟寰�俊API 鏈嶅姟
 
 builder.Services.AddControllersWithViews();
 builder.Services.AddSingleton<IQiYeWeChatApiService, QiYeWeChatApiService>();
@@ -497,17 +504,17 @@ builder.Services.AddHttpClient("PublicQiYeWeChatApi", c => c.BaseAddress = new U
 
 #endregion
 
-#region 混元API
+#region 娣峰厓API
 
-// 从配置中读取腾讯云密钥信息（请确保appsettings.json中有对应配置）
+// 从配置中读取腾讯云密钥信息（请确保appsettings.json中有对应配置）
 var secretId = builder.Configuration["TencentCloud:SecretId"];
 var secretKey = builder.Configuration["TencentCloud:SecretKey"];
 var region = builder.Configuration["TencentCloud:Region"] ?? "ap-guangzhou";
 
-// 配置HttpClientFactory（SDK内部会用到）
+// 閰嶇疆HttpClientFactory锛圫DK鍐呴儴浼氱敤鍒帮級
 builder.Services.AddHttpClient();
 
-// 注册腾讯云Hunyuan Client为Singleton（推荐）
+// 娉ㄥ唽鑵捐�浜慔unyuan Client涓篠ingleton锛堟帹鑽愶級
 builder.Services.AddSingleton(provider =>
 {
     Credential cred = new Credential
@@ -526,10 +533,10 @@ builder.Services.AddSingleton(provider =>
     return new HunyuanClient(cred, region, clientProfile);
 });
 
-// 注册自定义服务接口及其实现为Scoped生命周期
+// 娉ㄥ唽鑷�畾涔夋湇鍔℃帴鍙ｅ強鍏跺疄鐜颁负Scoped鐢熷懡鍛ㄦ湡
 builder.Services.AddScoped<IHunyuanService, HunyuanService>();
 
-// 注册混元服务
+// 娉ㄥ唽娣峰厓鏈嶅姟
 //builder.Services.AddHttpClient<IHunyuanService, HunyuanService>(client =>
 //{
 //    client.BaseAddress = new Uri("https://hunyuan.ap-chengdu.tencentcloudapi.com/");
@@ -539,17 +546,17 @@ builder.Services.AddScoped<IHunyuanService, HunyuanService>();
 //builder.Services.Configure<HunyuanApiSettings>(builder.Configuration.GetSection("HunyuanApiSettings"));
 #endregion
 
-#region 有道API 服务
+#region 鏈夐亾API 鏈嶅姟
 //builder.Services.AddControllersWithViews();
 //builder.Services.AddSingleton<IYouDaoApiService, YouDaoApiService>();
 //builder.Services.AddHttpClient("PublicYouDaoApi", c => c.BaseAddress = new Uri("https://openapi.youdao.com"));
 #endregion
 
-#region 高德地图API 服务
+#region 楂樺痉鍦板浘API 鏈嶅姟
 builder.Services.AddHttpClient<GeocodeService>();
 #endregion
 
-#region 通用搜索服务
+#region 閫氱敤鎼滅储鏈嶅姟
 builder.Services.AddScoped(typeof(DynamicSearchService<>));
 
 #endregion
@@ -581,50 +588,50 @@ builder.Services.TryAddSingleton(typeof(CommonService));
 
 var app = builder.Build();
 
-//// 1. 异常处理器应该在最早的位置（除了日志等）
+//// 1. 异常处理器应该在最早的位置（除了日志等）
 //app.UseExceptionHandler(new ExceptionHandlerOptions
 //{
 //    ExceptionHandlingPath = "/Home/Error", 
 //    AllowStatusCode404Response = true
 //});
 
-//自定义异常中间件
+//鑷�畾涔夊紓甯镐腑闂翠欢
 //app.UseMiddleware<ExceptionHandlingMiddleware>();
 
-//serilog日志 请求中间管道
+//serilog鏃ュ織 璇锋眰涓�棿绠￠亾
 app.UseSerilogRequestLogging(options =>
 {
     //options.MessageTemplate = "HTTP {RequestMethod} {RequestPath} from {ClientIP} (UA: {UserAgent}, Referer: {Referer}) - {StatusCode} in {Elapsed} ms";
 
     options.MessageTemplate = "HTTP {RequestMethod} {RequestPath} from {ClientIP} (UA: {UserAgent}) - {StatusCode} in {Elapsed} ms";
 
-    // 自定义日志级别
+    // 自定义日志级别
     options.GetLevel = (httpContext, elapsed, ex) =>
     {
         if (ex != null) return LogEventLevel.Error;
         if (httpContext.Response.StatusCode > 499) return LogEventLevel.Error;
 
-        // 对健康检查等端点使用更低级别
+        // 瀵瑰仴搴锋�鏌ョ瓑绔�偣浣跨敤鏇翠綆绾у埆
         if (httpContext.Request.Path.StartsWithSegments("/health"))
             return LogEventLevel.Debug;
 
         return LogEventLevel.Information;
     };
 
-    // 丰富日志上下文
+    // 丰富日志上下文
     options.EnrichDiagnosticContext = (diagnosticContext, httpContext) =>
     {
-        // 获取客户端IP（处理代理情况）
+        // 鑾峰彇瀹㈡埛绔疘P锛堝�鐞嗕唬鐞嗘儏鍐碉級
         var ipAddress = CommonFun.GetClientIpAddress(httpContext);
         var userAgent = CommonFun.DetectOS(httpContext.Request.Headers.UserAgent.ToString());
 
-        // 添加IP和其他有用信息到日志上下文
+        // 添加IP和其他有用信息到日志上下文
         diagnosticContext.Set("ClientIP", ipAddress);
         diagnosticContext.Set("RequestHost", httpContext.Request.Host.Value);
         diagnosticContext.Set("UserAgent", userAgent);
         diagnosticContext.Set("Referer", httpContext.Request.Headers.Referer.ToString());
 
-        // 对于API请求添加额外信息
+        // 瀵逛簬API璇锋眰娣诲姞棰濆�淇℃伅
         if (httpContext.Request.Path.StartsWithSegments("/api"))
         {
             diagnosticContext.Set("RequestContentType", httpContext.Request.ContentType);
@@ -650,28 +657,28 @@ app.UseCors("Cors");  //Cors
 
 //app.UseMiddleware<FixedPromptMiddleware>();
 
-// 定义允许API的访问时间段
+// 瀹氫箟鍏佽�API鐨勮�闂�椂闂存�
 //var startTime = DateTime.Parse(_config["ApiAccessTime:StartTime"]);
 //var endTime = DateTime.Parse(_config["ApiAccessTime:EndTime"]);
 //app.UseMiddleware<TimeRestrictionMiddleware>(startTime, endTime);
 
-//指定API操作记录信息
+//鎸囧畾API鎿嶄綔璁板綍淇℃伅
 app.UseMiddleware<RecordAPIOperationMiddleware>();
 
-app.UseAuthentication(); // 认证
+app.UseAuthentication(); // 璁よ瘉
 
 app.UseMiddleware<RateLimitMiddleware>();
 
-app.UseAuthorization();  // 授权
+app.UseAuthorization();  // 鎺堟潈
 
 app.UseWhen(context =>
     context.Request.Path.StartsWithSegments("/api/MarketCustomerResources/QueryNewClientData"),
     branch => branch.UseResponseCompression());
 
-// 授权路径
+// 鎺堟潈璺�緞
 //app.MapGet("generatetoken", c => c.Response.WriteAsync(JWTBearer.GenerateToken(c)));
 
-#region 启用swaggerUI
+#region 鍚�敤swaggerUI
 if (AppSettingsHelper.Get("UseSwagger").ToBool())
 {
     app.UseSwagger();
@@ -686,15 +693,15 @@ if (AppSettingsHelper.Get("UseSwagger").ToBool())
         c.DocExpansion(Swashbuckle.AspNetCore.SwaggerUI.DocExpansion.None);
         c.DefaultModelsExpandDepth(-1);
 
-        //c.EnableFilter();// 添加搜索功能
-        //c.EnableDeepLinking(); // 启用深度链接
+        //c.EnableFilter();// 娣诲姞鎼滅储鍔熻兘
+        //c.EnableDeepLinking(); // 鍚�敤娣卞害閾炬帴
     });
 }
 #endregion
 
 #region Quartz
 
-//获取容器中的QuartzFactory
+//鑾峰彇瀹瑰櫒涓�殑QuartzFactory
 var quartz = app.Services.GetRequiredService<QuartzFactory>();
 app.Lifetime.ApplicationStarted.Register(async () =>
 {
@@ -703,7 +710,7 @@ app.Lifetime.ApplicationStarted.Register(async () =>
 
 app.Lifetime.ApplicationStopped.Register(() =>
 {
-    //Quzrtz关闭方法
+    //Quzrtz鍏抽棴鏂规硶
     //quartz.Stop();
 });
 

OASystem/OASystem.Api/appsettings.json

@@ -170,7 +170,6 @@
   //收款账单 - 文件路径配置
   "ReceivablesUploadFileBasePath": "D:/FTP/File/OA2023/Office/Word/ForeignReceivables/UploadFile",
   "ReceivablesUploadFileFtpPath": "Office/Word/ForeignReceivables/UploadFile",
-
   "CTableCorrelationPageDatas": [
     {
       "CTableId": 76, //CtableId 酒店预订
@@ -479,6 +478,11 @@
     "BaseAddress": "https://api.deepseek.com/v1/",
     "ApiKey": "sk-a0415069ef56478aaa3028d779d1ace9"
   },
+  "DouBao": {
+    "BaseAddress": "https://ark.cn-beijing.volces.com/api/v3/chat/completions",
+    "ApiKey": "df7914ea-578d-4545-8f3e-9fd8a1e61cb5",
+    "endpointId": "ep-20260224163259-4bvfq"
+  },
   "OverspendAuditUser": [
     {
       "Job": "syZhuGuan",