private/apostol-dm
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Committing updates.

Browse Source
This commit is contained in:
Преподобный Ален
2023-06-20 00:09:00 +03:00
parent 3d3afaf118
commit 0a04a8b8fb
4 changed files with 53 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/modules/Workers/WebService/WebService.cpp
View File

@@ -253,10 +253,10 @@ namespace Apostol {
const auto &caModuleAddress = m_Module["address"];
const auto &caHost = caServerRequest.Headers["host"];
const auto &caOrigin = caServerRequest.Headers["origin"];
const auto &caUserAddress = GetAddress(caServerRequest);
const auto &pgpValue = caServerRequest.Params["pgp"];
const auto &caServerParam = caServerRequest.Params["server"];
const auto &caUserAddress = GetParam(caServerRequest, "address");
const auto &pgpValue = GetParam(caServerRequest, "pgp");
const auto &caServerParam = GetParam(caServerRequest, "server");
const auto index = CurrentContextIndex(caServerParam);
@@ -491,15 +491,14 @@ namespace Apostol {
const auto &caHost = caServerRequest.Headers["host"];
const auto &caOrigin = caServerRequest.Headers["origin"];
const auto &address = GetAddress(caServerRequest);
const auto &code = caServerRequest.Params["code"];
const auto &code = GetParam(caServerRequest, "code");
const auto &address = GetParam(caServerRequest, "address");
const auto &pgpValue = GetParam(caServerRequest, "pgp");
const auto &caServerParam = GetParam(caServerRequest, "server");
const auto &caUserAddress = address.length() == 40 ? CString() : address;
const auto &caDealCode = !code.empty() ? code : address.length() == 40 ? address : CString();
const auto &pgpValue = caServerRequest.Params["pgp"];
const auto &caServerParam = caServerRequest.Params["server"];
const auto index = CurrentContextIndex(caServerParam);
const auto &caContext = index == -1 ? m_CurrentServer : m_Servers[index].Value();
@@ -861,12 +860,13 @@ namespace Apostol {
}
Json.Object().AddPair("module", Module);
Json.Object().AddPair("address", caUserAddress.IsEmpty() ? caModuleAddress : caUserAddress);
if (!caDealCode.IsEmpty()) {
CJSONValue Deal(jvtObject);
Deal.Object().AddPair("code", caDealCode);
Json.Object().AddPair("deal", Deal);
} else {
Json.Object().AddPair("address", caUserAddress.IsEmpty() ? caModuleAddress : caUserAddress);
}
if (!sPayload.IsEmpty())
@@ -927,14 +927,7 @@ namespace Apostol {
const auto &caOrigin = caServerRequest.Headers["origin"];
const auto &caContentType = caServerRequest.Headers["content-type"].Lower();
const auto &address = GetAddress(caServerRequest);
const auto &code = caServerRequest.Params["code"];
const auto &caUserAddress = address.length() == 40 ? CString() : address;
const auto &caDealCode = !code.empty() ? code : address.length() == 40 ? address : CString();
const auto &pgpValue = caServerRequest.Params["pgp"];
const auto &caServerParam = caServerRequest.Params["server"];
const auto &caServerParam = GetParam(caServerRequest, "server");
const auto index = CurrentContextIndex(caServerParam);