jay.chang/ibms-MCUT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[API] 更新 Forge 使用者

Browse Source
This commit is contained in:
Celeste6666 2023-02-03 20:36:13 +08:00
parent cacf72f99e
commit 338e209ced
9 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Backend/Properties/launchSettings.json
View File

@ -15,8 +15,8 @@
"ASPNETCORE_ENVIRONMENT": "Development", "ASPNETCORE_ENVIRONMENT": "Development",
"ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation", "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation",
"FORGE_CALLBACK_URL": "http://localhost:3000/api/forge/callback/oauth", "FORGE_CALLBACK_URL": "http://localhost:3000/api/forge/callback/oauth",
"FORGE_CLIENT_ID": "TA3hqsFfzQbNOUXKpldKUKSew4SJ21w5", "FORGE_CLIENT_ID": "VeGoOgZcAVCBkiThYvLRSVrCTH6TTwyh",
"FORGE_CLIENT_SECRET": "D002f92d839144f8" "FORGE_CLIENT_SECRET": "Rl1KHJIAI8GSAfhK"
} }
}, },
"Backend": { "Backend": {

8
Backend/Views/BuildInfo/Index.cshtml
View File

@ -278,7 +278,7 @@
var file = input3Dfile; var file = input3Dfile;
var formData = new FormData(); var formData = new FormData();
formData.append('fileToUpload', file); formData.append('fileToUpload', file);
formData.append('bucketKey', "ta3hqsffzqbnouxkpldkuksew4sj21w5-bims_models");//forge上傳平台-資料夾 formData.append('bucketKey', "vegoogzcavcbkithyvlrsvrcth6ttwyh-202302_ibms");//forge上傳平台-資料夾
$.ajax({ $.ajax({
url: '/api/forge/oss/objects', url: '/api/forge/oss/objects',
@ -454,7 +454,7 @@
var file = input3Dfile; var file = input3Dfile;
var formData = new FormData(); var formData = new FormData();
formData.append('fileToUpload', file); formData.append('fileToUpload', file);
formData.append('bucketKey', "ta3hqsffzqbnouxkpldkuksew4sj21w5-bims_models");//forge上傳平台-資料夾 formData.append('bucketKey', "vegoogzcavcbkithyvlrsvrcth6ttwyh-202302_ibms");//forge上傳平台-資料夾
$.ajax({ $.ajax({
url: '/api/forge/oss/objects', url: '/api/forge/oss/objects',
@ -484,6 +484,7 @@
//formData2.append("orgName_3D", file_names[0]); //formData2.append("orgName_3D", file_names[0]);
//formData2.append("extName_3D", file_names[1]); //formData2.append("extName_3D", file_names[1]);
} }
console.log("urn_3D", urn)
formData2.append("urn_3D", urn); formData2.append("urn_3D", urn);
formData2.append("orgName_3D", m3d_names[0]); formData2.append("orgName_3D", m3d_names[0]);
formData2.append("extName_3D", m3d_names[1]); formData2.append("extName_3D", m3d_names[1]);
@ -961,7 +962,7 @@
function translateObject(urn) { function translateObject(urn) {
$("#forgeViewer").empty(); $("#forgeViewer").empty();
//if (node == null) node = $('#appBuckets').jstree(true).get_selected(true)[0]; //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; var objectKey = urn;
jQuery.post({ jQuery.post({
@ -969,6 +970,7 @@
contentType: 'application/json', contentType: 'application/json',
data: JSON.stringify({ 'bucketKey': bucketKey, 'objectName': objectKey }), data: JSON.stringify({ 'bucketKey': bucketKey, 'objectName': objectKey }),
success: function (res) { success: function (res) {
console.log("@@973", res)
//$("#forgeViewer").html('Translation started! Please try again in a moment.'); //$("#forgeViewer").html('Translation started! Please try again in a moment.');
}, },
}); });

4
Backend/appsettings.Development.json
View File

@ -16,8 +16,8 @@
"MySqlDBConfig": { "MySqlDBConfig": {
"Server": "FYlY+w0XDIz+jmF2rlZWJw==", //0.201 "Server": "FYlY+w0XDIz+jmF2rlZWJw==", //0.201
"Port": "js2LutKe+rdjzdxMPQUrvQ==", "Port": "js2LutKe+rdjzdxMPQUrvQ==",
//"Database": "VJB2XC+lAtzuHObDGMVOAA==", //30 "Database": "VJB2XC+lAtzuHObDGMVOAA==", //30
"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp //"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp
"Root": "SzdxEgaJJ7tcTCrUl2zKsA==", "Root": "SzdxEgaJJ7tcTCrUl2zKsA==",
"Password": "FVAPxztxpY4gJJKQ/se4bQ==" "Password": "FVAPxztxpY4gJJKQ/se4bQ=="
} }

4
Backend/appsettings.json
View File

@ -16,8 +16,8 @@
"MySqlDBConfig": { "MySqlDBConfig": {
"Server": "FYlY+w0XDIz+jmF2rlZWJw==", //0.201 "Server": "FYlY+w0XDIz+jmF2rlZWJw==", //0.201
"Port": "js2LutKe+rdjzdxMPQUrvQ==", "Port": "js2LutKe+rdjzdxMPQUrvQ==",
// "Database": "VJB2XC+lAtzuHObDGMVOAA==", //三菱 "Database": "VJB2XC+lAtzuHObDGMVOAA==", //三菱
"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp //"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp
"Root": "SzdxEgaJJ7tcTCrUl2zKsA==", "Root": "SzdxEgaJJ7tcTCrUl2zKsA==",
"Password": "FVAPxztxpY4gJJKQ/se4bQ==" "Password": "FVAPxztxpY4gJJKQ/se4bQ=="
} }

4
Backend/wwwroot/forgeDemo.html
View File

@ -255,7 +255,9 @@
/*launchViewer("dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dGEzaHFzZmZ6cWJub3V4a3BsZGt1a3NldzRzajIxdzUtYmltc19tb2RlbHMvJUUzJTgwJTkwJUU1JThGJUIwJUU1JThDJTk3JUU0JUI4JUFEJUU4JThGJUIxJUU1JUE0JUE3JUU2JUE4JTkzJUUzJTgwJTkxQVJDJUU5JTlCJTk5JUU2JUE4JUExJUU1JUJDJThGK01FUCVFNiU4QiU4NiVFNyVCMyVCQiVFNyVCNSVCMV8wMTE5Lm53ZA")*/ /*launchViewer("dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dGEzaHFzZmZ6cWJub3V4a3BsZGt1a3NldzRzajIxdzUtYmltc19tb2RlbHMvJUUzJTgwJTkwJUU1JThGJUIwJUU1JThDJTk3JUU0JUI4JUFEJUU4JThGJUIxJUU1JUE0JUE3JUU2JUE4JTkzJUUzJTgwJTkxQVJDJUU5JTlCJTk5JUU2JUE4JUExJUU1JUJDJThGK01FUCVFNiU4QiU4NiVFNyVCMyVCQiVFNyVCNSVCMV8wMTE5Lm53ZA")*/
/* 0201 更換好電梯順序 */ /* 0201 更換好電梯順序 */
launchViewer("dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dGEzaHFzZmZ6cWJub3V4a3BsZGt1a3NldzRzajIxdzUtYmltc19tb2RlbHMvJUUzJTgwJTkwJUU1JThGJUIwJUU1JThDJTk3JUU0JUI4JUFEJUU4JThGJUIxJUU1JUE0JUE3JUU2JUE4JTkzJUUzJTgwJTkxQVJDJUU5JTlCJTk5JUU2JUE4JUExJUU1JUJDJThGK01FUCVFNiU4QiU4NiVFNyVCMyVCQiVFNyVCNSVCMV8wMjAxLm53ZA") /* launchViewer("dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dGEzaHFzZmZ6cWJub3V4a3BsZGt1a3NldzRzajIxdzUtYmltc19tb2RlbHMvJUUzJTgwJTkwJUU1JThGJUIwJUU1JThDJTk3JUU0JUI4JUFEJUU4JThGJUIxJUU1JUE0JUE3JUU2JUE4JTkzJUUzJTgwJTkxQVJDJUU5JTlCJTk5JUU2JUE4JUExJUU1JUJDJThGK01FUCVFNiU4QiU4NiVFNyVCMyVCQiVFNyVCNSVCMV8wMjAxLm53ZA")*/
// 0202 將感測器新增到電梯內
launchViewer("dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dmVnb29nemNhdmNia2l0aHl2bHJzdnJjdGg2dHR3eWgtMjAyMzAyX2libXMvJUUzJTgwJTkwJUU1JThGJUIwJUU1JThDJTk3JUU0JUI4JUFEJUU4JThGJUIxJUU1JUE0JUE3JUU2JUE4JTkzJUUzJTgwJTkxQVJDJUU5JTlCJTk5JUU2JUE4JUExJUU1JUJDJThGK01FUCVFNiU4QiU4NiVFNyVCMyVCQiVFNyVCNSVCMV8wMjAyLm53ZA==")
//launchViewer('dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dnNjb2RlFX2ZvcmdlX3Rlc3QvJUUzJFTgwJTkwQVJDJUUzJTgwJTkxXzIwMjJfMTJfMTMubndk');//new ARC //launchViewer('dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dnNjb2RlFX2ZvcmdlX3Rlc3QvJUUzJFTgwJTkwQVJDJUUzJTgwJTkxXzIwMjJfMTJfMTMubndk');//new ARC
//launchViewer('dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dnNjb2RlX2ZvcmdlX3Rlc3QvJUUzJTgwJTkwTUVQJUUzJTgwJTkxXzIwMjJfMTJfMTMubndj');//new MEP //launchViewer('dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dnNjb2RlX2ZvcmdlX3Rlc3QvJUUzJTgwJTkwTUVQJUUzJTgwJTkxXzIwMjJfMTJfMTMubndj');//new MEP
//launchViewer('dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dnNjb2RlX2ZvcmdlX3Rlc3QvJUUzJTgwJTkwQVJDJUUzJTgwJTkxJUU1JTg1JUE4JUU2JUEzJTlGXzIwMjJfMTJfMTMubndj');//全棟 ARC //launchViewer('dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dnNjb2RlX2ZvcmdlX3Rlc3QvJUUzJTgwJTkwQVJDJUUzJTgwJTkxJUU1JTg1JUE4JUU2JUEzJTlGXzIwMjJfMTJfMTMubndj');//全棟 ARC

9
Frontend/_sysMonFloor.html
View File

@ -1099,13 +1099,14 @@
devices: devices, devices: devices,
} }
if (pageAct.sysMainTag !== "LT") {
heatMap = new ADHeatMaps(option); heatMap = new ADHeatMaps(option);
heatMap.onComplete = () => { heatMap.onComplete = () => {
$.each(currentData, (idx, dev) => {
$.each(currentData, (idx, dev) => { heatMap.changeTemp(dev.device_number, dev._temp || 0);
heatMap.changeTemp(dev.device_number, dev._temp || 0); })
})
} }
}
} }
function getHotspotPoint(callback = null) { function getHotspotPoint(callback = null) {

4
FrontendWebApi/ApiControllers/OAuthController.cs
View File

@ -49,8 +49,8 @@ namespace FrontendWebApi.ApiControllers
TwoLeggedApi oauth = new TwoLeggedApi(); TwoLeggedApi oauth = new TwoLeggedApi();
string grantType = "client_credentials"; string grantType = "client_credentials";
dynamic bearer = await oauth.AuthenticateAsync( dynamic bearer = await oauth.AuthenticateAsync(
"TA3hqsFfzQbNOUXKpldKUKSew4SJ21w5", "VeGoOgZcAVCBkiThYvLRSVrCTH6TTwyh",
"D002f92d839144f8", "Rl1KHJIAI8GSAfhK",
grantType, grantType,
scopes); scopes);
return bearer; return bearer;

2
FrontendWebApi/ApiControllers/OSSController.cs
View File

@ -13,7 +13,7 @@ namespace FrontendWebApi.ApiControllers
{ {
private IWebHostEnvironment _env; private IWebHostEnvironment _env;
public OSSController(IWebHostEnvironment env) { _env = env; } public OSSController(IWebHostEnvironment env) { _env = env; }
string id = "TA3hqsFfzQbNOUXKpldKUKSew4SJ21w5"; string id = "VeGoOgZcAVCBkiThYvLRSVrCTH6TTwyh";
public string ClientId { get { return id.ToLower(); } } public string ClientId { get { return id.ToLower(); } }
/// <summary> /// <summary>

4
FrontendWebApi/Properties/launchSettings.json
View File

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