From d0c94c103b0bf91c30d2e34325b947f8413947a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=88=E6=A3=AE=E5=90=B4?= <8402134@qq.com> Date: Sat, 17 Dec 2022 12:53:10 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E4=BC=81=E4=B8=9A=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1=E6=95=B0=E6=8D=AE=E8=A7=A3=E6=9E=90=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PCRobot/PCRobotForm.cs | 20 ++++++------ .../Enterprise/Wechat_Xiaoxie_QY_Analysis.cs | 32 +++++++++---------- 类库/Api.Framework/Cps/DouyinApi.cs | 1 + 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/PCRobot/PCRobotForm.cs b/PCRobot/PCRobotForm.cs index 100a8f6..2a6bee7 100644 --- a/PCRobot/PCRobotForm.cs +++ b/PCRobot/PCRobotForm.cs @@ -87,16 +87,16 @@ namespace PCRobot catch (Exception) { } - try - { - //删除缓存目录 - Common.DeleteDir(HttpExtend.MapPath(@"Cache")); - LogHelper.GetSingleObj().Info("删除缓存目录", $"定时删除缓存目录执行完毕"); - } - catch (Exception) - { - LogHelper.GetSingleObj().Info("删除缓存目录", $"定时删除缓存目录执行失败"); - } + //try + //{ + // //删除缓存目录 + // Common.DeleteDir(HttpExtend.MapPath(@"Cache")); + // LogHelper.GetSingleObj().Info("删除缓存目录", $"定时删除缓存目录执行完毕"); + //} + //catch (Exception) + //{ + // LogHelper.GetSingleObj().Info("删除缓存目录", $"定时删除缓存目录执行失败"); + //} Wechat_Xiaoxie.ClickEvent += SystemLoginWechat; diff --git a/PCRobot/PCWechat/Enterprise/Wechat_Xiaoxie_QY_Analysis.cs b/PCRobot/PCWechat/Enterprise/Wechat_Xiaoxie_QY_Analysis.cs index d582ed7..d69798f 100644 --- a/PCRobot/PCWechat/Enterprise/Wechat_Xiaoxie_QY_Analysis.cs +++ b/PCRobot/PCWechat/Enterprise/Wechat_Xiaoxie_QY_Analysis.cs @@ -207,9 +207,9 @@ namespace PCRobot.PCWechat.Enterprise f.position = data["position"]?.ToString(); f.realname = data["username"]?.ToString(); f.remark = data["username"]?.ToString(); - f.sex = data["sex"].ToObject(); - f.user_id = data["user_id"].ToString(); - f.username = data["username"].ToString(); + f.sex = data["sex"]?.ToObject() ?? 0; + f.user_id = data["user_id"]?.ToString() ?? string.Empty; + f.username = data["username"]?.ToString() ?? string.Empty; user.WorkFriends[f.user_id] = f; @@ -316,7 +316,7 @@ namespace PCRobot.PCWechat.Enterprise f.avatar = string.Empty; f.user_id = item["conversation_id"]?.ToString(); f.manager_wxid = item["create_user_id"]?.ToString(); - f.is_manager = item["is_admin"].ToObject(); + f.is_manager = item["is_admin"]?.ToObject() ?? 0; f.nickname = item["nickname"]?.ToString(); f.username = item["nickname"]?.ToString(); f.remark = item["nickname"]?.ToString(); @@ -393,7 +393,7 @@ namespace PCRobot.PCWechat.Enterprise var f = new WorkFriendInfo(); f.corp_id = data["corp_id"]?.ToString(); f.mobile = data["mobile"]?.ToString(); - f.acctid = data["acctid"].ToString(); + f.acctid = data["acctid"]?.ToString() ?? string.Empty; f.avatar = data["avatar"]?.ToString(); f.conversation_id = data["conversation_id"]?.ToString(); f.desc = data["desc"]?.ToString(); @@ -401,9 +401,9 @@ namespace PCRobot.PCWechat.Enterprise f.position = data["position"]?.ToString(); f.realname = data["realname"]?.ToString(); f.remark = data["remark"]?.ToString(); - f.sex = data["sex"].ToObject(); - f.user_id = data["user_id"]?.ToString(); - f.username = data["username"]?.ToString(); + f.sex = data["sex"]?.ToObject() ?? 0; + f.user_id = data["user_id"]?.ToString() ?? string.Empty; + f.username = data["username"]?.ToString() ?? string.Empty; user.WorkFriends[f.user_id] = f; } @@ -465,9 +465,9 @@ namespace PCRobot.PCWechat.Enterprise f.position = item["position"]?.ToString(); f.realname = item["realname"]?.ToString(); f.remark = item["remark"]?.ToString(); - f.sex = item["sex"].ToObject(); - f.nickname = item["username"]?.ToString(); - f.user_id = item["user_id"]?.ToString(); + f.sex = item["sex"]?.ToObject() ?? 0; + f.nickname = item["username"]?.ToString() ?? string.Empty; + f.user_id = item["user_id"]?.ToString() ?? string.Empty; var friend = group.friends.FirstOrDefault(z => z.user_id == f.user_id); if (friend == null) @@ -770,7 +770,7 @@ namespace PCRobot.PCWechat.Enterprise var sender = data["sender"]?.ToString(); //发送者的user_id var sender_name = data["sender_name"]?.ToString(); //发送者昵称 var server_id = data["server_id"]?.ToString(); //消息的服务器ID - var cdn_type = data["cdn_type"].ToObject(); //Cdn类型 + var cdn_type = data["cdn_type"]?.ToObject() ?? 0; //Cdn类型 var wmsg = new WorkWechatReceiveMsg(); wmsg.Cmd = PCRobotCMD.rcvFile_workWeChat; @@ -810,7 +810,7 @@ namespace PCRobot.PCWechat.Enterprise var aes_key = cdn["aes_key"].ToObject(); var file_id = cdn["file_id"].ToObject(); var file_name = cdn["file_name"].ToObject(); - var md5 = cdn["md5"].ToObject(); + var md5 = cdn["md5"].ToObject(); //var preview_img_url = cdn["preview_img_url"].ToObject(); var size = cdn["size"].ToObject(); @@ -1887,7 +1887,7 @@ namespace PCRobot.PCWechat.Enterprise var avatar = data["avatar"]?.ToString();//头像 var corp_id = data["corp_id"]?.ToString();//公司id var nickname = data["nickname"]?.ToString();//申请人昵称 - var sex = data["sex"]?.ToString();//性别 + var sex = data["sex"]?.ToObject() ?? 0;//性别 var user_id = data["user_id"]?.ToString();//用户id var verify = data["verify"]?.ToString();//申请摘要 @@ -1906,7 +1906,7 @@ namespace PCRobot.PCWechat.Enterprise //记录申请人,用于记录 if (!FriendRequestRecord.ContainsKey(user_id)) - FriendRequestRecord.TryAdd(user_id, new FriendInfo() { account = user_id, avatar = avatar, nickname = nickname, sex = int.Parse(sex), wxid = user_id }); + FriendRequestRecord.TryAdd(user_id, new FriendInfo() { account = user_id, avatar = avatar, nickname = nickname, sex = sex, wxid = user_id }); socketClient.Send(wXApply); } @@ -1960,7 +1960,7 @@ namespace PCRobot.PCWechat.Enterprise var position = data["position"]?.ToString();//地址 var realname = data["realname"]?.ToString();//真实名称 var remark = data["remark"]?.ToString();//备注 - var sex = (int)data["sex"];//性别 + var sex = data["sex"]?.ToObject() ?? 0;//性别 var unionid = data["unionid"]?.ToString(); var username = data["username"]?.ToString();//微信昵称 diff --git a/类库/Api.Framework/Cps/DouyinApi.cs b/类库/Api.Framework/Cps/DouyinApi.cs index ec1b5f7..a2897d7 100644 --- a/类库/Api.Framework/Cps/DouyinApi.cs +++ b/类库/Api.Framework/Cps/DouyinApi.cs @@ -1803,6 +1803,7 @@ html = {html}"); Postdata = postData2, ResultType = ResultType.String, }; + HttpResult result = http.GetHtml(item); string html = result.Html; return html;