再次修复主动判断是否为空值

2025-07-10 17:05:24 +08:00
parent 807d03b8a1
commit 91547f3774
1 changed files with 67 additions and 62 deletions
@@ -68,78 +68,83 @@ func V1_user_api(r *gin.RouterGroup) {
 		var jsonData Login_from
 		data, _ := ctx.Get("data")
 		if err := mapstructure.Decode(data, &jsonData); err == nil {
-			//转换字段
-			newUser := models.User{
-				Name: jsonData.Username,
-				Pass: jsonData.Password, // 实际应替换为哈希值
-				// Date 字段无需赋值，数据库会自动填充默认值
-			}
+			if jsonData.Username != "" {
+				//转换字段
+				newUser := models.User{
+					Name: jsonData.Username,
+					Pass: jsonData.Password, // 实际应替换为哈希值
+					// Date 字段无需赋值，数据库会自动填充默认值
+				}

-			//对用户的密码进行哈希替换
-			newUser.Pass = models.Hash_user_pass(newUser.Pass)
+				//对用户的密码进行哈希替换
+				newUser.Pass = models.Hash_user_pass(newUser.Pass)

-			var user models.User
-			user.Name = newUser.Name
-			if models.DB.Where(user.Name).First(&user).Error == nil {
-				// 有数据
-				//fmt.Println(user)
-				//fmt.Println(newUser)
+				var user models.User
+				user.Name = newUser.Name
+				if models.DB.Where(&user).First(&user).Error == nil {
+					// 有数据
+					//fmt.Println(user)
+					//fmt.Println(newUser)

-				if user.Pass == newUser.Pass {
-					//成功登录
-					//发送cookie
-					//cookie时间
-					var cookie_time = 0
-					if jsonData.Is_keep_login {
-						cookie_time = models.Configs_user.Cookie_timeout
+					if user.Pass == newUser.Pass {
+						//成功登录
+						//发送cookie
+						//cookie时间
+						var cookie_time = 0
+						if jsonData.Is_keep_login {
+							cookie_time = models.Configs_user.Cookie_timeout
+						}
+
+						cookie := models.Rand_str_32() //生成32字节cookie
+						//cookie := "testcookie"
+						//fmt.Println(cookie)
+						//将cookie写进数据库
+						new_cookie := models.Cookie{}
+						new_cookie.Domain = models.Configs_wed.Host
+						new_cookie.Name = "user"
+						new_cookie.Value = cookie
+						new_cookie.UserID = user.ID
+
+						//cookie时间
+						new_cookie.CreatedAt = time.Now()
+						new_cookie.UpdatedAt = new_cookie.CreatedAt
+						//计算cookie失效时间
+						new_cookie.ExpiresAt = time.Now().Add(time.Duration(models.Configs_user.Cookie_timeout) * time.Second) //计算过期时间
+						new_cookie.SecureFlag = models.Configs_wed.Tls
+
+						//发送到前端
+						ctx.SetCookie("user", cookie, cookie_time, "/", models.Configs_wed.Host, models.Configs_wed.Tls, true)
+						ctx.Set("cookie", new_cookie)
+						//写到数据库
+						models.DB.Create(&new_cookie) // 传入指针
+
+						//获取用户info
+						user_info := models.User_info{
+							UserID: user.ID,
+						}
+
+						models.DB.Where(&user_info).First(&user_info)
+
+						red := map[string]interface{}{
+							"cookie":    new_cookie,
+							"user_info": user_info,
+						}
+
+						Return_json(ctx, "api_ok", red)
+
+					} else {
+						//密码错误
+
+						Return_json(ctx, "user_password_err", nil)
 					}

-					cookie := models.Rand_str_32() //生成32字节cookie
-					//cookie := "testcookie"
-					//fmt.Println(cookie)
-					//将cookie写进数据库
-					new_cookie := models.Cookie{}
-					new_cookie.Domain = models.Configs_wed.Host
-					new_cookie.Name = "user"
-					new_cookie.Value = cookie
-					new_cookie.UserID = user.ID
-
-					//cookie时间
-					new_cookie.CreatedAt = time.Now()
-					new_cookie.UpdatedAt = new_cookie.CreatedAt
-					//计算cookie失效时间
-					new_cookie.ExpiresAt = time.Now().Add(time.Duration(models.Configs_user.Cookie_timeout) * time.Second) //计算过期时间
-					new_cookie.SecureFlag = models.Configs_wed.Tls
-
-					//发送到前端
-					ctx.SetCookie("user", cookie, cookie_time, "/", models.Configs_wed.Host, models.Configs_wed.Tls, true)
-					ctx.Set("cookie", new_cookie)
-					//写到数据库
-					models.DB.Create(&new_cookie) // 传入指针
-
-					//获取用户info
-					user_info := models.User_info{
-						UserID: user.ID,
-					}
-
-					models.DB.Where(user_info.UserID).First(&user_info)
-
-					red := map[string]interface{}{
-						"cookie":    new_cookie,
-						"user_info": user_info,
-					}
-
-					Return_json(ctx, "api_ok", red)
-
 				} else {
-					//密码错误
+					//fmt.Println("用户不存在")

-					Return_json(ctx, "user_password_err", nil)
+					Return_json(ctx, "user_name_nofind", nil)
 				}

 			} else {
-				//fmt.Println("用户不存在")
-
 				Return_json(ctx, "user_name_nofind", nil)
 			}