浏览代码

mixdata库增加用户名密码

wangchuanjin 4 年之前
父节点
当前提交
8a60fdb1dc

+ 4 - 2
src/db.json

@@ -15,9 +15,11 @@
 			"password": "123456"
 			"password": "123456"
 		},
 		},
 		"ent": {
 		"ent": {
-			"address": "192.168.3.128:27080",
+			"address": "192.168.3.207:27001,192.168.3.206:27002",
 	 		"size": 5,
 	 		"size": 5,
-	 		"dbName": "extract_v3"
+	 		"dbName": "mixdata",
+			"userName": "jyDevGroup",
+			"password": "jy@DevGroup"
 		},
 		},
 		"qyfw": {
 		"qyfw": {
 			"address": "192.168.3.128:27080",
 			"address": "192.168.3.128:27080",

+ 1 - 20
src/jfw/modules/app/src/app/front/login.go

@@ -499,30 +499,11 @@ func (l *Login) WxLogin() {
 			//保存a_m_openid[微信公众号用户首次登录or绑定app、保存此字段]
 			//保存a_m_openid[微信公众号用户首次登录or绑定app、保存此字段]
 			if _, ok := (*user)["a_m_openid"]; !ok {
 			if _, ok := (*user)["a_m_openid"]; !ok {
 				upSet["a_m_openid"] = u.OpenId
 				upSet["a_m_openid"] = u.OpenId
+				upSet["l_a_registedate"] = time.Now().Unix()
 				upSet["o_jy.i_apppush"] = 1
 				upSet["o_jy.i_apppush"] = 1
 			}
 			}
-			//旧用户i_mode转换
-			if o_jy, ok := (*user)["o_jy"].(map[string]interface{}); ok {
-				if i_mode_obj, i_mode_exists := o_jy["i_mode"]; i_mode_exists {
-					i_mode := qutil.IntAll(i_mode_obj)
-					wxpush, mailpush := 0, 0
-					if i_mode == 2 {
-						mailpush = 1
-					} else if i_mode == 3 {
-						wxpush = 1
-						mailpush = 1
-					} else {
-						wxpush = 1
-					}
-					upSet["o_jy.i_wxpush"] = wxpush
-					upSet["o_jy.i_mailpush"] = mailpush
-				}
-			}
 			go mongodb.UpdateById("user", BsonIdToSId((*user)["_id"]), map[string]interface{}{
 			go mongodb.UpdateById("user", BsonIdToSId((*user)["_id"]), map[string]interface{}{
 				"$set": upSet,
 				"$set": upSet,
-				"$unset": map[string]interface{}{
-					"o_jy.i_mode": "",
-				},
 			})
 			})
 			returnSign = afterLogin(*user, l.Session(), rid, oid, phoneType, channel, deviceId, 2, false)
 			returnSign = afterLogin(*user, l.Session(), rid, oid, phoneType, channel, deviceId, 2, false)
 			return 1
 			return 1

+ 4 - 2
src/jfw/modules/app/src/db.json

@@ -13,9 +13,11 @@
 			"password": "123456"
 			"password": "123456"
 		},
 		},
 		"ent": {
 		"ent": {
-			"address": "192.168.3.128:27080",
+			"address": "192.168.3.207:27001,192.168.3.206:27002",
 	 		"size": 5,
 	 		"size": 5,
-	 		"dbName": "extract_v3"
+	 		"dbName": "mixdata",
+			"userName": "jyDevGroup",
+			"password": "jy@DevGroup"
 		},
 		},
 		"bidding": {
 		"bidding": {
 			"address": "192.168.3.207:27001,192.168.3.206:27002",
 			"address": "192.168.3.207:27001,192.168.3.206:27002",

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

@@ -15,9 +15,11 @@
 			"password": "123456"
 			"password": "123456"
 		},
 		},
 		"ent": {
 		"ent": {
-			"address": "192.168.3.207:27092",
+			"address": "192.168.3.207:27001,192.168.3.206:27002",
 	 		"size": 5,
 	 		"size": 5,
 	 		"dbName": "mixdata",
 	 		"dbName": "mixdata",
+			"userName": "jyDevGroup",
+			"password": "jy@DevGroup",
 			"replSet": "",
 			"replSet": "",
 			"collection": "qyxy",
 			"collection": "qyxy",
 			"collection_change": "qyxy_change"
 			"collection_change": "qyxy_change"

+ 7 - 2
src/jfw/modules/subscribepay/src/config.json

@@ -2,8 +2,13 @@
 	"mongodbServers": "192.168.3.128:27080",
 	"mongodbServers": "192.168.3.128:27080",
     "mongodbPoolSize": 5,
     "mongodbPoolSize": 5,
     "mongodbName": "qfw",
     "mongodbName": "qfw",
-	"mongodbServersEnt": "192.168.3.128:27080",
-    "mongodbNameEnt": "extract_v3",
+    "mongoent":{
+    	"address": "192.168.3.207:27001,192.168.3.206:27002",
+		"size": 5,
+		"dbName": "qfw_data",
+		"userName": "jyDevGroup",
+		"password": "jy@DevGroup"
+    },
 	"mongobidding":{
 	"mongobidding":{
 		"address": "192.168.3.207:27001,192.168.3.206:27002",
 		"address": "192.168.3.207:27001,192.168.3.206:27002",
 		"size": 5,
 		"size": 5,

+ 15 - 15
src/jfw/modules/subscribepay/src/config/config.go

@@ -7,21 +7,11 @@ import (
 )
 )
 
 
 type config struct {
 type config struct {
-	MongodbServers    string
-	MongodbPoolSize   int
-	MongodbName       string
-	MongodbServersEnt string
-	MongodbNameEnt    string
-	Mongobidding      struct {
-		Address           string
-		Size              int
-		DbName            string
-		ReplSet           string
-		Collection        string
-		Collection_change string
-		UserName          string
-		Password          string
-	}
+	MongodbServers  string
+	MongodbPoolSize int
+	MongodbName     string
+	Mongoent        *mgoConf
+	Mongobidding    *mgoConf
 	Elasticsearch   string
 	Elasticsearch   string
 	ElasticPoolSize int
 	ElasticPoolSize int
 	Redisaddrs      string
 	Redisaddrs      string
@@ -64,6 +54,16 @@ type config struct {
 	ProfitTitle    string
 	ProfitTitle    string
 	ProfitDescript string
 	ProfitDescript string
 }
 }
+type mgoConf struct {
+	Address           string
+	Size              int
+	DbName            string
+	ReplSet           string
+	Collection        string
+	Collection_change string
+	UserName          string
+	Password          string
+}
 type timeTaskConfig struct {
 type timeTaskConfig struct {
 	IsRun          bool   //是否执行定时任务
 	IsRun          bool   //是否执行定时任务
 	ExpireRemind   string //到期提醒
 	ExpireRemind   string //到期提醒

+ 5 - 3
src/jfw/modules/subscribepay/src/util/db.go

@@ -35,9 +35,11 @@ func init() {
 	MQFW.InitPool()
 	MQFW.InitPool()
 	//
 	//
 	MQFWENT = mg.MongodbSim{
 	MQFWENT = mg.MongodbSim{
-		MongodbAddr: Config.MongodbServersEnt,
-		Size:        Config.MongodbPoolSize,
-		DbName:      Config.MongodbNameEnt,
+		MongodbAddr: Config.Mongoent.Address,
+		Size:        Config.Mongoent.Size,
+		DbName:      Config.Mongoent.DbName,
+		UserName:    Config.Mongoent.UserName,
+		Password:    Config.Mongoent.Password,
 	}
 	}
 	MQFWENT.InitPool()
 	MQFWENT.InitPool()
 	//
 	//

+ 2 - 0
src/jfw/public/db.go

@@ -121,6 +121,8 @@ func init() {
 				Size:        DbConf.Mongodb.Ent.Size,
 				Size:        DbConf.Mongodb.Ent.Size,
 				DbName:      DbConf.Mongodb.Ent.DbName,
 				DbName:      DbConf.Mongodb.Ent.DbName,
 				ReplSet:     DbConf.Mongodb.Ent.ReplSet,
 				ReplSet:     DbConf.Mongodb.Ent.ReplSet,
+				UserName:    DbConf.Mongodb.Ent.UserName,
+				Password:    DbConf.Mongodb.Ent.Password,
 			}
 			}
 			Mgo_Ent.InitPool()
 			Mgo_Ent.InitPool()
 		}
 		}