From f9e803ef8884eed1ed11a6f36d8bd1c4facd94fd Mon Sep 17 00:00:00 2001 From: wanli Date: Thu, 22 Dec 2022 10:11:31 +0800 Subject: [PATCH] =?UTF-8?q?[Backend]=20=E5=8A=A0=E5=85=A5wsp=E7=9A=84?= =?UTF-8?q?=E5=90=8C=E6=AD=A5N4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Backend/Controllers/NiagaraDataSynchronizeController.cs | 7 +++++-- Backend/appsettings.Development.json | 3 ++- Repository/Helper/DatabaseHelper.cs | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Backend/Controllers/NiagaraDataSynchronizeController.cs b/Backend/Controllers/NiagaraDataSynchronizeController.cs index e19ff8c..8209ed9 100644 --- a/Backend/Controllers/NiagaraDataSynchronizeController.cs +++ b/Backend/Controllers/NiagaraDataSynchronizeController.cs @@ -40,13 +40,16 @@ namespace Backend.Controllers try { List ds; - string url_slot = "slot:/TPE/B1|"; + string url_slot = "slot:/TPE/B1|";//三菱 + //string url_slot = "slot:/NTPC/B1|";//wsp + string top100 = "";//" top 100 "; webRequestService svc = new webRequestService(); string bql = url_slot + "bql:select " + top100 + " * from control:ControlPoint "; //ds = svc.obixQuery("http://192.168.0.136:8080/obix/config/Arena/Program/ObixQuery/query/", bql); //ds = svc.obixQuery("http://localhost:8080/obix/config/Program/ObixQuery/query/", bql); - ds = svc.obixQuery("http://192.168.0.136:8080/obix/config/Program/ObixQuery/query/", bql); + ds = svc.obixQuery("http://192.168.0.136:8080/obix/config/Program/ObixQuery/query/", bql);//三菱 + //ds = svc.obixQuery("http://192.168.0.136:8081/obix/config/Program/ObixQuery/query/", bql);//wsp apiResult.Code = "0000"; apiResult.Data = ds; diff --git a/Backend/appsettings.Development.json b/Backend/appsettings.Development.json index 9797a42..e02e024 100644 --- a/Backend/appsettings.Development.json +++ b/Backend/appsettings.Development.json @@ -16,7 +16,8 @@ "MySqlDBConfig": { "Server": "FYlY+w0XDIz+jmF2rlZWJw==", //0.201 "Port": "js2LutKe+rdjzdxMPQUrvQ==", - "Database": "VJB2XC+lAtzuHObDGMVOAA==", //30 + "Database": "VJB2XC+lAtzuHObDGMVOAA==", //30 + //"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp "Root": "SzdxEgaJJ7tcTCrUl2zKsA==", "Password": "FVAPxztxpY4gJJKQ/se4bQ==" } diff --git a/Repository/Helper/DatabaseHelper.cs b/Repository/Helper/DatabaseHelper.cs index c4c7a2c..78ee5ae 100644 --- a/Repository/Helper/DatabaseHelper.cs +++ b/Repository/Helper/DatabaseHelper.cs @@ -61,8 +61,8 @@ namespace Repository.Helper var rootStr = ed.AESDecrypt(_mySqlDBConfig.Root); // var passwordStr = ed.AESDecrypt(_mySqlDBConfig.Password); // //var serverStr = ed.AESEncrypt("192.168.0.201"); //192.168.0.201 - //var portStr = ed.AESEncrypt("33306"); // 33306 - //var databaseStr = ed.AESEncrypt("bims_mitsubishi"); // bims_mitsubishi + //var portStr = ed.AESEncrypt("33306"); // 33306 + //var databaseStr = ed.AESEncrypt("bims_mitsubishi"); // bims_wsp: IgYBsgG2VLKKxFb64j7LOA== ; bims_mitsubishi //var rootStr = ed.AESEncrypt("bims"); // bims //var passwordStr = ed.AESEncrypt("mjmdev_BIMS2022"); // mjmdev_BIMS2022 var connStr = $"server={serverStr};port={portStr};database={databaseStr};user={rootStr};password={passwordStr};charset=utf8;Allow User Variables=True;";