[API] 更新 Forge 使用者

2023-02-03 20:36:13 +08:00 · 2023-02-03 20:36:13 +08:00 · 338e209ced
commit 338e209ced
parent cacf72f99e
9 changed files with 24 additions and 19 deletions
--- a/Backend/Properties/launchSettings.json
+++ b/Backend/Properties/launchSettings.json
@ -15,8 +15,8 @@
        "ASPNETCORE_ENVIRONMENT": "Development",
        "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation",
        "FORGE_CALLBACK_URL": "http://localhost:3000/api/forge/callback/oauth",
-        "FORGE_CLIENT_ID": "TA3hqsFfzQbNOUXKpldKUKSew4SJ21w5",
-        "FORGE_CLIENT_SECRET": "D002f92d839144f8"
+        "FORGE_CLIENT_ID": "VeGoOgZcAVCBkiThYvLRSVrCTH6TTwyh",
+        "FORGE_CLIENT_SECRET": "Rl1KHJIAI8GSAfhK"
      }
    },
    "Backend": {
--- a/Backend/Views/BuildInfo/Index.cshtml
+++ b/Backend/Views/BuildInfo/Index.cshtml
@ -278,7 +278,7 @@
                    var file = input3Dfile;
                    var formData = new FormData();
                    formData.append('fileToUpload', file);
-                    formData.append('bucketKey', "ta3hqsffzqbnouxkpldkuksew4sj21w5-bims_models");//forge上傳平台-資料夾
+               formData.append('bucketKey', "vegoogzcavcbkithyvlrsvrcth6ttwyh-202302_ibms");//forge上傳平台-資料夾

                    $.ajax({
                        url: '/api/forge/oss/objects',
@ -454,7 +454,7 @@
                    var file = input3Dfile;
                    var formData = new FormData();
                    formData.append('fileToUpload', file);
-                    formData.append('bucketKey', "ta3hqsffzqbnouxkpldkuksew4sj21w5-bims_models");//forge上傳平台-資料夾
+               formData.append('bucketKey', "vegoogzcavcbkithyvlrsvrcth6ttwyh-202302_ibms");//forge上傳平台-資料夾

                    $.ajax({
                        url: '/api/forge/oss/objects',
@ -484,6 +484,7 @@
                                //formData2.append("orgName_3D", file_names[0]);
                                //formData2.append("extName_3D", file_names[1]);
                            }
+                            console.log("urn_3D", urn)
                            formData2.append("urn_3D", urn);
                            formData2.append("orgName_3D", m3d_names[0]);
                            formData2.append("extName_3D", m3d_names[1]);
@ -961,7 +962,7 @@
        function translateObject(urn) {
            $("#forgeViewer").empty();
            //if (node == null) node = $('#appBuckets').jstree(true).get_selected(true)[0];
-            var bucketKey = "ta3hqsffzqbnouxkpldkuksew4sj21w5-bims_models";//forge上傳平台-資料夾
+            var bucketKey = "vegoogzcavcbkithyvlrsvrcth6ttwyh-202302_ibms";//forge上傳平台-資料夾
            var objectKey = urn;

            jQuery.post({
@ -969,6 +970,7 @@
                contentType: 'application/json',
                data: JSON.stringify({ 'bucketKey': bucketKey, 'objectName': objectKey }),
                success: function (res) {
+                  console.log("@@973", res)
                    //$("#forgeViewer").html('Translation started! Please try again in a moment.');
                },
            });
--- a/Backend/appsettings.Development.json
+++ b/Backend/appsettings.Development.json
@ -16,8 +16,8 @@
    "MySqlDBConfig": {
      "Server": "FYlY+w0XDIz+jmF2rlZWJw==", //0.201
      "Port": "js2LutKe+rdjzdxMPQUrvQ==",
-      //"Database": "VJB2XC+lAtzuHObDGMVOAA==", //30  
-      "Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp
+      "Database": "VJB2XC+lAtzuHObDGMVOAA==", //30  
+      //"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp
      "Root": "SzdxEgaJJ7tcTCrUl2zKsA==",
      "Password": "FVAPxztxpY4gJJKQ/se4bQ=="
    }
--- a/Backend/appsettings.json
+++ b/Backend/appsettings.json
@ -16,8 +16,8 @@
    "MySqlDBConfig": {
      "Server": "FYlY+w0XDIz+jmF2rlZWJw==", //0.201
      "Port": "js2LutKe+rdjzdxMPQUrvQ==",
-     // "Database": "VJB2XC+lAtzuHObDGMVOAA==", //三菱
-      "Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp
+      "Database": "VJB2XC+lAtzuHObDGMVOAA==", //三菱
+      //"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp
      "Root": "SzdxEgaJJ7tcTCrUl2zKsA==",
      "Password": "FVAPxztxpY4gJJKQ/se4bQ=="
    }
--- a/Backend/wwwroot/forgeDemo.html
+++ b/Backend/wwwroot/forgeDemo.html
@ -255,7 +255,9 @@
          /*launchViewer("dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dGEzaHFzZmZ6cWJub3V4a3BsZGt1a3NldzRzajIxdzUtYmltc19tb2RlbHMvJUUzJTgwJTkwJUU1JThGJUIwJUU1JThDJTk3JUU0JUI4JUFEJUU4JThGJUIxJUU1JUE0JUE3JUU2JUE4JTkzJUUzJTgwJTkxQVJDJUU5JTlCJTk5JUU2JUE4JUExJUU1JUJDJThGK01FUCVFNiU4QiU4NiVFNyVCMyVCQiVFNyVCNSVCMV8wMTE5Lm53ZA")*/

          /* 0201 更換好電梯順序 */
-          launchViewer("dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dGEzaHFzZmZ6cWJub3V4a3BsZGt1a3NldzRzajIxdzUtYmltc19tb2RlbHMvJUUzJTgwJTkwJUU1JThGJUIwJUU1JThDJTk3JUU0JUI4JUFEJUU4JThGJUIxJUU1JUE0JUE3JUU2JUE4JTkzJUUzJTgwJTkxQVJDJUU5JTlCJTk5JUU2JUE4JUExJUU1JUJDJThGK01FUCVFNiU4QiU4NiVFNyVCMyVCQiVFNyVCNSVCMV8wMjAxLm53ZA")
+          /* launchViewer("dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dGEzaHFzZmZ6cWJub3V4a3BsZGt1a3NldzRzajIxdzUtYmltc19tb2RlbHMvJUUzJTgwJTkwJUU1JThGJUIwJUU1JThDJTk3JUU0JUI4JUFEJUU4JThGJUIxJUU1JUE0JUE3JUU2JUE4JTkzJUUzJTgwJTkxQVJDJUU5JTlCJTk5JUU2JUE4JUExJUU1JUJDJThGK01FUCVFNiU4QiU4NiVFNyVCMyVCQiVFNyVCNSVCMV8wMjAxLm53ZA")*/
+          // 0202 將感測器新增到電梯內
+          launchViewer("dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dmVnb29nemNhdmNia2l0aHl2bHJzdnJjdGg2dHR3eWgtMjAyMzAyX2libXMvJUUzJTgwJTkwJUU1JThGJUIwJUU1JThDJTk3JUU0JUI4JUFEJUU4JThGJUIxJUU1JUE0JUE3JUU2JUE4JTkzJUUzJTgwJTkxQVJDJUU5JTlCJTk5JUU2JUE4JUExJUU1JUJDJThGK01FUCVFNiU4QiU4NiVFNyVCMyVCQiVFNyVCNSVCMV8wMjAyLm53ZA==")
            //launchViewer('dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dnNjb2RlFX2ZvcmdlX3Rlc3QvJUUzJFTgwJTkwQVJDJUUzJTgwJTkxXzIwMjJfMTJfMTMubndk');//new ARC
            //launchViewer('dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dnNjb2RlX2ZvcmdlX3Rlc3QvJUUzJTgwJTkwTUVQJUUzJTgwJTkxXzIwMjJfMTJfMTMubndj');//new MEP
            //launchViewer('dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dnNjb2RlX2ZvcmdlX3Rlc3QvJUUzJTgwJTkwQVJDJUUzJTgwJTkxJUU1JTg1JUE4JUU2JUEzJTlGXzIwMjJfMTJfMTMubndj');//全棟 ARC
--- a/Frontend/_sysMonFloor.html
+++ b/Frontend/_sysMonFloor.html
@ -1099,13 +1099,14 @@
            devices: devices,
        }

+      if (pageAct.sysMainTag !== "LT") {
        heatMap = new ADHeatMaps(option);
        heatMap.onComplete = () => {
-            
-            $.each(currentData, (idx, dev) => {
-                heatMap.changeTemp(dev.device_number, dev._temp || 0);
-            })
+          $.each(currentData, (idx, dev) => {
+            heatMap.changeTemp(dev.device_number, dev._temp || 0);
+          })
        }
+      }
    }

    function getHotspotPoint(callback = null) {
--- a/FrontendWebApi/ApiControllers/OAuthController.cs
+++ b/FrontendWebApi/ApiControllers/OAuthController.cs
@ -49,8 +49,8 @@ namespace FrontendWebApi.ApiControllers
            TwoLeggedApi oauth = new TwoLeggedApi();
            string grantType = "client_credentials";
            dynamic bearer = await oauth.AuthenticateAsync(
-              "TA3hqsFfzQbNOUXKpldKUKSew4SJ21w5",
-              "D002f92d839144f8",
+              "VeGoOgZcAVCBkiThYvLRSVrCTH6TTwyh",
+              "Rl1KHJIAI8GSAfhK",
              grantType,
              scopes);
            return bearer;
--- a/FrontendWebApi/ApiControllers/OSSController.cs
+++ b/FrontendWebApi/ApiControllers/OSSController.cs
@ -13,7 +13,7 @@ namespace FrontendWebApi.ApiControllers
    {
        private IWebHostEnvironment _env;
        public OSSController(IWebHostEnvironment env) { _env = env; }
-        string id = "TA3hqsFfzQbNOUXKpldKUKSew4SJ21w5";
+        string id = "VeGoOgZcAVCBkiThYvLRSVrCTH6TTwyh";
        public string ClientId { get { return id.ToLower(); } }

        /// <summary>
--- a/FrontendWebApi/Properties/launchSettings.json
+++ b/FrontendWebApi/Properties/launchSettings.json
@ -15,8 +15,8 @@
        "ASPNETCORE_ENVIRONMENT": "Development",
        "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation",
        "FORGE_CALLBACK_URL": "http://localhost:3000/api/forge/callback/oauth",
-        "FORGE_CLIENT_ID": "TA3hqsFfzQbNOUXKpldKUKSew4SJ21w5",
-        "FORGE_CLIENT_SECRET": "D002f92d839144f8",
+        "FORGE_CLIENT_ID": "VeGoOgZcAVCBkiThYvLRSVrCTH6TTwyh",
+        "FORGE_CLIENT_SECRET": "Rl1KHJIAI8GSAfhK",
        "ASPNETCORE_URLS": "http://localhost:5500"
      },
      "applicationUrl": "https://localhost:5001;http://localhost:5000"