From 0732344e7905f19cc541727aa26f0a0a90547c63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E9=9B=84?= <admin@cxcp.com>
Date: Fri, 11 Aug 2023 06:15:56 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbpmn=E4=B8=8D=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E8=B7=A8=E5=9F=9F=E7=9A=84=E9=97=AE=E9=A2=98=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbpmn=E4=B8=8D=E6=94=AF=E6=8C=81=E8=B7=A8?=
 =?UTF-8?q?=E5=9F=9F=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 高雄 <admin@cxcp.com>
---
 server/src/main/resources/web/bpmn.ftl | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/server/src/main/resources/web/bpmn.ftl b/server/src/main/resources/web/bpmn.ftl
index 51e5c63a..8da95053 100644
--- a/server/src/main/resources/web/bpmn.ftl
+++ b/server/src/main/resources/web/bpmn.ftl
@@ -5,6 +5,14 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <#include "*/commonHeader.ftl">
+      <script src="js/base64.min.js" type="text/javascript"></script>
+      	<#if currentUrl?contains("http://") || currentUrl?contains("https://") || currentUrl?contains("file://")>
+    <#assign finalUrl="${currentUrl}">
+  <#elseif currentUrl?contains("ftp://") >
+   <#assign finalUrl="${currentUrl}">
+<#else>
+    <#assign finalUrl="${baseUrl}${currentUrl}">
+</#if>
     <style>
         html, body, #diagram {
             height: 100%
@@ -33,12 +41,16 @@
     const viewer = new BpmnJS({
         container: '#diagram'
     });
-
+      var url = '${finalUrl}';
+    var baseUrl = '${baseUrl}'.endsWith('/') ? '${baseUrl}' : '${baseUrl}' + '/';
+    if (!url.startsWith(baseUrl)) {
+        url = baseUrl + 'getCorsFile?urlPath=' + encodeURIComponent(Base64.encode(url));
+    }
     async function showDiagram(diagramXML) {
         await viewer.importXML(diagramXML);
     }
     // load + show diagram
-    $.get('${currentUrl}', showDiagram, 'text');
+    $.get(url, showDiagram, 'text');
 </script>
 </body>
 </html>