wangchuanjin 4 жил өмнө
parent
commit
f029f35e90

+ 1 - 9
src/jfw/modules/bigmember/src/db.json

@@ -15,21 +15,13 @@
 			"password": "123456"
 		},
 		"ent": {
-			"address": "192.168.3.207:27001,192.168.3.206:27002",
+			"address": "192.168.3.207:27092",
 	 		"size": 5,
 	 		"dbName": "mixdata",
-			"userName": "jyDevGroup",
-			"password": "jy@DevGroup",
 			"replSet": "",
 			"collection": "qyxy",
 			"collection_change": "qyxy_change"
 		},
-		"newproject": {
-			"address": "192.168.3.166:27082",
-	 		"size": 5,
-	 		"dbName": "bqData",
-			"replSet": ""
-		},
 		"bidding": {
 			"address": "192.168.3.207:27001,192.168.3.206:27002",
 	 		"size": 5,

+ 11 - 23
src/jfw/modules/bigmember/src/db/db.go

@@ -13,11 +13,10 @@ import (
 
 type dbConf struct {
 	Mongodb struct {
-		Main       *mgoConf
-		Log        *mgoConf
-		Ent        *mgoConf
-		NewProject *mgoConf
-		Bidding    *mgoConf
+		Main    *mgoConf
+		Log     *mgoConf
+		Ent     *mgoConf
+		Bidding *mgoConf
 	}
 	Elasticsearch struct {
 		Main *esConf
@@ -61,14 +60,13 @@ type mysqlConf struct {
 }
 
 var (
-	DbConf         *dbConf
-	Mgo            m.MongodbSim
-	Mgo_Ent        m.MongodbSim
-	Mgo_Log        m.MongodbSim
-	Mgo_NewProject m.MongodbSim
-	Mgo_Bidding    m.MongodbSim
-	Mysql          *mysql.Mysql
-	Mysql_Push     *mysql.Mysql
+	DbConf      *dbConf
+	Mgo         m.MongodbSim
+	Mgo_Ent     m.MongodbSim
+	Mgo_Log     m.MongodbSim
+	Mgo_Bidding m.MongodbSim
+	Mysql       *mysql.Mysql
+	Mysql_Push  *mysql.Mysql
 )
 
 func init() {
@@ -116,16 +114,6 @@ func init() {
 			}
 			Mgo_Log.InitPool()
 		}
-		if DbConf.Mongodb.NewProject != nil {
-			log.Println("初始化 mongodb newproject")
-			Mgo_NewProject = m.MongodbSim{
-				MongodbAddr: DbConf.Mongodb.NewProject.Address,
-				Size:        DbConf.Mongodb.NewProject.Size,
-				DbName:      DbConf.Mongodb.NewProject.DbName,
-				ReplSet:     DbConf.Mongodb.NewProject.ReplSet,
-			}
-			Mgo_NewProject.InitPool()
-		}
 		if DbConf.Mysql.Main != nil {
 			log.Println("初始化 mysql")
 			Mysql = &mysql.Mysql{