1.修复企业微信数据解析异常
This commit is contained in:
parent
33358194c6
commit
d0c94c103b
|
@ -87,16 +87,16 @@ namespace PCRobot
|
||||||
catch (Exception)
|
catch (Exception)
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
try
|
//try
|
||||||
{
|
//{
|
||||||
//删除缓存目录
|
// //删除缓存目录
|
||||||
Common.DeleteDir(HttpExtend.MapPath(@"Cache"));
|
// Common.DeleteDir(HttpExtend.MapPath(@"Cache"));
|
||||||
LogHelper.GetSingleObj().Info("删除缓存目录", $"定时删除缓存目录执行完毕");
|
// LogHelper.GetSingleObj().Info("删除缓存目录", $"定时删除缓存目录执行完毕");
|
||||||
}
|
//}
|
||||||
catch (Exception)
|
//catch (Exception)
|
||||||
{
|
//{
|
||||||
LogHelper.GetSingleObj().Info("删除缓存目录", $"定时删除缓存目录执行失败");
|
// LogHelper.GetSingleObj().Info("删除缓存目录", $"定时删除缓存目录执行失败");
|
||||||
}
|
//}
|
||||||
|
|
||||||
Wechat_Xiaoxie.ClickEvent += SystemLoginWechat;
|
Wechat_Xiaoxie.ClickEvent += SystemLoginWechat;
|
||||||
|
|
||||||
|
|
|
@ -207,9 +207,9 @@ namespace PCRobot.PCWechat.Enterprise
|
||||||
f.position = data["position"]?.ToString();
|
f.position = data["position"]?.ToString();
|
||||||
f.realname = data["username"]?.ToString();
|
f.realname = data["username"]?.ToString();
|
||||||
f.remark = data["username"]?.ToString();
|
f.remark = data["username"]?.ToString();
|
||||||
f.sex = data["sex"].ToObject<int>();
|
f.sex = data["sex"]?.ToObject<int>() ?? 0;
|
||||||
f.user_id = data["user_id"].ToString();
|
f.user_id = data["user_id"]?.ToString() ?? string.Empty;
|
||||||
f.username = data["username"].ToString();
|
f.username = data["username"]?.ToString() ?? string.Empty;
|
||||||
|
|
||||||
user.WorkFriends[f.user_id] = f;
|
user.WorkFriends[f.user_id] = f;
|
||||||
|
|
||||||
|
@ -316,7 +316,7 @@ namespace PCRobot.PCWechat.Enterprise
|
||||||
f.avatar = string.Empty;
|
f.avatar = string.Empty;
|
||||||
f.user_id = item["conversation_id"]?.ToString();
|
f.user_id = item["conversation_id"]?.ToString();
|
||||||
f.manager_wxid = item["create_user_id"]?.ToString();
|
f.manager_wxid = item["create_user_id"]?.ToString();
|
||||||
f.is_manager = item["is_admin"].ToObject<int>();
|
f.is_manager = item["is_admin"]?.ToObject<int>() ?? 0;
|
||||||
f.nickname = item["nickname"]?.ToString();
|
f.nickname = item["nickname"]?.ToString();
|
||||||
f.username = item["nickname"]?.ToString();
|
f.username = item["nickname"]?.ToString();
|
||||||
f.remark = item["nickname"]?.ToString();
|
f.remark = item["nickname"]?.ToString();
|
||||||
|
@ -393,7 +393,7 @@ namespace PCRobot.PCWechat.Enterprise
|
||||||
var f = new WorkFriendInfo();
|
var f = new WorkFriendInfo();
|
||||||
f.corp_id = data["corp_id"]?.ToString();
|
f.corp_id = data["corp_id"]?.ToString();
|
||||||
f.mobile = data["mobile"]?.ToString();
|
f.mobile = data["mobile"]?.ToString();
|
||||||
f.acctid = data["acctid"].ToString();
|
f.acctid = data["acctid"]?.ToString() ?? string.Empty;
|
||||||
f.avatar = data["avatar"]?.ToString();
|
f.avatar = data["avatar"]?.ToString();
|
||||||
f.conversation_id = data["conversation_id"]?.ToString();
|
f.conversation_id = data["conversation_id"]?.ToString();
|
||||||
f.desc = data["desc"]?.ToString();
|
f.desc = data["desc"]?.ToString();
|
||||||
|
@ -401,9 +401,9 @@ namespace PCRobot.PCWechat.Enterprise
|
||||||
f.position = data["position"]?.ToString();
|
f.position = data["position"]?.ToString();
|
||||||
f.realname = data["realname"]?.ToString();
|
f.realname = data["realname"]?.ToString();
|
||||||
f.remark = data["remark"]?.ToString();
|
f.remark = data["remark"]?.ToString();
|
||||||
f.sex = data["sex"].ToObject<int>();
|
f.sex = data["sex"]?.ToObject<int>() ?? 0;
|
||||||
f.user_id = data["user_id"]?.ToString();
|
f.user_id = data["user_id"]?.ToString() ?? string.Empty;
|
||||||
f.username = data["username"]?.ToString();
|
f.username = data["username"]?.ToString() ?? string.Empty;
|
||||||
|
|
||||||
user.WorkFriends[f.user_id] = f;
|
user.WorkFriends[f.user_id] = f;
|
||||||
}
|
}
|
||||||
|
@ -465,9 +465,9 @@ namespace PCRobot.PCWechat.Enterprise
|
||||||
f.position = item["position"]?.ToString();
|
f.position = item["position"]?.ToString();
|
||||||
f.realname = item["realname"]?.ToString();
|
f.realname = item["realname"]?.ToString();
|
||||||
f.remark = item["remark"]?.ToString();
|
f.remark = item["remark"]?.ToString();
|
||||||
f.sex = item["sex"].ToObject<int>();
|
f.sex = item["sex"]?.ToObject<int>() ?? 0;
|
||||||
f.nickname = item["username"]?.ToString();
|
f.nickname = item["username"]?.ToString() ?? string.Empty;
|
||||||
f.user_id = item["user_id"]?.ToString();
|
f.user_id = item["user_id"]?.ToString() ?? string.Empty;
|
||||||
|
|
||||||
var friend = group.friends.FirstOrDefault(z => z.user_id == f.user_id);
|
var friend = group.friends.FirstOrDefault(z => z.user_id == f.user_id);
|
||||||
if (friend == null)
|
if (friend == null)
|
||||||
|
@ -770,7 +770,7 @@ namespace PCRobot.PCWechat.Enterprise
|
||||||
var sender = data["sender"]?.ToString(); //发送者的user_id
|
var sender = data["sender"]?.ToString(); //发送者的user_id
|
||||||
var sender_name = data["sender_name"]?.ToString(); //发送者昵称
|
var sender_name = data["sender_name"]?.ToString(); //发送者昵称
|
||||||
var server_id = data["server_id"]?.ToString(); //消息的服务器ID
|
var server_id = data["server_id"]?.ToString(); //消息的服务器ID
|
||||||
var cdn_type = data["cdn_type"].ToObject<int>(); //Cdn类型
|
var cdn_type = data["cdn_type"]?.ToObject<int>() ?? 0; //Cdn类型
|
||||||
|
|
||||||
var wmsg = new WorkWechatReceiveMsg();
|
var wmsg = new WorkWechatReceiveMsg();
|
||||||
wmsg.Cmd = PCRobotCMD.rcvFile_workWeChat;
|
wmsg.Cmd = PCRobotCMD.rcvFile_workWeChat;
|
||||||
|
@ -810,7 +810,7 @@ namespace PCRobot.PCWechat.Enterprise
|
||||||
var aes_key = cdn["aes_key"].ToObject<string>();
|
var aes_key = cdn["aes_key"].ToObject<string>();
|
||||||
var file_id = cdn["file_id"].ToObject<string>();
|
var file_id = cdn["file_id"].ToObject<string>();
|
||||||
var file_name = cdn["file_name"].ToObject<string>();
|
var file_name = cdn["file_name"].ToObject<string>();
|
||||||
var md5 = cdn["md5"].ToObject<int>();
|
var md5 = cdn["md5"].ToObject<string>();
|
||||||
//var preview_img_url = cdn["preview_img_url"].ToObject<string>();
|
//var preview_img_url = cdn["preview_img_url"].ToObject<string>();
|
||||||
var size = cdn["size"].ToObject<int>();
|
var size = cdn["size"].ToObject<int>();
|
||||||
|
|
||||||
|
@ -1887,7 +1887,7 @@ namespace PCRobot.PCWechat.Enterprise
|
||||||
var avatar = data["avatar"]?.ToString();//头像
|
var avatar = data["avatar"]?.ToString();//头像
|
||||||
var corp_id = data["corp_id"]?.ToString();//公司id
|
var corp_id = data["corp_id"]?.ToString();//公司id
|
||||||
var nickname = data["nickname"]?.ToString();//申请人昵称
|
var nickname = data["nickname"]?.ToString();//申请人昵称
|
||||||
var sex = data["sex"]?.ToString();//性别
|
var sex = data["sex"]?.ToObject<int>() ?? 0;//性别
|
||||||
var user_id = data["user_id"]?.ToString();//用户id
|
var user_id = data["user_id"]?.ToString();//用户id
|
||||||
var verify = data["verify"]?.ToString();//申请摘要
|
var verify = data["verify"]?.ToString();//申请摘要
|
||||||
|
|
||||||
|
@ -1906,7 +1906,7 @@ namespace PCRobot.PCWechat.Enterprise
|
||||||
|
|
||||||
//记录申请人,用于记录
|
//记录申请人,用于记录
|
||||||
if (!FriendRequestRecord.ContainsKey(user_id))
|
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);
|
socketClient.Send(wXApply);
|
||||||
}
|
}
|
||||||
|
@ -1960,7 +1960,7 @@ namespace PCRobot.PCWechat.Enterprise
|
||||||
var position = data["position"]?.ToString();//地址
|
var position = data["position"]?.ToString();//地址
|
||||||
var realname = data["realname"]?.ToString();//真实名称
|
var realname = data["realname"]?.ToString();//真实名称
|
||||||
var remark = data["remark"]?.ToString();//备注
|
var remark = data["remark"]?.ToString();//备注
|
||||||
var sex = (int)data["sex"];//性别
|
var sex = data["sex"]?.ToObject<int>() ?? 0;//性别
|
||||||
var unionid = data["unionid"]?.ToString();
|
var unionid = data["unionid"]?.ToString();
|
||||||
var username = data["username"]?.ToString();//微信昵称
|
var username = data["username"]?.ToString();//微信昵称
|
||||||
|
|
||||||
|
|
|
@ -1803,6 +1803,7 @@ html = {html}");
|
||||||
Postdata = postData2,
|
Postdata = postData2,
|
||||||
ResultType = ResultType.String,
|
ResultType = ResultType.String,
|
||||||
};
|
};
|
||||||
|
|
||||||
HttpResult result = http.GetHtml(item);
|
HttpResult result = http.GetHtml(item);
|
||||||
string html = result.Html;
|
string html = result.Html;
|
||||||
return html;
|
return html;
|
||||||
|
|
Loading…
Reference in New Issue