xiugai

src/jfw/modules/pushentniche/src/push/config.json

@@ -19,6 +19,14 @@
         "passWord":"Topnet123",
 		"maxOpenConns": 2,
 		"maxIdleConns": 2
+    },
+    "saveMysql":{
+        "dbName":"jianyu",
+        "address":"127.0.0.1:3366",
+        "userName":"root",
+        "passWord":"Topnet123",
+		"maxOpenConns": 2,
+		"maxIdleConns": 2
     },
 	"redisServers": "pushcache_2_a=127.0.0.1:5001,pushcache_2_b=127.0.0.1:5002",
 	"mail_content":"<tr><td><num>%d.</num></td><td><div class='tit'><a href='%s?mail'>%s</a></div></td><td class='infos' ><span class='%s'>%s</span><span class='%s'>%s</span><span class='%s'>%s</span><span class='time'>%s</span></td></tr>",

src/jfw/modules/pushentniche/src/push/config/config.go

@@ -55,6 +55,14 @@ type config struct {
 		MaxOpenConns int
 		MaxIdleConns int
 	} `json:"mysql"`
+	SaveMysql struct {
+		DbName       string
+		Address      string
+		UserName     string
+		PassWord     string
+		MaxOpenConns int
+		MaxIdleConns int
+	} `json:"saveMysql"`
 }
 
 type MongodbConfig struct {

src/jfw/modules/pushentniche/src/push/job/movejob.go

@@ -46,7 +46,7 @@ func (m *MoveJob) Execute() {
 			query[k] = v
 		}
 	}
-	it := sess.DB(Config.Mongodb.DbName).C(Pushspace_entniche_temp).Find(query).Sort("userid").Iter()
+	it := sess.DB(Config.Mongodb.DbName).C(Pushspace_entniche_temp).Find(query).Sort("entid", "deptid", "userid", "distributeid").Iter()
 	moveUsers := map[string]*MoveUser{}
 	index, number, length := 0, 0, 0
 	//

src/jfw/modules/pushentniche/src/push/util/db.go

@@ -11,6 +11,7 @@ import (
 )
 
 var Mysql *mysql.Mysql
+var SaveMysql *mysql.Mysql
 
 func init() {
 	mongodb.InitMongodbPool(Config.Mongodb.Size, Config.Mongodb.Address, Config.Mongodb.DbName)
@@ -34,6 +35,16 @@ func init() {
 		MaxIdleConns: Config.Mysql.MaxIdleConns,
 	}
 	Mysql.Init()
+	//
+	SaveMysql = &mysql.Mysql{
+		DBName:       Config.SaveMysql.DbName,
+		Address:      Config.SaveMysql.Address,
+		UserName:     Config.SaveMysql.UserName,
+		PassWord:     Config.SaveMysql.PassWord,
+		MaxOpenConns: Config.SaveMysql.MaxOpenConns,
+		MaxIdleConns: Config.SaveMysql.MaxIdleConns,
+	}
+	SaveMysql.Init()
 	log.Println("mysql初始化完成！")
-	jy.PushMapping.Init(Mysql)
+	jy.PushMapping.Init(SaveMysql)
 }