From 96f4f10cbb4ebdf5cb97f77f6659753f4a827746 Mon Sep 17 00:00:00 2001 From: wjn Date: Mon, 22 Jan 2024 17:31:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../APT.BD.WebApi/appsettings.Pdev.json | 2 +- .../APT.BD.WebApi/appsettings.Production.json | 4 ++-- .../APT.BD.WebApi/appsettings.Test.json | 4 ++-- APT.MicroApi/APT.BD.WebApi/appsettings.json | 2 +- .../APT.BS.WebApi/appsettings.Development.json | 4 ++-- .../APT.BS.WebApi/appsettings.Pdev.json | 2 +- .../APT.BS.WebApi/appsettings.Production.json | 4 ++-- .../APT.BS.WebApi/appsettings.Test.json | 4 ++-- APT.MicroApi/APT.BS.WebApi/appsettings.json | 2 +- .../APT.FM.WebApi/appsettings.Development.json | 12 +++--------- .../APT.FM.WebApi/appsettings.Pdev.json | 11 ++--------- .../APT.FM.WebApi/appsettings.Production.json | 13 +++---------- .../APT.FM.WebApi/appsettings.Test.json | 12 +++--------- APT.MicroApi/APT.FM.WebApi/appsettings.json | 9 ++------- .../APT.FO.WebApi/appsettings.Development.json | 4 ++-- .../APT.FO.WebApi/appsettings.Pdev.json | 2 +- .../APT.FO.WebApi/appsettings.Production.json | 4 ++-- .../APT.FO.WebApi/appsettings.Test.json | 4 ++-- APT.MicroApi/APT.FO.WebApi/appsettings.json | 4 ++-- .../APT.HM.WebApi/appsettings.Development.json | 4 ++-- .../APT.HM.WebApi/appsettings.Pdev.json | 2 +- .../APT.HM.WebApi/appsettings.Production.json | 4 ++-- .../APT.HM.WebApi/appsettings.Test.json | 4 ++-- APT.MicroApi/APT.HM.WebApi/appsettings.json | 4 ++-- .../APT.LG.WebApi/appsettings.Development.json | 2 +- .../APT.LG.WebApi/appsettings.Pdev.json | 2 +- .../APT.LG.WebApi/appsettings.Production.json | 4 ++-- .../APT.LG.WebApi/appsettings.Test.json | 2 +- .../APT.NW.WebApi/appsettings.Development.json | 4 ++-- .../APT.NW.WebApi/appsettings.Pdev.json | 2 +- .../APT.NW.WebApi/appsettings.Production.json | 4 ++-- .../APT.NW.WebApi/appsettings.Test.json | 4 ++-- APT.MicroApi/APT.NW.WebApi/appsettings.json | 2 +- .../Controllers/Api/TenantInfoController.cs | 4 +++- .../APT.OP.WebApi/appsettings.Development.json | 6 +++--- .../APT.OP.WebApi/appsettings.Pdev.json | 4 ++-- .../APT.OP.WebApi/appsettings.Production.json | 6 +++--- .../APT.OP.WebApi/appsettings.Test.json | 6 +++--- APT.MicroApi/APT.OP.WebApi/appsettings.json | 4 ++-- .../APT.PF.WebApi/appsettings.Development.json | 12 +++--------- .../APT.PF.WebApi/appsettings.Pdev.json | 11 ++--------- .../APT.PF.WebApi/appsettings.Production.json | 13 +++---------- .../APT.PF.WebApi/appsettings.Test.json | 17 ++++++----------- APT.MicroApi/APT.PF.WebApi/appsettings.json | 9 ++------- .../APT.PP.WebApi/appsettings.Development.json | 4 ++-- .../APT.PP.WebApi/appsettings.Pdev.json | 2 +- .../APT.PP.WebApi/appsettings.Production.json | 4 ++-- .../APT.PP.WebApi/appsettings.Test.json | 4 ++-- APT.MicroApi/APT.PP.WebApi/appsettings.json | 2 +- .../APT.SC.WebApi/appsettings.Development.json | 4 ++-- .../APT.SC.WebApi/appsettings.Pdev.json | 2 +- .../APT.SC.WebApi/appsettings.Production.json | 4 ++-- .../APT.SC.WebApi/appsettings.Test.json | 4 ++-- APT.MicroApi/APT.SC.WebApi/appsettings.json | 2 +- .../APT.UT.WebApi/appsettings.Development.json | 4 ++-- .../APT.UT.WebApi/appsettings.Pdev.json | 2 +- .../APT.UT.WebApi/appsettings.Production.json | 4 ++-- .../APT.UT.WebApi/appsettings.Test.json | 4 ++-- APT.MicroApi/APT.UT.WebApi/appsettings.json | 2 +- 59 files changed, 114 insertions(+), 173 deletions(-) diff --git a/APT.MicroApi/APT.BD.WebApi/appsettings.Pdev.json b/APT.MicroApi/APT.BD.WebApi/appsettings.Pdev.json index ef6a367..9571ef1 100644 --- a/APT.MicroApi/APT.BD.WebApi/appsettings.Pdev.json +++ b/APT.MicroApi/APT.BD.WebApi/appsettings.Pdev.json @@ -23,7 +23,7 @@ "TenantConnKey": "PDEV1212" }, "RedisConfig": { - "RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis", + "RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.BD.WebApi/appsettings.Production.json b/APT.MicroApi/APT.BD.WebApi/appsettings.Production.json index ccfe4d5..acf7c12 100644 --- a/APT.MicroApi/APT.BD.WebApi/appsettings.Production.json +++ b/APT.MicroApi/APT.BD.WebApi/appsettings.Production.json @@ -19,10 +19,10 @@ "ConnApiUrl": "http://172.26.13.0:3116/api/OP/TenantInfo/GetDbConn", "AllConnApiUrl": "http://172.26.13.0:3116/api/OP/TenantInfo/GetAllDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212" + "TenantConnKey": "MHSMS" }, "RedisConfig": { - "RedisConnectionString": "172.26.13.0:6379,password=mhsaferedis", + "RedisConnectionString": "172.26.13.0:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.BD.WebApi/appsettings.Test.json b/APT.MicroApi/APT.BD.WebApi/appsettings.Test.json index d70dd9d..cebcd94 100644 --- a/APT.MicroApi/APT.BD.WebApi/appsettings.Test.json +++ b/APT.MicroApi/APT.BD.WebApi/appsettings.Test.json @@ -14,10 +14,10 @@ "ConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetDbConn", "AllConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetAllDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212" + "TenantConnKey": "MHSMS" }, "RedisConfig": { - "RedisConnectionString": "47.122.43.22:6379,password=mhsaferedis", + "RedisConnectionString": "47.122.43.22:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.BD.WebApi/appsettings.json b/APT.MicroApi/APT.BD.WebApi/appsettings.json index 3528f27..5ee8c33 100644 --- a/APT.MicroApi/APT.BD.WebApi/appsettings.json +++ b/APT.MicroApi/APT.BD.WebApi/appsettings.json @@ -18,7 +18,7 @@ "WebSocketPort": "3140", "ConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212" + "TenantConnKey": "MHSMS" }, "RedisConfig": { "RedisConnectionString": "120.25.146.51:6379", diff --git a/APT.MicroApi/APT.BS.WebApi/appsettings.Development.json b/APT.MicroApi/APT.BS.WebApi/appsettings.Development.json index 3f29bc1..044c534 100644 --- a/APT.MicroApi/APT.BS.WebApi/appsettings.Development.json +++ b/APT.MicroApi/APT.BS.WebApi/appsettings.Development.json @@ -13,10 +13,10 @@ "ConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetDbConn", "AllConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetAllDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212" + "TenantConnKey": "MHSMS" }, "RedisConfig": { - "RedisConnectionString": "172.21.157.142:6379,password=mhsaferedis", + "RedisConnectionString": "172.21.157.142:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.BS.WebApi/appsettings.Pdev.json b/APT.MicroApi/APT.BS.WebApi/appsettings.Pdev.json index 1768241..c9b605f 100644 --- a/APT.MicroApi/APT.BS.WebApi/appsettings.Pdev.json +++ b/APT.MicroApi/APT.BS.WebApi/appsettings.Pdev.json @@ -23,7 +23,7 @@ "TenantConnKey": "PDEV1212" }, "RedisConfig": { - "RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis", + "RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.BS.WebApi/appsettings.Production.json b/APT.MicroApi/APT.BS.WebApi/appsettings.Production.json index 9d1ac8b..b86c716 100644 --- a/APT.MicroApi/APT.BS.WebApi/appsettings.Production.json +++ b/APT.MicroApi/APT.BS.WebApi/appsettings.Production.json @@ -20,10 +20,10 @@ "ConnApiUrl": "http://172.26.13.0:3116/api/OP/TenantInfo/GetDbConn", "AllConnApiUrl": "http://172.26.13.0:3116/api/OP/TenantInfo/GetAllDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212" + "TenantConnKey": "MHSMS" }, "RedisConfig": { - "RedisConnectionString": "172.26.13.0:6379,password=mhsaferedis", + "RedisConnectionString": "172.26.13.0:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.BS.WebApi/appsettings.Test.json b/APT.MicroApi/APT.BS.WebApi/appsettings.Test.json index a05c361..064f9df 100644 --- a/APT.MicroApi/APT.BS.WebApi/appsettings.Test.json +++ b/APT.MicroApi/APT.BS.WebApi/appsettings.Test.json @@ -14,10 +14,10 @@ "ConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetDbConn", "AllConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetAllDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212" + "TenantConnKey": "MHSMS" }, "RedisConfig": { - "RedisConnectionString": "47.122.43.22:6379,password=mhsaferedis", + "RedisConnectionString": "47.122.43.22:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.BS.WebApi/appsettings.json b/APT.MicroApi/APT.BS.WebApi/appsettings.json index 93a145d..d28f6dc 100644 --- a/APT.MicroApi/APT.BS.WebApi/appsettings.json +++ b/APT.MicroApi/APT.BS.WebApi/appsettings.json @@ -18,7 +18,7 @@ "WebSocketPort": "3140", "ConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212" + "TenantConnKey": "MHSMS" }, "RedisConfig": { "RedisConnectionString": "120.25.146.51:6379", diff --git a/APT.MicroApi/APT.FM.WebApi/appsettings.Development.json b/APT.MicroApi/APT.FM.WebApi/appsettings.Development.json index b40d2a1..ef4851a 100644 --- a/APT.MicroApi/APT.FM.WebApi/appsettings.Development.json +++ b/APT.MicroApi/APT.FM.WebApi/appsettings.Development.json @@ -1,12 +1,6 @@ { "ConnectionStrings": { - //"default": "Database=test20211;Data Source=36.133.75.96;Port=3306;User Id=root;Password=opt!energy;TreatTinyAsBoolean=true;", - //"default": "Data Source=172.20.8.76:1521/DB2;User Id=\"dbo\";Password=mssqas;Pooling=false;PERSIST SECURITY INFO=True;" - //"default": "Data Source=172.20.8.83:1521/DB2;User Id=\"dbo\";Password=mssuat;Pooling=false;PERSIST SECURITY INFO=True;" - //"default": "User ID=postgres;Password=ldxmesadm;Host=172.20.8.91;Port=5432;Database=mes;CommandTimeout=1024;" - //"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;" - //"default": "User ID=postgres;Password=opt!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;" - "default": "Server=47.122.43.22;Database=mh_ops;uid=sa;pwd=mhsafe!2021;" + "default": "Server=47.122.43.22;Database=mh_sms_ops;uid=sa;pwd=mhsafe!2021;" }, "AppSettings": { "DataBaseType": "sqlserver", @@ -20,11 +14,11 @@ "AllConnApiUrl": "http://172.21.157.142:3116/api/OP/TenantInfo/GetAllDbConn", "RedisFormConfig": "false", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212", + "TenantConnKey": "MHSMS", "Img_Local": "D:\\uploadFile" }, "RedisConfig": { - "RedisConnectionString": "172.21.157.142:6379,password=mhsaferedis", + "RedisConnectionString": "172.21.157.142:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true } } diff --git a/APT.MicroApi/APT.FM.WebApi/appsettings.Pdev.json b/APT.MicroApi/APT.FM.WebApi/appsettings.Pdev.json index 058d3ad..ddb8354 100644 --- a/APT.MicroApi/APT.FM.WebApi/appsettings.Pdev.json +++ b/APT.MicroApi/APT.FM.WebApi/appsettings.Pdev.json @@ -1,13 +1,6 @@ { "ConnectionStrings": { - //"default": "Database=test20211;Data Source=36.133.75.96;Port=3306;User Id=root;Password=dfdn!energy;TreatTinyAsBoolean=true;", - //"default": "Data Source=172.20.8.76:1521/DB2;User Id=\"dbo\";Password=mssqas;Pooling=false;PERSIST SECURITY INFO=True;" - //"default": "Data Source=172.20.8.83:1521/DB2;User Id=\"dbo\";Password=mssuat;Pooling=false;PERSIST SECURITY INFO=True;" - //"default": "User ID=postgres;Password=ldxmesadm;Host=172.20.8.91;Port=5432;Database=mes;CommandTimeout=1024;" - //"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;" - //"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=test2021;CommandTimeout=1024;" - //"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;" - "default": "Server=120.25.146.51;Database=mh_ops;uid=sa;pwd=mhsafe!2021;" + "default": "Server=120.25.146.51;Database=mh_sms_ops;uid=sa;pwd=mhsafe!2021;" }, "AppSettings": { "DataBaseType": "sqlserver", @@ -26,7 +19,7 @@ "Img_Local": "C:\\release\\img" }, "RedisConfig": { - "RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis", + "RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.FM.WebApi/appsettings.Production.json b/APT.MicroApi/APT.FM.WebApi/appsettings.Production.json index 2b14c98..67eca3d 100644 --- a/APT.MicroApi/APT.FM.WebApi/appsettings.Production.json +++ b/APT.MicroApi/APT.FM.WebApi/appsettings.Production.json @@ -1,13 +1,6 @@ { "ConnectionStrings": { - //"default": "Database=test20211;Data Source=36.133.75.96;Port=3306;User Id=root;Password=dfdn!energy;TreatTinyAsBoolean=true;", - //"default": "Data Source=172.20.8.76:1521/DB2;User Id=\"dbo\";Password=mssqas;Pooling=false;PERSIST SECURITY INFO=True;" - //"default": "Data Source=172.20.8.83:1521/DB2;User Id=\"dbo\";Password=mssuat;Pooling=false;PERSIST SECURITY INFO=True;" - //"default": "User ID=postgres;Password=ldxmesadm;Host=172.20.8.91;Port=5432;Database=mes;CommandTimeout=1024;" - //"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;" - //"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=test2021;CommandTimeout=1024;" - //"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;" - "default": "Server=172.26.13.0;Database=mh_ops;uid=sa;pwd=mhsafe!2021;" + "default": "Server=172.26.13.0;Database=mh_sms_ops;uid=sa;pwd=mhsafe!2021;" }, "AppSettings": { "DataBaseType": "sqlserver", @@ -21,11 +14,11 @@ "AllConnApiUrl": "http://172.26.13.0:3116/api/OP/TenantInfo/GetAllDbConn", "RedisFormConfig": "true", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212", + "TenantConnKey": "MHSMS", "Img_Local": "C:\\release\\img" }, "RedisConfig": { - "RedisConnectionString": "172.26.13.0:6379,password=mhsaferedis", + "RedisConnectionString": "172.26.13.0:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.FM.WebApi/appsettings.Test.json b/APT.MicroApi/APT.FM.WebApi/appsettings.Test.json index 345f831..5f0bf5a 100644 --- a/APT.MicroApi/APT.FM.WebApi/appsettings.Test.json +++ b/APT.MicroApi/APT.FM.WebApi/appsettings.Test.json @@ -1,12 +1,6 @@ { "ConnectionStrings": { - //"default": "Database=test20211;Data Source=36.133.75.96;Port=3306;User Id=root;Password=opt!energy;TreatTinyAsBoolean=true;", - //"default": "Data Source=172.20.8.76:1521/DB2;User Id=\"dbo\";Password=mssqas;Pooling=false;PERSIST SECURITY INFO=True;" - //"default": "Data Source=172.20.8.83:1521/DB2;User Id=\"dbo\";Password=mssuat;Pooling=false;PERSIST SECURITY INFO=True;" - //"default": "User ID=postgres;Password=ldxmesadm;Host=172.20.8.91;Port=5432;Database=mes;CommandTimeout=1024;" - //"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;" - //"default": "User ID=postgres;Password=opt!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;" - "default": "Server=47.122.43.22;Database=mh_ops;uid=sa;pwd=mhsafe!2021;" + "default": "Server=47.122.43.22;Database=mh_sms_ops;uid=sa;pwd=mhsafe!2021;" }, "AppSettings": { "DataBaseType": "sqlserver", @@ -21,11 +15,11 @@ "AllConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetAllDbConn", "RedisFormConfig": "false", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212", + "TenantConnKey": "MHSMS", "Img_Local": "D:\\uploadFile" }, "RedisConfig": { - "RedisConnectionString": "47.122.43.22:6379,password=mhsaferedis", + "RedisConnectionString": "47.122.43.22:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.FM.WebApi/appsettings.json b/APT.MicroApi/APT.FM.WebApi/appsettings.json index 949fb62..892be14 100644 --- a/APT.MicroApi/APT.FM.WebApi/appsettings.json +++ b/APT.MicroApi/APT.FM.WebApi/appsettings.json @@ -1,11 +1,6 @@ { "ConnectionStrings": { - //"default": "Database=test20211;Data Source=36.133.75.96;Port=3306;User Id=root;Password=opt!energy;TreatTinyAsBoolean=true;", - //"default": "Data Source=172.20.8.76:1521/DB2;User Id=\"dbo\";Password=mssqas;Pooling=false;PERSIST SECURITY INFO=True;" - //"default": "Data Source=172.20.8.83:1521/DB2;User Id=\"dbo\";Password=mssuat;Pooling=false;PERSIST SECURITY INFO=True;" - //"default": "User ID=postgres;Password=ldxmesadm;Host=172.20.8.91;Port=5432;Database=mes;CommandTimeout=1024;" - "default": "Server=127.0.0.1;Database=mh_ops;uid=sa;pwd=123456;" - //"default": "User ID=postgres;Password=opt!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;" + "default": "Server=127.0.0.1;Database=mh_sms_ops;uid=sa;pwd=123456;" }, "AppSettings": { "DataBaseType": "sqlserver", @@ -18,7 +13,7 @@ "WebSocketPort": "3140", "ConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212" + "TenantConnKey": "MHSMS" }, "RedisConfig": { "RedisConnectionString": "120.25.146.51:6379", diff --git a/APT.MicroApi/APT.FO.WebApi/appsettings.Development.json b/APT.MicroApi/APT.FO.WebApi/appsettings.Development.json index 7dcb8d3..3ad4fa1 100644 --- a/APT.MicroApi/APT.FO.WebApi/appsettings.Development.json +++ b/APT.MicroApi/APT.FO.WebApi/appsettings.Development.json @@ -13,10 +13,10 @@ "ConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetDbConn", "AllConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetAllDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212" + "TenantConnKey": "MHSMS" }, "RedisConfig": { - "RedisConnectionString": "172.21.157.142:6379,password=mhsaferedis", + "RedisConnectionString": "172.21.157.142:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true } } diff --git a/APT.MicroApi/APT.FO.WebApi/appsettings.Pdev.json b/APT.MicroApi/APT.FO.WebApi/appsettings.Pdev.json index 9cb11d4..0f3a754 100644 --- a/APT.MicroApi/APT.FO.WebApi/appsettings.Pdev.json +++ b/APT.MicroApi/APT.FO.WebApi/appsettings.Pdev.json @@ -24,7 +24,7 @@ "Img_Local": "C:\\release\\img" }, "RedisConfig": { - "RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis", + "RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.FO.WebApi/appsettings.Production.json b/APT.MicroApi/APT.FO.WebApi/appsettings.Production.json index b151cd0..827ed55 100644 --- a/APT.MicroApi/APT.FO.WebApi/appsettings.Production.json +++ b/APT.MicroApi/APT.FO.WebApi/appsettings.Production.json @@ -19,11 +19,11 @@ "ConnApiUrl": "http://172.26.13.0:3116/api/OP/TenantInfo/GetDbConn", "AllConnApiUrl": "http://172.26.13.0:3116/api/OP/TenantInfo/GetAllDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212", + "TenantConnKey": "MHSMS", "Img_Local": "C:\\release\\img" }, "RedisConfig": { - "RedisConnectionString": "172.26.13.0:6379,password=mhsaferedis", + "RedisConnectionString": "172.26.13.0:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.FO.WebApi/appsettings.Test.json b/APT.MicroApi/APT.FO.WebApi/appsettings.Test.json index 5e9f58f..abe1853 100644 --- a/APT.MicroApi/APT.FO.WebApi/appsettings.Test.json +++ b/APT.MicroApi/APT.FO.WebApi/appsettings.Test.json @@ -14,10 +14,10 @@ "ConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetDbConn", "AllConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetAllDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212" + "TenantConnKey": "MHSMS" }, "RedisConfig": { - "RedisConnectionString": "47.122.43.22:6379,password=mhsaferedis", + "RedisConnectionString": "47.122.43.22:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.FO.WebApi/appsettings.json b/APT.MicroApi/APT.FO.WebApi/appsettings.json index 9094b16..b38dd19 100644 --- a/APT.MicroApi/APT.FO.WebApi/appsettings.json +++ b/APT.MicroApi/APT.FO.WebApi/appsettings.json @@ -4,7 +4,7 @@ //"default": "Data Source=172.20.8.76:1521/DB2;User Id=\"dbo\";Password=mssqas;Pooling=false;PERSIST SECURITY INFO=True;" //"default": "Data Source=172.20.8.83:1521/DB2;User Id=\"dbo\";Password=mssuat;Pooling=false;PERSIST SECURITY INFO=True;" //"default": "User ID=postgres;Password=ldxmesadm;Host=172.20.8.91;Port=5432;Database=mes;CommandTimeout=1024;" - "default": "Server=127.0.0.1;Database=mh_ops;uid=sa;pwd=123456;" + "default": "Server=127.0.0.1;Database=mh_sms_ops;uid=sa;pwd=123456;" //"default": "User ID=postgres;Password=opt!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;" }, "AppSettings": { @@ -18,7 +18,7 @@ "WebSocketPort": "3140", "ConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212", + "TenantConnKey": "MHSMS", "Img_Local": "C:\\release\\img" }, "RedisConfig": { diff --git a/APT.MicroApi/APT.HM.WebApi/appsettings.Development.json b/APT.MicroApi/APT.HM.WebApi/appsettings.Development.json index 3f29bc1..044c534 100644 --- a/APT.MicroApi/APT.HM.WebApi/appsettings.Development.json +++ b/APT.MicroApi/APT.HM.WebApi/appsettings.Development.json @@ -13,10 +13,10 @@ "ConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetDbConn", "AllConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetAllDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212" + "TenantConnKey": "MHSMS" }, "RedisConfig": { - "RedisConnectionString": "172.21.157.142:6379,password=mhsaferedis", + "RedisConnectionString": "172.21.157.142:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.HM.WebApi/appsettings.Pdev.json b/APT.MicroApi/APT.HM.WebApi/appsettings.Pdev.json index cefb9a2..a621ebc 100644 --- a/APT.MicroApi/APT.HM.WebApi/appsettings.Pdev.json +++ b/APT.MicroApi/APT.HM.WebApi/appsettings.Pdev.json @@ -23,7 +23,7 @@ "Env": "1" //1�����IP��Ĭ��0 �ڻ�IP }, "RedisConfig": { - "RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis", + "RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.HM.WebApi/appsettings.Production.json b/APT.MicroApi/APT.HM.WebApi/appsettings.Production.json index 7713a85..93627de 100644 --- a/APT.MicroApi/APT.HM.WebApi/appsettings.Production.json +++ b/APT.MicroApi/APT.HM.WebApi/appsettings.Production.json @@ -19,10 +19,10 @@ "ConnApiUrl": "http://172.26.13.0:3116/api/OP/TenantInfo/GetDbConn", "AllConnApiUrl": "http://172.26.13.0:3116/api/OP/TenantInfo/GetAllDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212" + "TenantConnKey": "MHSMS" }, "RedisConfig": { - "RedisConnectionString": "172.26.13.0:6379,password=mhsaferedis", + "RedisConnectionString": "172.26.13.0:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.HM.WebApi/appsettings.Test.json b/APT.MicroApi/APT.HM.WebApi/appsettings.Test.json index 002aa20..f77509a 100644 --- a/APT.MicroApi/APT.HM.WebApi/appsettings.Test.json +++ b/APT.MicroApi/APT.HM.WebApi/appsettings.Test.json @@ -13,10 +13,10 @@ "ConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetDbConn", "AllConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetAllDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212" + "TenantConnKey": "MHSMS" }, "RedisConfig": { - "RedisConnectionString": "47.122.43.22:6379,password=mhsaferedis", + "RedisConnectionString": "47.122.43.22:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.HM.WebApi/appsettings.json b/APT.MicroApi/APT.HM.WebApi/appsettings.json index 86be131..8bbe309 100644 --- a/APT.MicroApi/APT.HM.WebApi/appsettings.json +++ b/APT.MicroApi/APT.HM.WebApi/appsettings.json @@ -4,7 +4,7 @@ //"default": "Data Source=172.20.8.76:1521/DB2;User Id=\"dbo\";Password=mssqas;Pooling=false;PERSIST SECURITY INFO=True;" //"default": "Data Source=172.20.8.83:1521/DB2;User Id=\"dbo\";Password=mssuat;Pooling=false;PERSIST SECURITY INFO=True;" //"default": "User ID=postgres;Password=ldxmesadm;Host=172.20.8.91;Port=5432;Database=mes;CommandTimeout=1024;" - "default": "Server=127.0.0.1;Database=mh_ops;uid=sa;pwd=123456;" + "default": "Server=127.0.0.1;Database=mh_sms_ops;uid=sa;pwd=123456;" //"default": "User ID=postgres;Password=opt!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;" }, "AppSettings": { @@ -18,7 +18,7 @@ "WebSocketPort": "3140", "ConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212" + "TenantConnKey": "MHSMS" }, "RedisConfig": { "RedisConnectionString": "120.25.146.51:6379", diff --git a/APT.MicroApi/APT.LG.WebApi/appsettings.Development.json b/APT.MicroApi/APT.LG.WebApi/appsettings.Development.json index b1eb8e6..818dc32 100644 --- a/APT.MicroApi/APT.LG.WebApi/appsettings.Development.json +++ b/APT.MicroApi/APT.LG.WebApi/appsettings.Development.json @@ -22,7 +22,7 @@ "TenantConnKey": "test2021" }, "RedisConfig": { - "RedisConnectionString": "172.21.157.142:6379,password=mhsaferedis", + "RedisConnectionString": "172.21.157.142:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.LG.WebApi/appsettings.Pdev.json b/APT.MicroApi/APT.LG.WebApi/appsettings.Pdev.json index 2de8573..981aa43 100644 --- a/APT.MicroApi/APT.LG.WebApi/appsettings.Pdev.json +++ b/APT.MicroApi/APT.LG.WebApi/appsettings.Pdev.json @@ -23,7 +23,7 @@ "Env": "1" //1�����IP��Ĭ��0 �ڻ�IP }, "RedisConfig": { - "RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis", + "RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.LG.WebApi/appsettings.Production.json b/APT.MicroApi/APT.LG.WebApi/appsettings.Production.json index bd88538..7645901 100644 --- a/APT.MicroApi/APT.LG.WebApi/appsettings.Production.json +++ b/APT.MicroApi/APT.LG.WebApi/appsettings.Production.json @@ -19,10 +19,10 @@ "ConnApiUrl": "http://172.26.13.0:3116/api/OP/TenantInfo/GetDbConn", "AllConnApiUrl": "http://172.26.13.0:3116/api/OP/TenantInfo/GetAllDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212" + "TenantConnKey": "MHSMS" }, "RedisConfig": { - "RedisConnectionString": "172.26.13.0:6379,password=mhsaferedis", + "RedisConnectionString": "172.26.13.0:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.LG.WebApi/appsettings.Test.json b/APT.MicroApi/APT.LG.WebApi/appsettings.Test.json index 87bfdeb..ad1be3a 100644 --- a/APT.MicroApi/APT.LG.WebApi/appsettings.Test.json +++ b/APT.MicroApi/APT.LG.WebApi/appsettings.Test.json @@ -22,7 +22,7 @@ "TenantConnKey": "test2021" }, "RedisConfig": { - "RedisConnectionString": "47.122.43.22:6379,password=mhsaferedis", + "RedisConnectionString": "47.122.43.22:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.NW.WebApi/appsettings.Development.json b/APT.MicroApi/APT.NW.WebApi/appsettings.Development.json index d4ce005..cf29e7c 100644 --- a/APT.MicroApi/APT.NW.WebApi/appsettings.Development.json +++ b/APT.MicroApi/APT.NW.WebApi/appsettings.Development.json @@ -19,10 +19,10 @@ "ConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetDbConn", "AllConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetAllDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212" + "TenantConnKey": "MHSMS" }, "RedisConfig": { - "RedisConnectionString": "172.21.157.142:6379,password=mhsaferedis", + "RedisConnectionString": "172.21.157.142:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.NW.WebApi/appsettings.Pdev.json b/APT.MicroApi/APT.NW.WebApi/appsettings.Pdev.json index a37b62d..2bea4fd 100644 --- a/APT.MicroApi/APT.NW.WebApi/appsettings.Pdev.json +++ b/APT.MicroApi/APT.NW.WebApi/appsettings.Pdev.json @@ -23,7 +23,7 @@ "Env": "1" //1�����IP��Ĭ��0 �ڻ�IP }, "RedisConfig": { - "RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis", + "RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.NW.WebApi/appsettings.Production.json b/APT.MicroApi/APT.NW.WebApi/appsettings.Production.json index 0df3a80..2622138 100644 --- a/APT.MicroApi/APT.NW.WebApi/appsettings.Production.json +++ b/APT.MicroApi/APT.NW.WebApi/appsettings.Production.json @@ -19,10 +19,10 @@ "ConnApiUrl": "http://172.26.13.0:3116/api/OP/TenantInfo/GetDbConn", "AllConnApiUrl": "http://172.26.13.0:3116/api/OP/TenantInfo/GetAllDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212" + "TenantConnKey": "MHSMS" }, "RedisConfig": { - "RedisConnectionString": "172.26.13.0:6379,password=mhsaferedis", + "RedisConnectionString": "172.26.13.0:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.NW.WebApi/appsettings.Test.json b/APT.MicroApi/APT.NW.WebApi/appsettings.Test.json index 57accf0..606b2a9 100644 --- a/APT.MicroApi/APT.NW.WebApi/appsettings.Test.json +++ b/APT.MicroApi/APT.NW.WebApi/appsettings.Test.json @@ -19,10 +19,10 @@ "ConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetDbConn", "AllConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetAllDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212" + "TenantConnKey": "MHSMS" }, "RedisConfig": { - "RedisConnectionString": "47.122.43.22:6379,password=mhsaferedis", + "RedisConnectionString": "47.122.43.22:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.NW.WebApi/appsettings.json b/APT.MicroApi/APT.NW.WebApi/appsettings.json index cb087f1..5c81f4b 100644 --- a/APT.MicroApi/APT.NW.WebApi/appsettings.json +++ b/APT.MicroApi/APT.NW.WebApi/appsettings.json @@ -18,7 +18,7 @@ "WebSocketPort": "3140", "ConnApiUrl": "http://localhost:3116/api/OP/Tenant/GetDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212" + "TenantConnKey": "MHSMS" }, "RedisConfig": { "RedisConnectionString": "120.25.146.51:6379", diff --git a/APT.MicroApi/APT.OP.WebApi/Controllers/Api/TenantInfoController.cs b/APT.MicroApi/APT.OP.WebApi/Controllers/Api/TenantInfoController.cs index 2c60450..b9cc1aa 100644 --- a/APT.MicroApi/APT.OP.WebApi/Controllers/Api/TenantInfoController.cs +++ b/APT.MicroApi/APT.OP.WebApi/Controllers/Api/TenantInfoController.cs @@ -118,7 +118,9 @@ namespace APT.BD.WebApi.Controllers.Api //baseFilter.SelectField = new string[] { "Nav_TenantDB.DB_CONN", "ID" }; baseFilter.IgnoreOrgRule = true; var ret = string.Empty; - var tenant = this.GetEntityByRedis(code, Guid.Empty); + // var tenant = this.GetEntityByRedis(code, Guid.Empty); + var tenant = this.GetEntity(t=>t.CODE==code); + if (tenant != null && !string.IsNullOrEmpty(deskey)) { var tenantDb = this.GetEntity(tenant.DB_CONN_ID.ToString()); diff --git a/APT.MicroApi/APT.OP.WebApi/appsettings.Development.json b/APT.MicroApi/APT.OP.WebApi/appsettings.Development.json index 83ba2ce..aaf61a2 100644 --- a/APT.MicroApi/APT.OP.WebApi/appsettings.Development.json +++ b/APT.MicroApi/APT.OP.WebApi/appsettings.Development.json @@ -6,7 +6,7 @@ //"default": "User ID=postgres;Password=ldxmesadm;Host=172.20.8.91;Port=5432;Database=mes;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=localhost;Port=5432;Database=postgres;CommandTimeout=1024;" - "default": "Server=47.122.43.22;Database=mh_ops;uid=sa;pwd=mhsafe!2021;" + "default": "Server=47.122.43.22;Database=mh_sms_ops;uid=sa;pwd=mhsafe!2021;" }, "AppSettings": { @@ -20,11 +20,11 @@ "ConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetDbConn", "AllConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetAllDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212", + "TenantConnKey": "MHSMS", "Firmware_Local": "/mnt/release/firmware" }, "RedisConfig": { - "RedisConnectionString": "172.21.157.142:6379,password=mhsaferedis", + "RedisConnectionString": "172.21.157.142:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.OP.WebApi/appsettings.Pdev.json b/APT.MicroApi/APT.OP.WebApi/appsettings.Pdev.json index 57e5b0d..56bf5e1 100644 --- a/APT.MicroApi/APT.OP.WebApi/appsettings.Pdev.json +++ b/APT.MicroApi/APT.OP.WebApi/appsettings.Pdev.json @@ -1,6 +1,6 @@ { "ConnectionStrings": { - "default": "Server=120.25.146.51;Database=mh_ops;uid=sa;pwd=mhsafe!2021;" + "default": "Server=120.25.146.51;Database=mh_sms_ops;uid=sa;pwd=mhsafe!2021;" }, "AppSettings": { "DataBaseType": "sqlserver", @@ -17,7 +17,7 @@ "Env": "1" //1：外机IP；默认0 内机IP }, "RedisConfig": { - "RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis", + "RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.OP.WebApi/appsettings.Production.json b/APT.MicroApi/APT.OP.WebApi/appsettings.Production.json index fca611c..d63a411 100644 --- a/APT.MicroApi/APT.OP.WebApi/appsettings.Production.json +++ b/APT.MicroApi/APT.OP.WebApi/appsettings.Production.json @@ -1,6 +1,6 @@ { "ConnectionStrings": { - "default": "Server=172.26.13.0;Database=mh_ops;uid=sa;pwd=mhsafe!2021;" + "default": "Server=172.26.13.0;Database=mh_sms_ops;uid=sa;pwd=mhsafe!2021;" }, "AppSettings": { "DataBaseType": "sqlserver", @@ -13,10 +13,10 @@ "ConnApiUrl": "http://172.26.13.0:3116/api/OP/TenantInfo/GetDbConn", "AllConnApiUrl": "http://172.26.13.0:3116/api/OP/TenantInfo/GetAllDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212" + "TenantConnKey": "MHSMS" }, "RedisConfig": { - "RedisConnectionString": "172.26.13.0:6379,password=mhsaferedis", + "RedisConnectionString": "172.26.13.0:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.OP.WebApi/appsettings.Test.json b/APT.MicroApi/APT.OP.WebApi/appsettings.Test.json index f646e4a..8bb3e1b 100644 --- a/APT.MicroApi/APT.OP.WebApi/appsettings.Test.json +++ b/APT.MicroApi/APT.OP.WebApi/appsettings.Test.json @@ -6,7 +6,7 @@ //"default": "User ID=postgres;Password=ldxmesadm;Host=172.20.8.91;Port=5432;Database=mes;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=localhost;Port=5432;Database=postgres;CommandTimeout=1024;" - "default": "Server=47.122.43.22;Database=mh_ops;uid=sa;pwd=mhsafe!2021;" + "default": "Server=47.122.43.22;Database=mh_sms_ops;uid=sa;pwd=mhsafe!2021;" }, "AppSettings": { @@ -20,11 +20,11 @@ "ConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetDbConn", "AllConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetAllDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212", + "TenantConnKey": "MHSMS", "Firmware_Local": "/mnt/release/firmware" }, "RedisConfig": { - "RedisConnectionString": "47.122.43.22:6379,password=mhsaferedis", + "RedisConnectionString": "47.122.43.22:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.OP.WebApi/appsettings.json b/APT.MicroApi/APT.OP.WebApi/appsettings.json index ae02562..9410a29 100644 --- a/APT.MicroApi/APT.OP.WebApi/appsettings.json +++ b/APT.MicroApi/APT.OP.WebApi/appsettings.json @@ -5,7 +5,7 @@ //"default": "Data Source=172.20.8.83:1521/DB2;User Id=\"dbo\";Password=mssuat;Pooling=false;PERSIST SECURITY INFO=True;" //"default": "User ID=postgres;Password=ldxmesadm;Host=172.20.8.91;Port=5432;Database=mes;CommandTimeout=1024;" //"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;" - "default": "Server=172.26.2.243;Database=mh_ops;uid=sa;pwd=mhsafe!2021;" //��ʽ���� + "default": "Server=172.26.2.243;Database=mh_sms_ops;uid=sa;pwd=mhsafe!2021;" //��ʽ���� }, "AppSettings": { @@ -18,7 +18,7 @@ "WebSocketPort": "3140", "ConnApiUrl": "http://36.134.166.114:3116/api/OP/TenantInfo/GetDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212", + "TenantConnKey": "MHSMS", "Firmware_Local": "/mnt/release/firmware" }, "RedisConfig": { diff --git a/APT.MicroApi/APT.PF.WebApi/appsettings.Development.json b/APT.MicroApi/APT.PF.WebApi/appsettings.Development.json index c93a6dc..8a68e8a 100644 --- a/APT.MicroApi/APT.PF.WebApi/appsettings.Development.json +++ b/APT.MicroApi/APT.PF.WebApi/appsettings.Development.json @@ -1,12 +1,6 @@ { "ConnectionStrings": { - //"default": "Database=test20211;Data Source=36.133.75.96;Port=3306;User Id=root;Password=opt!energy;TreatTinyAsBoolean=true;", - //"default": "Data Source=172.20.8.76:1521/DB2;User Id=\"dbo\";Password=mssqas;Pooling=false;PERSIST SECURITY INFO=True;" - //"default": "Data Source=172.20.8.83:1521/DB2;User Id=\"dbo\";Password=mssuat;Pooling=false;PERSIST SECURITY INFO=True;" - //"default": "User ID=postgres;Password=ldxmesadm;Host=172.20.8.91;Port=5432;Database=mes;CommandTimeout=1024;" - //"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;" - //"default": "User ID=postgres;Password=opt!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;" - "default": "Server=47.122.43.22;Database=mh_ops;uid=sa;pwd=mhsafe!2021;" //��ʽ���� + "default": "Server=47.122.43.22;Database=mh_sms_ops;uid=sa;pwd=mhsafe!2021;" //��ʽ���� }, "AppSettings": { "DataBaseType": "sqlserver", @@ -19,12 +13,12 @@ "ConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetDbConn", "AllConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetAllDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212", + "TenantConnKey": "MHSMS", "RedisFormConfig": "false", "Img_Local": "D:\\uploadFile" }, "RedisConfig": { - "RedisConnectionString": "172.21.157.142:6379,password=mhsaferedis", + "RedisConnectionString": "172.21.157.142:6379,password=mhsaferedis,defaultDatabase=15", "RedisConnectionPwd": "mhsaferedis", "IsRedis": true }, diff --git a/APT.MicroApi/APT.PF.WebApi/appsettings.Pdev.json b/APT.MicroApi/APT.PF.WebApi/appsettings.Pdev.json index c381600..3d5b454 100644 --- a/APT.MicroApi/APT.PF.WebApi/appsettings.Pdev.json +++ b/APT.MicroApi/APT.PF.WebApi/appsettings.Pdev.json @@ -1,13 +1,6 @@ { "ConnectionStrings": { - //"default": "Database=test20211;Data Source=36.133.75.96;Port=3306;User Id=root;Password=dfdn!energy;TreatTinyAsBoolean=true;", - //"default": "Data Source=172.20.8.76:1521/DB2;User Id=\"dbo\";Password=mssqas;Pooling=false;PERSIST SECURITY INFO=True;" - //"default": "Data Source=172.20.8.83:1521/DB2;User Id=\"dbo\";Password=mssuat;Pooling=false;PERSIST SECURITY INFO=True;" - //"default": "User ID=postgres;Password=ldxmesadm;Host=172.20.8.91;Port=5432;Database=mes;CommandTimeout=1024;" - //"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;" - //"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=test2021;CommandTimeout=1024;" - //"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;" - "default": "Server=120.25.146.51;Database=mh_ops;uid=sa;pwd=mhsafe!2021;" //��ʽ���� + "default": "Server=120.25.146.51;Database=mh_sms_ops;uid=sa;pwd=mhsafe!2021;" //��ʽ���� }, "AppSettings": { "DataBaseType": "sqlserver", @@ -26,7 +19,7 @@ "Img_Local": "C:\\release\\img" }, "RedisConfig": { - "RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis", + "RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis,defaultDatabase=15", "RedisConnectionPwd": "mhsaferedis", "IsRedis": true }, diff --git a/APT.MicroApi/APT.PF.WebApi/appsettings.Production.json b/APT.MicroApi/APT.PF.WebApi/appsettings.Production.json index 828fb42..731086c 100644 --- a/APT.MicroApi/APT.PF.WebApi/appsettings.Production.json +++ b/APT.MicroApi/APT.PF.WebApi/appsettings.Production.json @@ -1,13 +1,6 @@ { "ConnectionStrings": { - //"default": "Database=test20211;Data Source=36.133.75.96;Port=3306;User Id=root;Password=dfdn!energy;TreatTinyAsBoolean=true;", - //"default": "Data Source=172.20.8.76:1521/DB2;User Id=\"dbo\";Password=mssqas;Pooling=false;PERSIST SECURITY INFO=True;" - //"default": "Data Source=172.20.8.83:1521/DB2;User Id=\"dbo\";Password=mssuat;Pooling=false;PERSIST SECURITY INFO=True;" - //"default": "User ID=postgres;Password=ldxmesadm;Host=172.20.8.91;Port=5432;Database=mes;CommandTimeout=1024;" - //"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;" - //"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=test2021;CommandTimeout=1024;" - //"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;" - "default": "Server=172.26.13.0;Database=mh_ops;uid=sa;pwd=mhsafe!2021;" //��ʽ���� + "default": "Server=172.26.13.0;Database=mh_sms_ops;uid=sa;pwd=mhsafe!2021;" //��ʽ���� }, "AppSettings": { "DataBaseType": "sqlserver", @@ -20,12 +13,12 @@ "ConnApiUrl": "http://172.26.13.0:3116/api/OP/TenantInfo/GetDbConn", "AllConnApiUrl": "http://172.26.13.0:3116/api/OP/TenantInfo/GetAllDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212", + "TenantConnKey": "MHSMS", "RedisFormConfig": "true", "Img_Local": "C:\\release\\img" }, "RedisConfig": { - "RedisConnectionString": "172.26.13.0:6379,password=mhsaferedis", + "RedisConnectionString": "172.26.13.0:6379,password=mhsaferedis,defaultDatabase=15", "RedisConnectionPwd": "mhsaferedis", "IsRedis": true }, diff --git a/APT.MicroApi/APT.PF.WebApi/appsettings.Test.json b/APT.MicroApi/APT.PF.WebApi/appsettings.Test.json index d3a9c4f..e04619d 100644 --- a/APT.MicroApi/APT.PF.WebApi/appsettings.Test.json +++ b/APT.MicroApi/APT.PF.WebApi/appsettings.Test.json @@ -1,12 +1,6 @@ { "ConnectionStrings": { - //"default": "Database=test20211;Data Source=36.133.75.96;Port=3306;User Id=root;Password=opt!energy;TreatTinyAsBoolean=true;", - //"default": "Data Source=172.20.8.76:1521/DB2;User Id=\"dbo\";Password=mssqas;Pooling=false;PERSIST SECURITY INFO=True;" - //"default": "Data Source=172.20.8.83:1521/DB2;User Id=\"dbo\";Password=mssuat;Pooling=false;PERSIST SECURITY INFO=True;" - //"default": "User ID=postgres;Password=ldxmesadm;Host=172.20.8.91;Port=5432;Database=mes;CommandTimeout=1024;" - //"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;" - //"default": "User ID=postgres;Password=opt!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;" - "default": "Server=47.122.43.22;Database=mh_ops;uid=sa;pwd=mhsafe!2021;" //��ʽ���� + "default": "Server=47.122.43.22;Database=mh_sms_ops;uid=sa;pwd=mhsafe!2021;" //��ʽ���� }, "AppSettings": { "DataBaseType": "sqlserver", @@ -16,15 +10,16 @@ "isSqlLog": "false", "IdentityServer": "http://47.122.43.22:3153/", "WebSocketPort": "3140", - "ConnApiUrl": "http://47.122.43.22:3116/api/OP/TenantInfo/GetDbConn", - "AllConnApiUrl": "http://47.122.43.22:3116/api/OP/TenantInfo/GetAllDbConn", + "ConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetDbConn", + "AllConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetAllDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212", + "TenantConnKey": "MHSMS", "RedisFormConfig": "false", + "Env": "1", //外网IP 0：内网IP "Img_Local": "D:\\uploadFile" }, "RedisConfig": { - "RedisConnectionString": "47.122.43.22:6379,password=mhsaferedis", + "RedisConnectionString": "47.122.43.22:6379,password=mhsaferedis,defaultDatabase=15", "RedisConnectionPwd": "mhsaferedis", "IsRedis": true }, diff --git a/APT.MicroApi/APT.PF.WebApi/appsettings.json b/APT.MicroApi/APT.PF.WebApi/appsettings.json index a34e01a..575783f 100644 --- a/APT.MicroApi/APT.PF.WebApi/appsettings.json +++ b/APT.MicroApi/APT.PF.WebApi/appsettings.json @@ -1,14 +1,9 @@ { "ConnectionStrings": { - //"default": "Database=test20211;Data Source=36.133.75.96;Port=3306;User Id=root;Password=opt!energy;TreatTinyAsBoolean=true;", - //"default": "Data Source=172.20.8.76:1521/DB2;User Id=\"dbo\";Password=mssqas;Pooling=false;PERSIST SECURITY INFO=True;" - //"default": "Data Source=172.20.8.83:1521/DB2;User Id=\"dbo\";Password=mssuat;Pooling=false;PERSIST SECURITY INFO=True;" - //"default": "User ID=postgres;Password=ldxmesadm;Host=172.20.8.91;Port=5432;Database=mes;CommandTimeout=1024;" - //"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;" //"default": "Server=127.0.0.1;Database=mh_ops;uid=sa;pwd=wjn123;" }, "AppSettings": { - "DataBaseType": "sqlserver", //���ݿ�����,1=sql��2=mysql��3=oracle 4=sqlserver + "DataBaseType": "sqlserver", "ClientId": "oEnergyUsers", "SecurityKey": "MGRmYjc3ODg4ZDQ2NDE0ZTkxZWNiZjcxNjY1NTIwMWQ=", "Scope": "oEnergyPF", @@ -18,7 +13,7 @@ "ConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetDbConn", "RedisFormConfig": "false", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212", + "TenantConnKey": "MHSMS", "Img_Local": "D:\\uploadFile" }, "RedisConfig": { diff --git a/APT.MicroApi/APT.PP.WebApi/appsettings.Development.json b/APT.MicroApi/APT.PP.WebApi/appsettings.Development.json index b1d877a..a53f292 100644 --- a/APT.MicroApi/APT.PP.WebApi/appsettings.Development.json +++ b/APT.MicroApi/APT.PP.WebApi/appsettings.Development.json @@ -14,10 +14,10 @@ "ConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetDbConn", "AllConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetAllDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212" + "TenantConnKey": "MHSMS" }, "RedisConfig": { - "RedisConnectionString": "172.21.157.142:6379,password=mhsaferedis", + "RedisConnectionString": "172.21.157.142:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.PP.WebApi/appsettings.Pdev.json b/APT.MicroApi/APT.PP.WebApi/appsettings.Pdev.json index 8a9dfe0..052eee9 100644 --- a/APT.MicroApi/APT.PP.WebApi/appsettings.Pdev.json +++ b/APT.MicroApi/APT.PP.WebApi/appsettings.Pdev.json @@ -24,7 +24,7 @@ "Env": "1" //1�����IP��Ĭ��0 �ڻ�IP }, "RedisConfig": { - "RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis", + "RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.PP.WebApi/appsettings.Production.json b/APT.MicroApi/APT.PP.WebApi/appsettings.Production.json index 7670b00..fad6593 100644 --- a/APT.MicroApi/APT.PP.WebApi/appsettings.Production.json +++ b/APT.MicroApi/APT.PP.WebApi/appsettings.Production.json @@ -20,10 +20,10 @@ "ConnApiUrl": "http://172.26.13.0:3116/api/OP/TenantInfo/GetDbConn", "AllConnApiUrl": "http://172.26.13.0:3116/api/OP/TenantInfo/GetAllDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212" + "TenantConnKey": "MHSMS" }, "RedisConfig": { - "RedisConnectionString": "172.26.13.0:6379,password=mhsaferedis", + "RedisConnectionString": "172.26.13.0:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.PP.WebApi/appsettings.Test.json b/APT.MicroApi/APT.PP.WebApi/appsettings.Test.json index b8823de..bf4d4fc 100644 --- a/APT.MicroApi/APT.PP.WebApi/appsettings.Test.json +++ b/APT.MicroApi/APT.PP.WebApi/appsettings.Test.json @@ -14,10 +14,10 @@ "ConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetDbConn", "AllConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetAllDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212" + "TenantConnKey": "MHSMS" }, "RedisConfig": { - "RedisConnectionString": "47.122.43.22:6379,password=mhsaferedis", + "RedisConnectionString": "47.122.43.22:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.PP.WebApi/appsettings.json b/APT.MicroApi/APT.PP.WebApi/appsettings.json index 25d8df3..5fa8977 100644 --- a/APT.MicroApi/APT.PP.WebApi/appsettings.json +++ b/APT.MicroApi/APT.PP.WebApi/appsettings.json @@ -18,7 +18,7 @@ "WebSocketPort": "3140", "ConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212" + "TenantConnKey": "MHSMS" }, "RedisConfig": { "RedisConnectionString": "120.25.146.51:6379", diff --git a/APT.MicroApi/APT.SC.WebApi/appsettings.Development.json b/APT.MicroApi/APT.SC.WebApi/appsettings.Development.json index d41639c..4425a84 100644 --- a/APT.MicroApi/APT.SC.WebApi/appsettings.Development.json +++ b/APT.MicroApi/APT.SC.WebApi/appsettings.Development.json @@ -14,10 +14,10 @@ "ConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetDbConn", "AllConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetAllDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212" + "TenantConnKey": "MHSMS" }, "RedisConfig": { - "RedisConnectionString": "172.21.157.142:6379,password=mhsaferedis", + "RedisConnectionString": "172.21.157.142:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.SC.WebApi/appsettings.Pdev.json b/APT.MicroApi/APT.SC.WebApi/appsettings.Pdev.json index be0aced..7b73045 100644 --- a/APT.MicroApi/APT.SC.WebApi/appsettings.Pdev.json +++ b/APT.MicroApi/APT.SC.WebApi/appsettings.Pdev.json @@ -24,7 +24,7 @@ "Env": "1" //1：外机IP；默认0 内机IP }, "RedisConfig": { - "RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis", + "RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.SC.WebApi/appsettings.Production.json b/APT.MicroApi/APT.SC.WebApi/appsettings.Production.json index c665a6a..9858a00 100644 --- a/APT.MicroApi/APT.SC.WebApi/appsettings.Production.json +++ b/APT.MicroApi/APT.SC.WebApi/appsettings.Production.json @@ -20,10 +20,10 @@ "ConnApiUrl": "http://172.26.13.0:3116/api/OP/TenantInfo/GetDbConn", "AllConnApiUrl": "http://172.26.13.0:3116/api/OP/TenantInfo/GetAllDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212" + "TenantConnKey": "MHSMS" }, "RedisConfig": { - "RedisConnectionString": "172.26.13.0:6379,password=mhsaferedis", + "RedisConnectionString": "172.26.13.0:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.SC.WebApi/appsettings.Test.json b/APT.MicroApi/APT.SC.WebApi/appsettings.Test.json index 1e70618..869c3f1 100644 --- a/APT.MicroApi/APT.SC.WebApi/appsettings.Test.json +++ b/APT.MicroApi/APT.SC.WebApi/appsettings.Test.json @@ -14,10 +14,10 @@ "ConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetDbConn", "AllConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetAllDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212" + "TenantConnKey": "MHSMS" }, "RedisConfig": { - "RedisConnectionString": "47.122.43.22:6379,password=mhsaferedis", + "RedisConnectionString": "47.122.43.22:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.SC.WebApi/appsettings.json b/APT.MicroApi/APT.SC.WebApi/appsettings.json index f6c3df7..818772b 100644 --- a/APT.MicroApi/APT.SC.WebApi/appsettings.json +++ b/APT.MicroApi/APT.SC.WebApi/appsettings.json @@ -18,7 +18,7 @@ "WebSocketPort": "3140", "ConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212" + "TenantConnKey": "MHSMS" }, "RedisConfig": { "RedisConnectionString": "120.25.146.51:6379", diff --git a/APT.MicroApi/APT.UT.WebApi/appsettings.Development.json b/APT.MicroApi/APT.UT.WebApi/appsettings.Development.json index b535490..7d40a4a 100644 --- a/APT.MicroApi/APT.UT.WebApi/appsettings.Development.json +++ b/APT.MicroApi/APT.UT.WebApi/appsettings.Development.json @@ -18,10 +18,10 @@ "WebSocketPort": "3140", "ConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212" + "TenantConnKey": "MHSMS" }, "RedisConfig": { - "RedisConnectionString": "172.21.157.142:6379,password=mhsaferedis", + "RedisConnectionString": "172.21.157.142:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.UT.WebApi/appsettings.Pdev.json b/APT.MicroApi/APT.UT.WebApi/appsettings.Pdev.json index de66d8c..71e0661 100644 --- a/APT.MicroApi/APT.UT.WebApi/appsettings.Pdev.json +++ b/APT.MicroApi/APT.UT.WebApi/appsettings.Pdev.json @@ -16,7 +16,7 @@ "Env": "1" //1�����IP��Ĭ��0 �ڻ�IP }, "RedisConfig": { - "RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis", + "RedisConnectionString": "120.25.146.51:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true } } \ No newline at end of file diff --git a/APT.MicroApi/APT.UT.WebApi/appsettings.Production.json b/APT.MicroApi/APT.UT.WebApi/appsettings.Production.json index 944b920..8171e72 100644 --- a/APT.MicroApi/APT.UT.WebApi/appsettings.Production.json +++ b/APT.MicroApi/APT.UT.WebApi/appsettings.Production.json @@ -12,10 +12,10 @@ "ConnApiUrl": "http://172.26.13.0:3116/api/OP/TenantInfo/GetDbConn", "AllConnApiUrl": "http://172.26.13.0:3116/api/OP/TenantInfo/GetAllDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212" + "TenantConnKey": "MHSMS" }, "RedisConfig": { - "RedisConnectionString": "172.26.13.0:6379,password=mhsaferedis", + "RedisConnectionString": "172.26.13.0:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true } } \ No newline at end of file diff --git a/APT.MicroApi/APT.UT.WebApi/appsettings.Test.json b/APT.MicroApi/APT.UT.WebApi/appsettings.Test.json index 8b968fd..cbba167 100644 --- a/APT.MicroApi/APT.UT.WebApi/appsettings.Test.json +++ b/APT.MicroApi/APT.UT.WebApi/appsettings.Test.json @@ -18,10 +18,10 @@ "WebSocketPort": "3140", "ConnApiUrl": "http://localhost:3116/api/OP/TenantInfo/GetDbConn", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212" + "TenantConnKey": "MHSMS" }, "RedisConfig": { - "RedisConnectionString": "47.122.43.22:6379,password=mhsaferedis", + "RedisConnectionString": "47.122.43.22:6379,password=mhsaferedis,defaultDatabase=15", "IsRedis": true }, "InflexdbConfig": { diff --git a/APT.MicroApi/APT.UT.WebApi/appsettings.json b/APT.MicroApi/APT.UT.WebApi/appsettings.json index 30d324a..669a337 100644 --- a/APT.MicroApi/APT.UT.WebApi/appsettings.json +++ b/APT.MicroApi/APT.UT.WebApi/appsettings.json @@ -17,7 +17,7 @@ "IdentityServer": "http://36.133.75.96:3153/", "WebSocketPort": "3140", "ConnDataKey": "MHKSAQ1212010101", - "TenantConnKey": "MHKSAQ1212" + "TenantConnKey": "MHSMS" }, "RedisConfig": { "RedisConnectionString": "120.25.146.51:6379",