From 737fb96c95cf0632230dc47ef1030b8329583853 Mon Sep 17 00:00:00 2001
From: azw <vcl_delphi@126.com>
Date: Sun, 20 Aug 2023 18:27:30 +0800
Subject: [PATCH] 1

---
 server/imserver/app.go       | 21 +++++++++++++++++++++
 server/imserver/constant.go  |  5 +++++
 server/imserver/mt/export.go |  4 ++--
 server/imserver/playermgr.go | 10 ++++++++++
 third_party/f5               |  2 +-
 third_party/q5               |  2 +-
 6 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/server/imserver/app.go b/server/imserver/app.go
index 06a198cb..d9090a93 100644
--- a/server/imserver/app.go
+++ b/server/imserver/app.go
@@ -19,6 +19,7 @@ func (this *App) GetPkgName() string {
 func (this *App) Init() {
 	this.netMsgQueue.Init()
 	f5.LoadMetaTable(mt.Table)
+	this.registerDataSources()
 
 	handlerMgr.init()
 	playerMgr.init()
@@ -71,3 +72,23 @@ func (this *App) addNetMsg(hdr *f5.MsgHdr) {
 	this.netMsgQueue.Push(&hdr.Entry)
 	f5.GetApp().NotifyLoopCond()
 }
+
+
+func (this *App) registerDataSources() {
+	f5.GetGoStyleDb().RegisterDataSource(
+		GAME_DB,
+		mt.Table.GameDb.GetById(0).GetHost(),
+		mt.Table.GameDb.GetById(0).GetPort(),
+		mt.Table.GameDb.GetById(0).GetUser(),
+		mt.Table.GameDb.GetById(0).GetPasswd(),
+		mt.Table.GameDb.GetById(0).GetDatabase(),
+		30)
+	f5.GetGoStyleDb().RegisterDataSource(
+		FRIEND_DB,
+		mt.Table.FriendDb.GetById(0).GetHost(),
+		mt.Table.FriendDb.GetById(0).GetPort(),
+		mt.Table.FriendDb.GetById(0).GetUser(),
+		mt.Table.FriendDb.GetById(0).GetPasswd(),
+		mt.Table.FriendDb.GetById(0).GetDatabase(),
+		30)
+}
diff --git a/server/imserver/constant.go b/server/imserver/constant.go
index 4e2a5769..e06a71e4 100644
--- a/server/imserver/constant.go
+++ b/server/imserver/constant.go
@@ -9,3 +9,8 @@ const (
 const (
 	MAX_PACKET_LEN = 1024 * 64
 )
+
+const (
+	GAME_DB = "gamedb"
+	FRIEND_DB = "firenddb"
+)
diff --git a/server/imserver/mt/export.go b/server/imserver/mt/export.go
index 5f5a43a3..e5a9d37f 100644
--- a/server/imserver/mt/export.go
+++ b/server/imserver/mt/export.go
@@ -15,12 +15,12 @@ type table struct {
 var Table = f5.New(func (this* table) {
 	this.IMCluster = f5.New(func (this *IMClusterTable) {
 		this.FileName = "../config/imserver.cluster.json"
-		this.PrimKey = ""
+		this.PrimKey = "instance_id"
 	});
 
 	this.MasterCluster = f5.New(func (this *MasterClusterTable) {
 		this.FileName = "../config/master.cluster.json"
-		this.PrimKey = ""
+		this.PrimKey = "instance_id"
 	});
 
 	this.GameDb = f5.New(func (this *GameDbTable) {
diff --git a/server/imserver/playermgr.go b/server/imserver/playermgr.go
index 5ba68a24..25794b3c 100644
--- a/server/imserver/playermgr.go
+++ b/server/imserver/playermgr.go
@@ -53,6 +53,16 @@ func (this *PlayerMgr) init() {
 	} else {
 		f5.GetSysLog().Info("mysql error:%s\n", err)
 	}
+	{
+		f5.GetJsStyleDb().OrmSelectOne(
+			GAME_DB,
+			"t_user",
+			[][]string{
+				[]string{"account_id", "100"}},
+			func (err error, row *[]*string) {
+				fmt.Println(row)
+			})
+	}
 }
 
 func (this *PlayerMgr) unInit() {
diff --git a/third_party/f5 b/third_party/f5
index 096c5046..7dd2331f 160000
--- a/third_party/f5
+++ b/third_party/f5
@@ -1 +1 @@
-Subproject commit 096c5046c962a4bcc5873aa5b539a0900e3cf4bd
+Subproject commit 7dd2331f6c8bc39fdc33471a24dd49ebedc13023
diff --git a/third_party/q5 b/third_party/q5
index aecf26a4..8716d301 160000
--- a/third_party/q5
+++ b/third_party/q5
@@ -1 +1 @@
-Subproject commit aecf26a45c74547bb724f59653331dcc34f16974
+Subproject commit 8716d301c6d364a3fb8bdf324e4cf7e4cd8c4bda