xiugai

db.json

@@ -29,21 +29,13 @@
 			"maxOpenConns": 5,
 			"maxIdleConns": 5
 	    },
-		"push": {
-			"dbName": "jianyu",
-			"address": "192.168.3.11:3366",
-			"userName": "root",
-			"passWord": "Topnet123",
-			"maxOpenConns": 5,
-			"maxIdleConns": 5
-		},
-		"memberPush": {
-			"dbName": "jianyu",
-			"address": "192.168.3.11:3366",
-			"userName": "root",
-			"passWord": "Topnet123",
+		"baseService": {
+	        "dbName": "base_service",
+	        "address": "192.168.3.217:4000",
+	        "userName": "root",
+	        "passWord": "=PDT49#80Z!RVv52_z",
 			"maxOpenConns": 5,
 			"maxIdleConns": 5
-		}
+	    }
     }
 }

entity/merge.go

@@ -233,6 +233,7 @@ func Merge(wId, pId string, choose map[string]int, noteFunc ...func(string)) err
 		saveId, delId = pId, wId
 		saveRes, delRes = phRes, wxRes
 	}
+	saveBsId, delBsId := qutil.Int64All((*saveRes)["base_user_id"]), qutil.Int64All((*delRes)["base_user_id"])
 
 	//订阅合并处理
 	{
@@ -274,8 +275,8 @@ func Merge(wId, pId string, choose map[string]int, noteFunc ...func(string)) err
 		finalUser["i_ts_guide"] = (*tmp)["i_ts_guide"]
 
 		if saveModule != subscribeCheck { //推送记录合并
-			if !public.PushMysql.Update("pushsubscribe", map[string]interface{}{"userid": delId}, map[string]interface{}{"userid": saveId}) {
-				devNoteMsg = append(devNoteMsg, fmt.Sprintf("%s->%s 订阅推送历史记录合并异常", delId, saveId))
+			if saveBsId > 0 && delBsId > 0 && !public.BaseService.Update("pushsubscribe", map[string]interface{}{"userid": delBsId}, map[string]interface{}{"userid": saveBsId}) {
+				devNoteMsg = append(devNoteMsg, fmt.Sprintf("%s->%s 订阅推送历史记录合并异常", delBsId, saveBsId))
 			}
 			//清除推送catche
 			redis.Del("pushcache_2_b", fmt.Sprintf("subpush_%s", saveId))
@@ -382,8 +383,8 @@ func Merge(wId, pId string, choose map[string]int, noteFunc ...func(string)) err
 				return true
 			})
 			//推送记录转移
-			if !public.MemberPushMysql.Update("pushmember", map[string]interface{}{"userid": delId}, map[string]interface{}{"userid": saveId}) {
-				devNoteMsg = append(devNoteMsg, fmt.Sprintf("%s->%s 大会员推送历史记录合并异常", delId, saveId))
+			if saveBsId > 0 && delBsId > 0 && !public.BaseService.Update("pushmember", map[string]interface{}{"userid": delBsId}, map[string]interface{}{"userid": saveBsId}) {
+				devNoteMsg = append(devNoteMsg, fmt.Sprintf("%s->%s 大会员推送历史记录合并异常", delBsId, saveBsId))
 			}
 			//清除推送catche
 			redis.Del("pushcache_2_b", fmt.Sprintf("memberpush_%s", saveId))

public/db.go

@@ -10,12 +10,11 @@ import (
 )
 
 var (
-	DbConf          *dbConf
-	MainMysql       *mysql.Mysql
-	PushMysql       *mysql.Mysql
-	MemberPushMysql *mysql.Mysql
-	MQFW            m.MongodbSim
-	Mgo_Log         m.MongodbSim
+	DbConf      *dbConf
+	MainMysql   *mysql.Mysql
+	BaseService *mysql.Mysql
+	MQFW        m.MongodbSim
+	Mgo_Log     m.MongodbSim
 )
 
 type dbConf struct {
@@ -33,9 +32,8 @@ type dbConf struct {
 		Main *redisConf
 	}
 	Mysql struct {
-		Main       *mysqlConf //大会员&订单
-		Push       *mysqlConf //推送
-		MemberPush *mysqlConf //推送
+		Main        *mysqlConf //大会员&订单
+		BaseService *mysqlConf //tidb
 	}
 }
 type mgoConf struct {
@@ -110,30 +108,17 @@ func init() {
 			MainMysql.Init()
 		}
 
-		if DbConf.Mysql.Push != nil {
-			log.Println("初始化 Push mysql")
-			PushMysql = &mysql.Mysql{
-				Address:      DbConf.Mysql.Push.Address,
-				UserName:     DbConf.Mysql.Push.UserName,
-				PassWord:     DbConf.Mysql.Push.PassWord,
-				DBName:       DbConf.Mysql.Push.DbName,
-				MaxOpenConns: DbConf.Mysql.Push.MaxOpenConns,
-				MaxIdleConns: DbConf.Mysql.Push.MaxIdleConns,
+		if DbConf.Mysql.BaseService != nil {
+			log.Println("初始化 BaseService")
+			BaseService = &mysql.Mysql{
+				Address:      DbConf.Mysql.BaseService.Address,
+				UserName:     DbConf.Mysql.BaseService.UserName,
+				PassWord:     DbConf.Mysql.BaseService.PassWord,
+				DBName:       DbConf.Mysql.BaseService.DbName,
+				MaxOpenConns: DbConf.Mysql.BaseService.MaxOpenConns,
+				MaxIdleConns: DbConf.Mysql.BaseService.MaxIdleConns,
 			}
-			PushMysql.Init()
-		}
-
-		if DbConf.Mysql.MemberPush != nil {
-			log.Println("初始化 member Push mysql")
-			MemberPushMysql = &mysql.Mysql{
-				Address:      DbConf.Mysql.MemberPush.Address,
-				UserName:     DbConf.Mysql.MemberPush.UserName,
-				PassWord:     DbConf.Mysql.MemberPush.PassWord,
-				DBName:       DbConf.Mysql.MemberPush.DbName,
-				MaxOpenConns: DbConf.Mysql.MemberPush.MaxOpenConns,
-				MaxIdleConns: DbConf.Mysql.MemberPush.MaxIdleConns,
-			}
-			MemberPushMysql.Init()
+			BaseService.Init()
 		}
 	}
 }

services/userMerge.go

@@ -1,14 +1,15 @@
 package services
 
 import (
-	. "app.yhyue.com/moapp/jybase/api"
-	qutil "app.yhyue.com/moapp/jybase/common"
-	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 	"fmt"
 	"jy-merge/common/jy"
 	"jy-merge/config"
 	"jy-merge/entity"
 
+	. "app.yhyue.com/moapp/jybase/api"
+	qutil "app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
+
 	util "jy-merge/public"
 	"log"
 	"regexp"
@@ -25,7 +26,7 @@ type UserMerge struct {
 
 //我的页面查询是否需要账号合并
 func (this *UserMerge) MergeQuery() {
-	userId := qutil.ObjToString(this.GetSession("userId"))
+	userId := qutil.ObjToString(this.GetSession("mgoUserId"))
 	rData, errMsg := func() (interface{}, error) {
 		if userId == "" {
 			return nil, fmt.Errorf("身份状态异常")
@@ -44,7 +45,7 @@ func (this *UserMerge) MergeQuery() {
 
 //合并页面数据
 func (this *UserMerge) MergeStats() {
-	userId := qutil.ObjToString(this.GetSession("userId"))
+	userId := qutil.ObjToString(this.GetSession("mgoUserId"))
 	rData, errMsg := func() (interface{}, error) {
 		token := this.GetString("token")
 		weixinId, phoneId := "", ""
@@ -86,7 +87,7 @@ func (this *UserMerge) MergeStats() {
 
 //合并提交
 func (this *UserMerge) MergeSubmit() {
-	userId := qutil.ObjToString(this.GetSession("userId"))
+	userId := qutil.ObjToString(this.GetSession("mgoUserId"))
 	rData, errMsg := func() (interface{}, error) {
 		if userId == "" {
 			return nil, fmt.Errorf("身份状态异常")