From 25ca69ec2e520d69cbf7e01860ee6d127acafb2a Mon Sep 17 00:00:00 2001
From: liujiaqiang <1448951783@qq.com>
Date: Tue, 30 Jan 2024 11:48:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=85=AC=E4=BC=97=E5=8F=B7?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8F=90=E9=86=92=EF=BC=8C=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E5=BE=8B=E5=B8=88=E7=94=A8=E6=88=B7(=E6=A3=80=E5=AF=9F?=
 =?UTF-8?q?=E5=AE=98=E5=AE=A1=E6=A0=B8=E7=BB=93=E6=9E=9C=E6=8F=90=E9=86=92?=
 =?UTF-8?q?)=E8=B0=83=E6=95=B4=E5=90=AF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 24Hour/Controllers/Common/WebSocketController.cs     |  2 ++
 .../Controllers/system/SystemControllerController.cs |  9 +++++----
 24Hour/WechatMessagerClient.cs                       | 12 ++++++------
 24Hour/appsettings.json                              |  2 +-
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/24Hour/Controllers/Common/WebSocketController.cs b/24Hour/Controllers/Common/WebSocketController.cs
index 486d91a..0a886c9 100644
--- a/24Hour/Controllers/Common/WebSocketController.cs
+++ b/24Hour/Controllers/Common/WebSocketController.cs
@@ -3,6 +3,7 @@ using Elight.Entity;
 using Elight.Logic;
 using Elight.Utility;
 using Elight.Utility.Code;
+using Elight.Utility.Encrypt;
 using Elight.Utility.Extensions;
 using java.awt;
 using javax.xml.crypto;
@@ -564,6 +565,7 @@ namespace _24Hour.Controllers.Common
         {
             try
             {
+                //var ssss = AES.Encrypt("qNNMpCmd7NJHA7iIby12w7MI0LDmLpjvTfV93o6l7DM");
                 //ozRTw0uB1w-Puu73araMIHrdKlSQ
               var sss=  _wechatMessagerClient.gzhwxts(openId, "律师","19536521444","查阅xxx人卷宗","");
 
diff --git a/24Hour/Controllers/system/SystemControllerController.cs b/24Hour/Controllers/system/SystemControllerController.cs
index 0c78052..944d487 100644
--- a/24Hour/Controllers/system/SystemControllerController.cs
+++ b/24Hour/Controllers/system/SystemControllerController.cs
@@ -955,10 +955,11 @@ namespace _24Hour.Controllers.system
                 {                    //认证结果消息通知
                     if (userlist.Count > 0)
                     {
-                        var str = status == 0 ? "认证通过" : "认证不通过";
+                        var type = status == 0 ? "律师身份认证" : "律师身份认证";
                         if (!string.IsNullOrEmpty(userlist.FirstOrDefault().wechatId))
                         {
-                            await wechatMessagerClient.gzhwxtsshtxjg(userlist.FirstOrDefault().wechatId, str, "", userlist.FirstOrDefault()?.createtime, DateTime.Now);
+                           var result=status == 0 ? "认证通过" : $"认证不通过：{describe}";
+                            await wechatMessagerClient.gzhwxtsshtxjg(userlist.FirstOrDefault().wechatId, type, result, DateTime.Now);
                         }
                     }
                     result.IsSucceed = true;
@@ -970,9 +971,9 @@ namespace _24Hour.Controllers.system
                 _db.RollbackTran();
                 result.IsSucceed = false;
                 result.Message = ex.Message;
-                LogService.WriteLog(ex, "用户头像替换");
+                LogService.WriteLog(ex, "用户审核");
             }
-            _logs.WriteSysLogadd("用户管理", "用户头像替换", result, _db);
+            _logs.WriteSysLogadd("用户管理", "用户审核", result, _db);
             return result;
         }
         #endregion
diff --git a/24Hour/WechatMessagerClient.cs b/24Hour/WechatMessagerClient.cs
index 98496df..a21c4e1 100644
--- a/24Hour/WechatMessagerClient.cs
+++ b/24Hour/WechatMessagerClient.cs
@@ -438,7 +438,7 @@ namespace _24Hour
         /// 微信公众号消息提醒，推送律师用户(检察官审核结果提醒)
         /// </summary>
         /// <returns></returns>
-        public async Task<string> gzhwxtsshtxjg(string useropenId, string name, string? phone, DateTime? time1, DateTime time2)
+        public async Task<string> gzhwxtsshtxjg(string useropenId,string type, string result, DateTime time2)
         {
             try
             {
@@ -466,9 +466,8 @@ namespace _24Hour
                 {
                     object msg = null;
                     string posturl = $"{url}{token}";//发送地址
-                    var thing4 = name;
-                    if (!string.IsNullOrEmpty(name) && name.Length > 20)
-                        thing4 = name.Substring(0, 17) + "...";
+                    if (!string.IsNullOrEmpty(result) && result.Length > 20)
+                        result = result.Substring(0, 17) + "...";
                     msg = new
                     {
                         touser = useropenId,
@@ -488,8 +487,9 @@ namespace _24Hour
                         //},
                         data = new
                         {
-                            thing3 = new { value = $"{name}" },
-                            time4 = new { value = $"{time1.Value.ToString("yyyy-MM-dd HH:mm")}" },
+                            thing2 = new { value = $"{type}" },
+                            thing3 = new { value = $"{result}" },
+                            //time4 = new { value = $"{time1.Value.ToString("yyyy-MM-dd HH:mm")}" },
                             time5 = new { value = $"{time2.ToString("yyyy-MM-dd HH:mm")}" },
                         },
                     };
diff --git a/24Hour/appsettings.json b/24Hour/appsettings.json
index df4852f..43d792e 100644
--- a/24Hour/appsettings.json
+++ b/24Hour/appsettings.json
@@ -110,7 +110,7 @@
     //律师注册审核消息提醒
     "templateId1": "cCIkyiWffdAJEX4QQyxsmdaPt-JKib5I4rhCflwcebU",
     //律师注册审核结果提醒
-    "templateId2": "68FkacsufQ5klTZTM4qFcZHfQrsDrAQeiu6R0Chb6B8"
+    "templateId2": "ox1qHSXwIW/MfQc2wue9Pt1iYXYsIMBAa1a1DEjcQg7qE7MliTNnEJkVPRd3PPm4"
 
     //北关微信公众号
     //"appid": "wx3a65effe2f8808c3",