合并
This commit is contained in:
@@ -1,16 +1,24 @@
|
||||
{
|
||||
"ConnectionStrings": {
|
||||
"ConfigId": "default",
|
||||
"DBType": "PostgreSQL", //MySql;SqlServer;Oracle;PostgreSQL;Dm;Kdbndp;Sqlite;
|
||||
"DBType": "MySql", //MySql;SqlServer;Oracle;PostgreSQL;Dm;Kdbndp;Sqlite;
|
||||
<<<<<<< HEAD
|
||||
"Host": "127.0.0.1",//"10.67.53.241",
|
||||
=======
|
||||
"Host": "localhost",
|
||||
//"Host": "127.0.0.1",
|
||||
"Port": "5432",
|
||||
>>>>>>> aec1d3b15533e5faafe3b2294830b095cff93f2d
|
||||
"Port": "3306",
|
||||
//"DBName": "tianyi_db",
|
||||
//"UserName": "postgres",
|
||||
//"Password": "pass@word123",
|
||||
"DBName": "tianyi",
|
||||
"UserName": "postgres",
|
||||
"Password": "pass@word123",
|
||||
"DBName": "xinte_cloud",
|
||||
<<<<<<< HEAD
|
||||
"UserName": "root",//"totong",
|
||||
"Password": "root",//"+vKyHUbtxQ",
|
||||
=======
|
||||
"UserName": "totong",
|
||||
"Password": "+vKyHUbtxQ",
|
||||
>>>>>>> aec1d3b15533e5faafe3b2294830b095cff93f2d
|
||||
//SqlServer
|
||||
//"DefaultConnection": "server={0},{1};database={2};uid={3};pwd={4};MultipleActiveResultSets=true"
|
||||
//Kdbndp
|
||||
|
||||
Reference in New Issue
Block a user