Nail/contractor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.0.25: загрузка JSON/base64 — без бинарного multipart

Browse Source
This commit is contained in:
naeel
2026-06-18 19:49:57 +04:00
parent 51b9566046
commit bca1bba6d0
2 changed files with 110 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
index.cfm
+28 -32
View File
@@ -64,7 +64,7 @@
<body> <body>
<div class="topbar"> <div class="topbar">
<img src="/nubes-logo.svg" alt="Nubes"> <img src="/nubes-logo.svg" alt="Nubes">
<span class="title">Сверка договоров <span style="font-weight:400;color:var(--muted);font-size:12px;">v1.0.24 — Lucee</span></span> <span class="title">Сверка договоров <span style="font-weight:400;color:var(--muted);font-size:12px;">v1.0.25 — Lucee</span></span>
</div> </div>
<div class="content"> <div class="content">
@@ -221,7 +221,7 @@ fileInput.addEventListener('change', function() {
renderTable(); renderTable();
}); });
// ── Загрузка (XHR с прогрессом) ────────────────────────── // ── Загрузка (FileReader → base64 → JSON POST) ─────────
uploadBtn.addEventListener('click', function() { uploadBtn.addEventListener('click', function() {
if (fileQueue.length === 0) return; if (fileQueue.length === 0) return;
uploadBtn.disabled = true; uploadBtn.disabled = true;
@@ -241,26 +241,23 @@ uploadBtn.addEventListener('click', function() {
var f = fileQueue[i]; var f = fileQueue[i];
if (f.status === 'uploaded') { uploadNext(i + 1); return; } if (f.status === 'uploaded') { uploadNext(i + 1); return; }
f.status = '0%'; f.status = 'читаю...';
renderTable(); renderTable();
uploadTimer.textContent = 'Загрузка ' + (i+1) + '/' + fileQueue.length + '...'; uploadTimer.textContent = 'Загрузка ' + (i+1) + '/' + fileQueue.length + '...';
var xhr = new XMLHttpRequest(); var reader = new FileReader();
var fd = new FormData(); reader.onload = function(e) {
fd.append('files', f.file); // data:application/pdf;base64,xxxx → xxxx
if (contractId) fd.append('contract_id', contractId); var b64 = e.target.result.split(',')[1];
var payload = {filename: f.name, data: b64};
if (contractId) payload.contract_id = contractId;
xhr.open('POST', '/upload.cfm'); fetch('/upload.cfm', {
xhr.timeout = 120000; method: 'POST',
xhr.upload.onprogress = function(e) { headers: {'Content-Type': 'application/json'},
if (e.lengthComputable) { body: JSON.stringify(payload)
f.status = Math.round(e.loaded / e.total * 100) + '%'; }).then(function(r) { return r.json(); })
renderTable(); .then(function(r) {
}
};
xhr.onload = function() {
try {
var r = JSON.parse(xhr.responseText);
if (r.OK) { if (r.OK) {
contractId = r.CONTRACT_ID; contractId = r.CONTRACT_ID;
f.doc_id = r.DOC_ID; f.doc_id = r.DOC_ID;
@@ -271,23 +268,22 @@ uploadBtn.addEventListener('click', function() {
f.status = 'error'; f.status = 'error';
log('❌ ' + f.name + ': ' + (r.ERROR || '')); log('❌ ' + f.name + ': ' + (r.ERROR || ''));
} }
} catch(e) { f.status = 'error'; log('❌ ' + f.name + ': ' + e.message); } renderTable();
uploadNext(i + 1);
}).catch(function(e) {
f.status = 'error';
log('❌ ' + f.name + ': ' + e.message);
renderTable();
uploadNext(i + 1);
});
};
reader.onerror = function() {
f.status = 'error';
log('❌ ' + f.name + ': ошибка чтения');
renderTable(); renderTable();
uploadNext(i + 1); uploadNext(i + 1);
}; };
xhr.onerror = function() { reader.readAsDataURL(f.file);
f.status = 'error (status=0 — обрыв)';
log('❌ ' + f.name + ': сеть (status=0)');
renderTable();
uploadNext(i + 1);
};
xhr.ontimeout = function() {
f.status = 'error (таймаут)';
log('❌ ' + f.name + ': таймаут 120с');
renderTable();
uploadNext(i + 1);
};
xhr.send(fd);
} }
uploadNext(0); uploadNext(0);
}); });
upload.cfm
+41 -27
View File
@@ -13,49 +13,65 @@
<cfset result = {ok: false, error: "no file"}> <cfset result = {ok: false, error: "no file"}>
<cftry> <cftry>
<cfif structKeyExists(form, "files") AND len(form.files)> <!--- JSON-загрузка: {filename, data: base64, contract_id?} --->
<cfset ct = cgi.http_content_type>
<cfif ct CONTAINS "application/json">
<cfset body = toString(getHttpRequestData().content)>
<cfset data = deserializeJSON(body)>
<cfif structKeyExists(data, "filename") AND structKeyExists(data, "data")>
<cfset clientFile = data.filename>
<cfset originalBytes = data.data>
<cfset contractId = structKeyExists(data, "contract_id") ? data.contract_id : "">
<cfset fileSize = len(originalBytes)>
<cfelse>
<cfset result = {ok: false, error: "JSON: filename and data required"}>
<cfoutput>#serializeJSON(result)#</cfoutput>
<cfabort>
</cfif>
<!--- Multipart: curl/API --->
<cfelseif structKeyExists(form, "files") AND len(form.files)>
<cffile action="upload" fileField="files" destination="#getTempDirectory()#" nameConflict="makeUnique" result="upload"> <cffile action="upload" fileField="files" destination="#getTempDirectory()#" nameConflict="makeUnique" result="upload">
<cfset clientFile = upload.clientFile>
<cfset mime = "application/octet-stream"> <cfset contractId = structKeyExists(form, "contract_id") ? form.contract_id : "">
<cfif listLast(upload.clientFile, ".") EQ "pdf"> <cffile action="readBinary" file="#upload.serverDirectory#/#upload.serverFile#" variable="fileBytes">
<cfset mime = "application/pdf"> <cfset originalBytes = toBase64(fileBytes)>
<cfelseif listLast(upload.clientFile, ".") EQ "docx"> <cfset fileSize = upload.fileSize>
<cfset mime = "application/vnd.openxmlformats-officedocument.wordprocessingml.document"> <cfelse>
<cfelseif listLast(upload.clientFile, ".") EQ "doc"> <cfoutput>#serializeJSON(result)#</cfoutput>
<cfset mime = "application/msword"> <cfabort>
<cfelseif listLast(upload.clientFile, ".") EQ "zip">
<cfset mime = "application/zip">
</cfif> </cfif>
<cffile action="readBinary" file="#upload.serverDirectory#/#upload.serverFile#" variable="fileBytes"> <!--- MIME --->
<cfset mime = "application/octet-stream">
<cfset ext = listLast(clientFile, ".")>
<cfif ext EQ "pdf"><cfset mime = "application/pdf">
<cfelseif ext EQ "docx"><cfset mime = "application/vnd.openxmlformats-officedocument.wordprocessingml.document">
<cfelseif ext EQ "doc"><cfset mime = "application/msword">
<cfelseif ext EQ "zip"><cfset mime = "application/zip">
</cfif>
<cftransaction> <cftransaction>
<cfquery datasource="baza"> <cfquery datasource="baza">
INSERT INTO documents (filename, mime_type, original_bytes, status) INSERT INTO documents (filename, mime_type, original_bytes, status)
VALUES ( VALUES (
<cfqueryparam value="#upload.clientFile#" cfsqltype="cf_sql_varchar">, <cfqueryparam value="#clientFile#" cfsqltype="cf_sql_varchar">,
<cfqueryparam value="#mime#" cfsqltype="cf_sql_varchar">, <cfqueryparam value="#mime#" cfsqltype="cf_sql_varchar">,
<cfqueryparam value="#toBase64(fileBytes)#" cfsqltype="cf_sql_varchar">, <cfqueryparam value="#originalBytes#" cfsqltype="cf_sql_varchar">,
'uploaded' 'uploaded'
) )
</cfquery> </cfquery>
<cfquery name="doc" datasource="baza"> <cfquery name="doc" datasource="baza">
SELECT id FROM documents SELECT id FROM documents
WHERE filename = <cfqueryparam value="#upload.clientFile#" cfsqltype="cf_sql_varchar"> WHERE filename = <cfqueryparam value="#clientFile#" cfsqltype="cf_sql_varchar">
AND status = 'uploaded' AND status = 'uploaded' ORDER BY created_at DESC LIMIT 1
ORDER BY created_at DESC LIMIT 1
</cfquery> </cfquery>
<cfif len(contractId)>
<!--- Если передан contract_id — используем существующий ---> <cfset cid = {id: contractId}>
<cfif structKeyExists(form, "contract_id") AND len(form.contract_id)>
<cfset cid = {id: form.contract_id}>
<cfset suppType = "additional"> <cfset suppType = "additional">
<cfelse> <cfelse>
<cfquery datasource="baza"> <cfquery datasource="baza">
INSERT INTO contracts (number, client) VALUES ( INSERT INTO contracts (number, client) VALUES (
<cfqueryparam value="б/н #dateFormat(now(), 'yyyymmdd')#-#timeFormat(now(), 'HHmm')#" cfsqltype="cf_sql_varchar">, <cfqueryparam value="б/н #dateFormat(now(), 'yyyymmdd')#-#timeFormat(now(), 'HHmm')#" cfsqltype="cf_sql_varchar">, ''
''
) )
</cfquery> </cfquery>
<cfquery name="cid" datasource="baza"> <cfquery name="cid" datasource="baza">
@@ -63,7 +79,6 @@
</cfquery> </cfquery>
<cfset suppType = "initial"> <cfset suppType = "initial">
</cfif> </cfif>
<cfquery datasource="baza"> <cfquery datasource="baza">
INSERT INTO supplements (contract_id, document_id, type) VALUES ( INSERT INTO supplements (contract_id, document_id, type) VALUES (
<cfqueryparam value="#cid.id#" cfsqltype="cf_sql_varchar">, <cfqueryparam value="#cid.id#" cfsqltype="cf_sql_varchar">,
@@ -73,8 +88,7 @@
</cfquery> </cfquery>
</cftransaction> </cftransaction>
<cfset result = {ok: true, contract_id: cid.id, doc_id: doc.id, filename: upload.clientFile, size: upload.fileSize}> <cfset result = {ok: true, contract_id: cid.id, doc_id: doc.id, filename: clientFile, size: fileSize}>
</cfif>
<cfcatch> <cfcatch>
<cfset result = {ok: false, error: cfcatch.message, detail: cfcatch.detail}> <cfset result = {ok: false, error: cfcatch.message, detail: cfcatch.detail}>