v1.0.25: загрузка JSON/base64 — без бинарного multipart
This commit is contained in:
@@ -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,53 +241,49 @@ 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) {
|
||||||
}
|
if (r.OK) {
|
||||||
};
|
contractId = r.CONTRACT_ID;
|
||||||
xhr.onload = function() {
|
f.doc_id = r.DOC_ID;
|
||||||
try {
|
f.status = 'uploaded';
|
||||||
var r = JSON.parse(xhr.responseText);
|
var elapsed = ((Date.now() - uploadStartTime) / 1000).toFixed(1);
|
||||||
if (r.OK) {
|
log('✅ ' + f.name + ' (' + formatSize(f.size) + ') — ' + elapsed + 'с');
|
||||||
contractId = r.CONTRACT_ID;
|
} else {
|
||||||
f.doc_id = r.DOC_ID;
|
f.status = 'error';
|
||||||
f.status = 'uploaded';
|
log('❌ ' + f.name + ': ' + (r.ERROR || ''));
|
||||||
var elapsed = ((Date.now() - uploadStartTime) / 1000).toFixed(1);
|
}
|
||||||
log('✅ ' + f.name + ' (' + formatSize(f.size) + ') — ' + elapsed + 'с');
|
renderTable();
|
||||||
} else {
|
uploadNext(i + 1);
|
||||||
|
}).catch(function(e) {
|
||||||
f.status = 'error';
|
f.status = 'error';
|
||||||
log('❌ ' + f.name + ': ' + (r.ERROR || ''));
|
log('❌ ' + f.name + ': ' + e.message);
|
||||||
}
|
renderTable();
|
||||||
} catch(e) { f.status = 'error'; log('❌ ' + f.name + ': ' + e.message); }
|
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);
|
||||||
});
|
});
|
||||||
|
|||||||
+73
-59
@@ -13,69 +13,83 @@
|
|||||||
<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?} --->
|
||||||
<cffile action="upload" fileField="files" destination="#getTempDirectory()#" nameConflict="makeUnique" result="upload">
|
<cfset ct = cgi.http_content_type>
|
||||||
|
<cfif ct CONTAINS "application/json">
|
||||||
<cfset mime = "application/octet-stream">
|
<cfset body = toString(getHttpRequestData().content)>
|
||||||
<cfif listLast(upload.clientFile, ".") EQ "pdf">
|
<cfset data = deserializeJSON(body)>
|
||||||
<cfset mime = "application/pdf">
|
<cfif structKeyExists(data, "filename") AND structKeyExists(data, "data")>
|
||||||
<cfelseif listLast(upload.clientFile, ".") EQ "docx">
|
<cfset clientFile = data.filename>
|
||||||
<cfset mime = "application/vnd.openxmlformats-officedocument.wordprocessingml.document">
|
<cfset originalBytes = data.data>
|
||||||
<cfelseif listLast(upload.clientFile, ".") EQ "doc">
|
<cfset contractId = structKeyExists(data, "contract_id") ? data.contract_id : "">
|
||||||
<cfset mime = "application/msword">
|
<cfset fileSize = len(originalBytes)>
|
||||||
<cfelseif listLast(upload.clientFile, ".") EQ "zip">
|
<cfelse>
|
||||||
<cfset mime = "application/zip">
|
<cfset result = {ok: false, error: "JSON: filename and data required"}>
|
||||||
|
<cfoutput>#serializeJSON(result)#</cfoutput>
|
||||||
|
<cfabort>
|
||||||
</cfif>
|
</cfif>
|
||||||
|
<!--- Multipart: curl/API --->
|
||||||
|
<cfelseif structKeyExists(form, "files") AND len(form.files)>
|
||||||
|
<cffile action="upload" fileField="files" destination="#getTempDirectory()#" nameConflict="makeUnique" result="upload">
|
||||||
|
<cfset clientFile = upload.clientFile>
|
||||||
|
<cfset contractId = structKeyExists(form, "contract_id") ? form.contract_id : "">
|
||||||
<cffile action="readBinary" file="#upload.serverDirectory#/#upload.serverFile#" variable="fileBytes">
|
<cffile action="readBinary" file="#upload.serverDirectory#/#upload.serverFile#" variable="fileBytes">
|
||||||
|
<cfset originalBytes = toBase64(fileBytes)>
|
||||||
<cftransaction>
|
<cfset fileSize = upload.fileSize>
|
||||||
<cfquery datasource="baza">
|
<cfelse>
|
||||||
INSERT INTO documents (filename, mime_type, original_bytes, status)
|
<cfoutput>#serializeJSON(result)#</cfoutput>
|
||||||
VALUES (
|
<cfabort>
|
||||||
<cfqueryparam value="#upload.clientFile#" cfsqltype="cf_sql_varchar">,
|
|
||||||
<cfqueryparam value="#mime#" cfsqltype="cf_sql_varchar">,
|
|
||||||
<cfqueryparam value="#toBase64(fileBytes)#" cfsqltype="cf_sql_varchar">,
|
|
||||||
'uploaded'
|
|
||||||
)
|
|
||||||
</cfquery>
|
|
||||||
|
|
||||||
<cfquery name="doc" datasource="baza">
|
|
||||||
SELECT id FROM documents
|
|
||||||
WHERE filename = <cfqueryparam value="#upload.clientFile#" cfsqltype="cf_sql_varchar">
|
|
||||||
AND status = 'uploaded'
|
|
||||||
ORDER BY created_at DESC LIMIT 1
|
|
||||||
</cfquery>
|
|
||||||
|
|
||||||
<!--- Если передан contract_id — используем существующий --->
|
|
||||||
<cfif structKeyExists(form, "contract_id") AND len(form.contract_id)>
|
|
||||||
<cfset cid = {id: form.contract_id}>
|
|
||||||
<cfset suppType = "additional">
|
|
||||||
<cfelse>
|
|
||||||
<cfquery datasource="baza">
|
|
||||||
INSERT INTO contracts (number, client) VALUES (
|
|
||||||
<cfqueryparam value="б/н #dateFormat(now(), 'yyyymmdd')#-#timeFormat(now(), 'HHmm')#" cfsqltype="cf_sql_varchar">,
|
|
||||||
''
|
|
||||||
)
|
|
||||||
</cfquery>
|
|
||||||
<cfquery name="cid" datasource="baza">
|
|
||||||
SELECT id FROM contracts ORDER BY created_at DESC LIMIT 1
|
|
||||||
</cfquery>
|
|
||||||
<cfset suppType = "initial">
|
|
||||||
</cfif>
|
|
||||||
|
|
||||||
<cfquery datasource="baza">
|
|
||||||
INSERT INTO supplements (contract_id, document_id, type) VALUES (
|
|
||||||
<cfqueryparam value="#cid.id#" cfsqltype="cf_sql_varchar">,
|
|
||||||
<cfqueryparam value="#doc.id#" cfsqltype="cf_sql_varchar">,
|
|
||||||
<cfqueryparam value="#suppType#" cfsqltype="cf_sql_varchar">
|
|
||||||
)
|
|
||||||
</cfquery>
|
|
||||||
</cftransaction>
|
|
||||||
|
|
||||||
<cfset result = {ok: true, contract_id: cid.id, doc_id: doc.id, filename: upload.clientFile, size: upload.fileSize}>
|
|
||||||
</cfif>
|
</cfif>
|
||||||
|
|
||||||
|
<!--- 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>
|
||||||
|
<cfquery datasource="baza">
|
||||||
|
INSERT INTO documents (filename, mime_type, original_bytes, status)
|
||||||
|
VALUES (
|
||||||
|
<cfqueryparam value="#clientFile#" cfsqltype="cf_sql_varchar">,
|
||||||
|
<cfqueryparam value="#mime#" cfsqltype="cf_sql_varchar">,
|
||||||
|
<cfqueryparam value="#originalBytes#" cfsqltype="cf_sql_varchar">,
|
||||||
|
'uploaded'
|
||||||
|
)
|
||||||
|
</cfquery>
|
||||||
|
<cfquery name="doc" datasource="baza">
|
||||||
|
SELECT id FROM documents
|
||||||
|
WHERE filename = <cfqueryparam value="#clientFile#" cfsqltype="cf_sql_varchar">
|
||||||
|
AND status = 'uploaded' ORDER BY created_at DESC LIMIT 1
|
||||||
|
</cfquery>
|
||||||
|
<cfif len(contractId)>
|
||||||
|
<cfset cid = {id: contractId}>
|
||||||
|
<cfset suppType = "additional">
|
||||||
|
<cfelse>
|
||||||
|
<cfquery datasource="baza">
|
||||||
|
INSERT INTO contracts (number, client) VALUES (
|
||||||
|
<cfqueryparam value="б/н #dateFormat(now(), 'yyyymmdd')#-#timeFormat(now(), 'HHmm')#" cfsqltype="cf_sql_varchar">, ''
|
||||||
|
)
|
||||||
|
</cfquery>
|
||||||
|
<cfquery name="cid" datasource="baza">
|
||||||
|
SELECT id FROM contracts ORDER BY created_at DESC LIMIT 1
|
||||||
|
</cfquery>
|
||||||
|
<cfset suppType = "initial">
|
||||||
|
</cfif>
|
||||||
|
<cfquery datasource="baza">
|
||||||
|
INSERT INTO supplements (contract_id, document_id, type) VALUES (
|
||||||
|
<cfqueryparam value="#cid.id#" cfsqltype="cf_sql_varchar">,
|
||||||
|
<cfqueryparam value="#doc.id#" cfsqltype="cf_sql_varchar">,
|
||||||
|
<cfqueryparam value="#suppType#" cfsqltype="cf_sql_varchar">
|
||||||
|
)
|
||||||
|
</cfquery>
|
||||||
|
</cftransaction>
|
||||||
|
|
||||||
|
<cfset result = {ok: true, contract_id: cid.id, doc_id: doc.id, filename: clientFile, size: fileSize}>
|
||||||
|
|
||||||
<cfcatch>
|
<cfcatch>
|
||||||
<cfset result = {ok: false, error: cfcatch.message, detail: cfcatch.detail}>
|
<cfset result = {ok: false, error: cfcatch.message, detail: cfcatch.detail}>
|
||||||
</cfcatch>
|
</cfcatch>
|
||||||
|
|||||||
Reference in New Issue
Block a user