Bläddra i källkod

Merge branch 'feature/snapshot' into test

qinchaoyue 1 månad sedan
förälder
incheckning
40f305cd5e
2 ändrade filer med 9 tillägg och 2 borttagningar
  1. 7 2
      src/Hotline.WeChat/WeChatService.cs
  2. 2 0
      src/Hotline/Snapshot/SnapshotSMSTemplate.cs

+ 7 - 2
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()

+ 2 - 0
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>