|
@@ -141,8 +141,10 @@ namespace MySystem
|
|
|
}
|
|
|
int Status = 0;
|
|
|
string PushData = "";
|
|
|
+ string PushDataEncrypt = "";
|
|
|
if(EncryptMode == 1)
|
|
|
{
|
|
|
+ PushData = Newtonsoft.Json.JsonConvert.SerializeObject(obj);
|
|
|
string content = EncryptHelper.Encrypt1(obj, AesSecret);
|
|
|
obj = new SortedList<string, string>();
|
|
|
obj.Add("type", Title);
|
|
@@ -150,11 +152,11 @@ namespace MySystem
|
|
|
obj.Add("timestamp", DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8));
|
|
|
obj.Add("content", content);
|
|
|
string requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(obj);
|
|
|
+ PushDataEncrypt = requestJson;
|
|
|
string result = function.PostWebRequest(NoticeUrl, requestJson, "application/json");
|
|
|
- PushData = result;
|
|
|
if(result.Contains("\"code\":\"200\""))
|
|
|
{
|
|
|
- Status = 0;
|
|
|
+ Status = 1;
|
|
|
}
|
|
|
}
|
|
|
db.PushRecord.Add(new PushRecord()
|
|
@@ -163,7 +165,7 @@ namespace MySystem
|
|
|
UpdateDate = DateTime.Now,
|
|
|
Status = Status,
|
|
|
PushData = PushData,
|
|
|
- PushDataEncrypt = PushData,
|
|
|
+ PushDataEncrypt = PushDataEncrypt,
|
|
|
PushObjId = pushItem.Id,
|
|
|
MerchantId = merchant.Id
|
|
|
});
|