From 1eec1ff044892c2bb8b3cbbdd335f5f507547747 Mon Sep 17 00:00:00 2001
From: wanli <wanli@DEV_V00005>
Date: Thu, 24 Nov 2022 21:58:54 +0800
Subject: [PATCH] =?UTF-8?q?[Frontend]=20=E4=BF=AE=E6=AD=A3forge=20bug?=
 =?UTF-8?q?=E5=92=8C=E8=B7=AF=E5=BE=91=E5=95=8F=E9=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Frontend/forgeTest.html         | 18 +++++++++---------
 Frontend/js/forge/forgemodel.js |  8 ++++----
 2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/Frontend/forgeTest.html b/Frontend/forgeTest.html
index fd91475..1b347bc 100644
--- a/Frontend/forgeTest.html
+++ b/Frontend/forgeTest.html
@@ -7,8 +7,8 @@
 <body>
 
     <link rel="shortcut icon" href="https://github.com/Autodesk-Forge/learn.forge.viewmodels/raw/master/img/favicon.ico">
-    <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.4.1/css/bootstrap.min.css">
-    <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/jstree/3.3.7/themes/default/style.min.css" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.4.1/css/bootstrap.min.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jstree/3.3.7/themes/default/style.min.css" />
     <!-- Autodesk Forge Viewer files -->
     <link rel="stylesheet" href="https://developer.api.autodesk.com/modelderivative/v2/viewers/7.*/style.min.css" type="text/css">
 
@@ -31,24 +31,24 @@
 
     <!--Base JS-->
     <script src='https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js'></script>
-    <script src="lib//vendors.bundle.js"></script>
-    <script src="lib//app.bundle.js"></script>
+    <!--<script src="lib//vendors.bundle.js"></script>
+    <script src="lib//app.bundle.js"></script>-->
     <!-- JQuery Validate -->
-    <script src="lib/jquery-validation/dist/jquery.validate.js"></script>
+    <!--<script src="lib/jquery-validation/dist/jquery.validate.js"></script>
     <script src="lib/jquery-validation/dist/additional-methods.min.js"></script>
     <script src="lib/jquery-validation/dist/localization/messages_zh_TW.js"></script>
     <script src="lib/notifications/sweetalert2/sweetalert2.bundle.js"></script>
     <script src="lib/notifications/toastr/toastr.js"></script>
-    <script src="js/toast.js"></script>
+    <script src="js/toast.js"></script>-->
     <script src="js/init.js"></script>
 
     <!-- Common packages: jQuery, Bootstrap, jsTree -->
     <!--<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>-->
-    <script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.4.1/js/bootstrap.min.js"></script>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/jstree/3.3.7/jstree.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.4.1/js/bootstrap.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jstree/3.3.7/jstree.min.js"></script>
     <script src="https://developer.api.autodesk.com/modelderivative/v2/viewers/7.*/viewer3D.js"></script>
     <!-- <script src="https://developer.api.autodesk.com/modelderivative/v2/viewers/7.16/viewer3D.js"></script> -->
-    <script src="/js/forge/forgemodel.js"></script>
+    <script src="js/forge/forgemodel.js"></script>
 
 
     <script>
diff --git a/Frontend/js/forge/forgemodel.js b/Frontend/js/forge/forgemodel.js
index b104a06..26605f3 100644
--- a/Frontend/js/forge/forgemodel.js
+++ b/Frontend/js/forge/forgemodel.js
@@ -64,13 +64,13 @@ function launchViewer(urn) {
 
 
         //test 
-        for (let i = 0; i < urns.length; i++) {
-            Autodesk.Viewing.Document.load(urns[i]["urn"], async (doc) => {
+        for (let i = 0; i < urn.length; i++) {
+            Autodesk.Viewing.Document.load(urn[i]["urn"], async (doc) => {
                 let viewables = doc.getRoot().getDefaultGeometry();
                 let model = await viewer.loadDocumentNode(doc, viewables, {
                     preserveView: false,
                     keepCurrentModels: true,
-                    placementTransform: (new THREE.Matrix4()).setPosition(urns[i]["xform"]),
+                    placementTransform: (new THREE.Matrix4()).setPosition(urn[i]["xform"]),
                     keepCurrentModels: true,
                     globalOffset: {
                         x: 0,
@@ -262,7 +262,7 @@ function onDocumentLoadFailure(viewerErrorCode) {
 }
 
 function getForgeToken(callback) {
-    fetch('http://localhost:3604/api/forge/oauth/token').then(res => {
+    fetch(baseApiUrl + '/api/forge/oauth/token').then(res => {
         res.json().then(data => {
             callback(data.dictionary.access_token, data.dictionary.expires_in);
         });
