Merge branch 'test' of http://110.188.24.182:10023/Fengwo/hotline into test

src/Hotline.Api/Controllers/OrderController.cs

@@ -2981,13 +2981,13 @@ public class OrderController : BaseController
 	public async Task Update([FromBody] OrderScreenAlterDto dto)
 	{
         var screen = await _orderScreenRepository.GetAsync(dto.ScreenId);
-		var FileJson = new List<Share.Dtos.File.FileJson>();
-        if (dto.Files.Any())
-            FileJson = await _fileRepository.AddFileAsync(dto.Files, dto.ScreenId, "", HttpContext.RequestAborted);
-        else
-            FileJson = screen.FileJson;
+		//var FileJson = new List<Share.Dtos.File.FileJson>();
+  //      if (dto.Files.Any())
+  //          FileJson = await _fileRepository.AddFileAsync(dto.Files, dto.ScreenId, "", HttpContext.RequestAborted);
+  //      else
+  //          FileJson = screen.FileJson;
         dto.Content = string.IsNullOrEmpty(dto.Content) ? screen.Content : dto.Content;
-		await _orderScreenRepository.Updateable().SetColumns(x => new OrderScreen { Content = dto.Content,FileJson = FileJson })
+		await _orderScreenRepository.Updateable().SetColumns(x => new OrderScreen { Content = dto.Content })
 			.Where(x => x.Id == dto.ScreenId).ExecuteCommandAsync();
 	}
 

src/Hotline.Repository.SqlSugar/Extensions/SqlSugarStartupExtensions.cs

@@ -147,7 +147,7 @@ namespace Hotline.Repository.SqlSugar.Extensions
 
                 var types = typeof(User).Assembly.GetTypes()
                     .Where(d => d.GetInterfaces().Any(x => x == typeof(ITable) && !d.IsAbstract))
-                    .Where(d => d.Name != "Order" && d.Name != "OrderCopy" && d.Name != "Workflow" && d.Name != "WorkflowStep" && d.Name != "WorkflowTrace")
+                    //.Where(d => d.Name != "Order" && d.Name != "OrderCopy" && d.Name != "Workflow" && d.Name != "WorkflowStep" && d.Name != "WorkflowTrace")
                     .Distinct()
                     .ToArray();
 

src/Hotline.Share/Dtos/Order/OrderScreenDto.cs

@@ -386,7 +386,7 @@ namespace Hotline.Share.Dtos.Order
         /// <summary>
         /// 附件
         /// </summary>
-		public List<FileDto> Files { get; set; }
+		//public List<FileDto> Files { get; set; }
 	}
 
     public enum EOrderScreenType

src/Hotline.WeChat/WeChatService.cs

@@ -1,4 +1,5 @@
-using Hotline.Share.Dtos.Snapshot;
+using Hotline.Settings;
+using Hotline.Share.Dtos.Snapshot;
 using Hotline.ThirdAccountDomainServices.Interfaces;
 using Microsoft.Extensions.Logging;
 using Senparc.CO2NET.Extensions;
@@ -13,10 +14,12 @@ namespace Hotline.WeChat;
 public class WeChatService : IThirdIdentiyService
 {
     private readonly ILogger<WeChatService> _logger;
+    private readonly ISystemLogRepository _systemLog;
 
-    public WeChatService(ILogger<WeChatService> logger)
+    public WeChatService(ILogger<WeChatService> logger, ISystemLogRepository systemLog)
     {
         _logger = logger;
+        _systemLog = systemLog;
     }
 
     public async Task<ThirdTokenOutDto> GetTokenAsync(ThirdTokenDto dto, CancellationToken token)
@@ -24,6 +27,7 @@ public class WeChatService : IThirdIdentiyService
         try
         {
             var result = await SnsApi.JsCode2JsonAsync(dto.AppId, dto.Secret, dto.LoginCode);
+            _systemLog.Add("微信获取Token", dto, status: 1, executeResult: result.ToJson());
             if (result.errcode != ReturnCode.请求成功) throw UserFriendlyException.SameMessage("获取微信用户信息失败");
             return new ThirdTokenOutDto() { SessionKey = result.session_key, OpenId = result.openid , UnIonId = result.unionid};
 
@@ -45,6 +49,7 @@ public class WeChatService : IThirdIdentiyService
         await AccessTokenContainer.RegisterAsync(dto.AppId, dto.Secret);
         _logger.LogInformation($"GetPhoneNumberAsync: {dto.ToJson()}");
         var result = await BusinessApi.GetUserPhoneNumberAsync(dto.AppId, dto.TelCode);
+        _systemLog.Add("微信获取手机号码", dto, status: 1, executeResult: result.ToJson());
         if (result.errcode != ReturnCode.请求成功)
             _logger.LogError($"GetPhoneNumberAsync: {result.ToJson()}");
         return new ThirdPhoneOutDto()

src/Hotline/Snapshot/SnapshotSMSTemplate.cs

@@ -2,12 +2,14 @@
 using SqlSugar;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using XF.Domain.Repository;
 
 namespace Hotline.Snapshot;
+[Description("行业短信模板")]
 public class SnapshotSMSTemplate : FullStateEntity
 {
     /// <summary>