Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

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

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)

modules/user/api_login.go

@@ -105,10 +105,11 @@ 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)
+		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