diff --git a/apihost/Tnb.API.Entry/Configurations/App.json b/apihost/Tnb.API.Entry/Configurations/App.json index 24b8f446..136f83e5 100644 --- a/apihost/Tnb.API.Entry/Configurations/App.json +++ b/apihost/Tnb.API.Entry/Configurations/App.json @@ -2,7 +2,7 @@ "JNPF_App": { "CodeAreasName": [ "SubDev" ], //系统文件路径 - "SystemPath": "D:\\cosmoplat\\tnb\\Resources", + "SystemPath": "D:\\ToTong\\tnb\\Resources", //微信公众号允许上传文件类型 "MPUploadFileType": [ "bmp", @@ -102,7 +102,7 @@ // 软件的错误报告 "ErrorReport": false, //软件的错误报告发给谁 - "ErrorReportTo": "" + "ErrorReportTo": "tuotong_tech@163.com" }, // ================== 单点登录配置(和其他登录方式 只能二选一) ============================== --> "OAuth": { diff --git a/apihost/Tnb.API.Entry/Configurations/Cache.json b/apihost/Tnb.API.Entry/Configurations/Cache.json index 69116fb8..dadb1be5 100644 --- a/apihost/Tnb.API.Entry/Configurations/Cache.json +++ b/apihost/Tnb.API.Entry/Configurations/Cache.json @@ -4,7 +4,7 @@ "ip": "localhost", "port": 6379, "password": "05jWEoJa8v", - "RedisConnectionString": "{0}:{1},password={2}, poolsize=500,ssl=false,defaultDatabase=7" + "RedisConnectionString": "{0}:{1},password={2}, poolsize=500,ssl=false,defaultDatabase=0" }, "Redis": { "ip": "localhost", diff --git a/apihost/Tnb.API.Entry/Configurations/ConnectionStrings.json b/apihost/Tnb.API.Entry/Configurations/ConnectionStrings.json index 0b2221b2..b9d5c954 100644 --- a/apihost/Tnb.API.Entry/Configurations/ConnectionStrings.json +++ b/apihost/Tnb.API.Entry/Configurations/ConnectionStrings.json @@ -1,24 +1,16 @@ { "ConnectionStrings": { "ConfigId": "default", - "DBType": "MySql", //MySql;SqlServer;Oracle;PostgreSQL;Dm;Kdbndp;Sqlite; -<<<<<<< HEAD - "Host": "127.0.0.1",//"10.67.53.241", -======= + "DBType": "PostgreSQL", //MySql;SqlServer;Oracle;PostgreSQL;Dm;Kdbndp;Sqlite; "Host": "localhost", ->>>>>>> aec1d3b15533e5faafe3b2294830b095cff93f2d - "Port": "3306", + //"Host": "127.0.0.1", + "Port": "5432", //"DBName": "tianyi_db", //"UserName": "postgres", //"Password": "pass@word123", - "DBName": "xinte_cloud", -<<<<<<< HEAD - "UserName": "root",//"totong", - "Password": "root",//"+vKyHUbtxQ", -======= - "UserName": "totong", - "Password": "+vKyHUbtxQ", ->>>>>>> aec1d3b15533e5faafe3b2294830b095cff93f2d + "DBName": "tianyi", + "UserName": "postgres", + "Password": "pass@word123", //SqlServer //"DefaultConnection": "server={0},{1};database={2};uid={3};pwd={4};MultipleActiveResultSets=true" //Kdbndp diff --git a/apihost/Tnb.API.Entry/Configurations/ElevatorControlSettings.json b/apihost/Tnb.API.Entry/Configurations/ElevatorControlSettings.json index 80c31cd7..2ffda1d4 100644 --- a/apihost/Tnb.API.Entry/Configurations/ElevatorControlSettings.json +++ b/apihost/Tnb.API.Entry/Configurations/ElevatorControlSettings.json @@ -2,9 +2,10 @@ "DevName3": "Elevator3", "DevName4": "Elevator4", "HeartbeatDevNames": [ "Elevator3", "Elevator4" ], + "tags": [ "SysStatus", "RunStatus", "FloorNo", "DoorStatus", "AGVStatus" ], "token": "780BE4144636CF47DDF3920B0F1D069B", "GetTagListUrl": "http://192.168.11.110:9100/Dev/GetTagList", "GetTagUrl": "http://192.168.11.110:9100/Dev/GetTag", "WriteTagUrl": "http://192.168.11.110:9100/Dev/writeTag", - "Environment": "" + "Environment": "tianyi" } \ No newline at end of file diff --git a/apihost/Tnb.API.Entry/Configurations/JWT.json b/apihost/Tnb.API.Entry/Configurations/JWT.json index f8022a93..cf2e1415 100644 --- a/apihost/Tnb.API.Entry/Configurations/JWT.json +++ b/apihost/Tnb.API.Entry/Configurations/JWT.json @@ -3,9 +3,9 @@ "ValidateIssuerSigningKey": true, // 是否验证密钥，bool 类型，默认true "IssuerSigningKey": "RkayGi4ltkMWrSQKsQTWic1VnakqsQfaJOmJIBUWE1gxGaS0IrJHxa9anjVAwuew", // 密钥，string 类型，必须是复杂密钥，长度大于16 "ValidateIssuer": true, // 是否验证签发方，bool 类型，默认true - "ValidIssuer": "cosmoplat", // 签发方，string 类型 + "ValidIssuer": "tuotong", // 签发方，string 类型 "ValidateAudience": true, // 是否验证签收方，bool 类型，默认true - "ValidAudience": "cosmoplat", // 签收方，string 类型 + "ValidAudience": "tuotong", // 签收方，string 类型 "ValidateLifetime": true, // 是否验证过期时间，bool 类型，默认true，建议true "ExpiredTime": 1440, // 过期时间，long 类型，单位分钟，默认20分钟 "ClockSkew": 5 // 过期时间容错值，long 类型，单位秒，默认5秒 diff --git a/apihost/Tnb.API.Entry/Configurations/JobConnectionStrings.json b/apihost/Tnb.API.Entry/Configurations/JobConnectionStrings.json index aa92ddf2..e2bd3d1e 100644 --- a/apihost/Tnb.API.Entry/Configurations/JobConnectionStrings.json +++ b/apihost/Tnb.API.Entry/Configurations/JobConnectionStrings.json @@ -1,6 +1,6 @@ { "JobConnectionStrings": { - "ConfigId": "JNPF-Job",// 不可修改 + "ConfigId": "JNPF-Job", // 不可修改 "DBName": "jnpf_sundial", "DBType": "SqlServer", //MySql;SqlServer;Oracle;PostgreSQL;Dm;Kdbndp;Sqlite; "Host": "192.168.0.214", diff --git a/apihost/Tnb.API.Entry/Configurations/OSS.json b/apihost/Tnb.API.Entry/Configurations/OSS.json index d5da5089..54fcbe99 100644 --- a/apihost/Tnb.API.Entry/Configurations/OSS.json +++ b/apihost/Tnb.API.Entry/Configurations/OSS.json @@ -1,6 +1,6 @@ { "OSS": { - "BucketName": "cosmoplatoss", + "BucketName": "jnpfsoftoss", //文件存储类型(Invalid(本地),MinIo,Aliyun,QCloud,Qiniu) "Provider": "Invalid", "Endpoint": "192.168.0.60:9000", diff --git a/apihost/Tnb.API.Entry/Configurations/Swagger.json b/apihost/Tnb.API.Entry/Configurations/Swagger.json index 0fcbfdb0..9f45fc4e 100644 --- a/apihost/Tnb.API.Entry/Configurations/Swagger.json +++ b/apihost/Tnb.API.Entry/Configurations/Swagger.json @@ -1,12 +1,12 @@ { "SpecificationDocumentSettings": { - "DocumentTitle": "Cosmoplat Next Builder", + "DocumentTitle": "ToTong Next Builder", "DocExpansionState": "None", "RoutePrefix": "swagger", "GroupOpenApiInfos": [ { "Group": "Default", - "Title": "Cosmoplat Next Builder", + "Title": "ToTong Next Builder", "Description": "", "Version": "3.4.6" } diff --git a/apihost/Tnb.API.Entry/Configurations/Tenant.json b/apihost/Tnb.API.Entry/Configurations/Tenant.json index 32e3029f..f8ca747a 100644 --- a/apihost/Tnb.API.Entry/Configurations/Tenant.json +++ b/apihost/Tnb.API.Entry/Configurations/Tenant.json @@ -1,7 +1,7 @@ { "Tenant": { "MultiTenancy": false, - "MultiTenancyDBInterFace": "", + "MultiTenancyDBInterFace": "http://www.tuotong-tech.com/api/Saas/Tenant/DbContent/", "MultiTenancyType": "" } } \ No newline at end of file