From cd47c5268087db23f28c8f69ecc4a67ffbdd12dd Mon Sep 17 00:00:00 2001
From: wh_zcy <wh_zcy@yeah.net>
Date: Thu, 13 Oct 2022 10:56:25 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=8C=87=E5=AE=9A=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmd/v2/FyneApp.toml       | 4 ++--
 modules/user/api_login.go | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cmd/v2/FyneApp.toml b/cmd/v2/FyneApp.toml
index 600fd2175..dbf37401c 100644
--- a/cmd/v2/FyneApp.toml
+++ b/cmd/v2/FyneApp.toml
@@ -4,5 +4,5 @@ Website = "http://legu.cc"
   Icon = "app.png"
   Name = "RobotGUI"
   ID = "cc.legu.app"
-  Version = "1.0.14"
-  Build = 17
+  Version = "1.0.15"
+  Build = 18
diff --git a/modules/user/api_login.go b/modules/user/api_login.go
index 813f841d2..03d28aa0c 100644
--- a/modules/user/api_login.go
+++ b/modules/user/api_login.go
@@ -78,7 +78,6 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (cod
 				return
 			}
 		}
-
 	}
 
 	//bind user
@@ -105,9 +104,10 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (cod
 	//不是新账号
 	if !isNewUser {
 		lastLoginTime := user.Logintime
-		user.Logintime = time.Now().Unix()
-		user.Lastloginip = session.GetIP()
-		update := utils.StructToMap(user)
+		update := map[string]interface{}{
+			"logintime": time.Now().Unix(),
+			"lastloginip":session.GetIP(),			
+		}
 		err = this.module.modelUser.Change(user.Uid, update)
 		if err != nil {
 			code = pb.ErrorCode_DBError

From 0117c511f23cbf7f9c34b0ff11652ed1e114c830 Mon Sep 17 00:00:00 2001
From: wh_zcy <wh_zcy@yeah.net>
Date: Thu, 13 Oct 2022 14:33:43 +0800
Subject: [PATCH 2/3] user if nil

---
 cmd/v2/ui/toy_userinfo.go |  5 +++++
 modules/user/api_login.go | 10 +++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/cmd/v2/ui/toy_userinfo.go b/cmd/v2/ui/toy_userinfo.go
index 5cc4b2fee..51b7305aa 100644
--- a/cmd/v2/ui/toy_userinfo.go
+++ b/cmd/v2/ui/toy_userinfo.go
@@ -147,6 +147,11 @@ func (this *toyUserInfo) dataListener() {
 					logrus.Error("unmarshal err")
 					return
 				}
+
+				if rsp.Data == nil {
+					logrus.Debug("没有用户数据返回")
+				}
+
 				this.setProp(1, common.USERINFO_SERVER, rsp.Data.Sid)
 				this.setProp(2, common.USERINFO_NAME, rsp.Data.Name)
 				this.setProp(3, common.USERINFO_AVATAR, rsp.Data.Avatar)
diff --git a/modules/user/api_login.go b/modules/user/api_login.go
index 03d28aa0c..bfe39dea1 100644
--- a/modules/user/api_login.go
+++ b/modules/user/api_login.go
@@ -78,6 +78,7 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (cod
 				return
 			}
 		}
+
 	}
 
 	//bind user
@@ -103,11 +104,10 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (cod
 
 	//不是新账号
 	if !isNewUser {
-		lastLoginTime := user.Logintime
-		update := map[string]interface{}{
-			"logintime": time.Now().Unix(),
-			"lastloginip":session.GetIP(),			
-		}
+		lastLoginTime := user.Logintime		
+		user.Logintime = time.Now().Unix()
+		user.Lastloginip = session.GetIP()
+		update := utils.StructToMap(user)
 		err = this.module.modelUser.Change(user.Uid, update)
 		if err != nil {
 			code = pb.ErrorCode_DBError

From 42630f6c97709d65619e51644d183717ac2ea774 Mon Sep 17 00:00:00 2001
From: wh_zcy <wh_zcy@yeah.net>
Date: Thu, 13 Oct 2022 14:46:43 +0800
Subject: [PATCH 3/3] update

---
 modules/user/api_login.go | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/user/api_login.go b/modules/user/api_login.go
index bfe39dea1..a75409f83 100644
--- a/modules/user/api_login.go
+++ b/modules/user/api_login.go
@@ -104,11 +104,12 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (cod
 
 	//不是新账号
 	if !isNewUser {
-		lastLoginTime := user.Logintime		
-		user.Logintime = time.Now().Unix()
-		user.Lastloginip = session.GetIP()
-		update := utils.StructToMap(user)
-		err = this.module.modelUser.Change(user.Uid, update)
+		lastLoginTime := user.Logintime
+		update := map[string]interface{}{
+			"logintime":   time.Now().Unix(),
+			"lastloginip": session.GetIP(),
+		}
+		err = this.module.modelUser.ChangeList(user.Uid, user.Id, update)
 		if err != nil {
 			code = pb.ErrorCode_DBError
 			return