From 14e2f21ad7fb7c20684b6be8885dc5d738c0cc71 Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Tue, 15 Nov 2022 19:12:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=94=A8=E6=88=B7=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E8=AF=BB=E5=8F=96=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/moonfantasy/configure.go |  2 +-
 modules/user/model_user.go       | 19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/modules/moonfantasy/configure.go b/modules/moonfantasy/configure.go
index 3ed6e46ba..5556f3260 100644
--- a/modules/moonfantasy/configure.go
+++ b/modules/moonfantasy/configure.go
@@ -64,7 +64,7 @@ func (this *configureComp) GetMonsterById(id string) (result *cfg.GameDreamlandB
 		return
 	} else {
 		if result, ok = v.(*cfg.GameDreamlandBoos).GetDataMap()[id]; !ok {
-			err = fmt.Errorf("not found:%d ", id)
+			err = fmt.Errorf("not found:%s ", id)
 			this.module.Errorln(err)
 			return
 		}
diff --git a/modules/user/model_user.go b/modules/user/model_user.go
index 2746cc624..1073ab24d 100644
--- a/modules/user/model_user.go
+++ b/modules/user/model_user.go
@@ -73,9 +73,22 @@ func (this *ModelUser) User_Create(user *pb.DBUser) (err error) {
 //获取用户
 func (this *ModelUser) GetUser(uid string) (user *pb.DBUser) {
 	user = &pb.DBUser{}
-	if err := this.Get(uid, user); err != nil {
-		this.module.Errorf("GetUser uid:%v err:%v",uid,err)
-		return
+	// if err := this.Get(uid, user); err != nil {
+	// 	this.module.Errorf("GetUser uid:%v err:%v",uid,err)
+	// 	return
+	// }
+	if this.module.IsCross() {
+		if model, err := this.module.GetDBNoduleByUid(uid, this.TableName, this.Expired); err != nil {
+			this.module.Errorln(err)
+		} else {
+			if err = model.Get(uid, user); err != nil {
+				this.module.Errorf("err:%v", err)
+			}
+		}
+	} else {
+		if err := this.Get(uid, user); err != nil {
+			this.module.Errorf("err:%v", err)
+		}
 	}
 	return
 }