diff --git a/gin_ops/routers/api_users.go b/gin_ops/routers/api_users.go index d5f9482..fc610bc 100644 --- a/gin_ops/routers/api_users.go +++ b/gin_ops/routers/api_users.go @@ -18,6 +18,7 @@ func V1_user_api(r *gin.RouterGroup) { //返回前端的数据 //转换传进来的数据 + var jsonData map[string]interface{} if err := ctx.ShouldBindJSON(&jsonData); err == nil { //转换字段 diff --git a/gin_ops/routers/def_routers.go b/gin_ops/routers/def_routers.go index 01a398e..cb40203 100644 --- a/gin_ops/routers/def_routers.go +++ b/gin_ops/routers/def_routers.go @@ -77,6 +77,7 @@ func Def_router(r *gin.RouterGroup) { } //写入当前登录的用户信息 传递给下一个组件 ctx.Set("user_info", &user_info) + ctx.Set("user", &user) } else { //找不到登录权限?? 可能被封号? //删除前端cookie @@ -114,8 +115,7 @@ func Def_router(r *gin.RouterGroup) { //无需权限的页面 r.GET("/", func(ctx *gin.Context) { - is_login, _ := ctx.Get("is_login") - user_info, _ := ctx.Get("user_info") + user_info, is_login := ctx.Get("user_info") ctx.HTML(http.StatusOK, "index.html", gin.H{ "is_login": is_login, "user_info": user_info, @@ -266,16 +266,15 @@ func Def_router(r *gin.RouterGroup) { } }) r.GET("/setting-my", func(ctx *gin.Context) { - is_login, _ := ctx.Get("is_login") - user_info, _ := ctx.Get("user_info") - user, _ := ctx.Get("user") + + user_info, is_login := ctx.Get("user_info") + //判断是否登录 if is_login == true { ctx.HTML(http.StatusOK, "setting-my.html", gin.H{ "is_login": is_login, "user_info": user_info, - "user": user, }) } else { ctx.HTML(404, "error_404.html", gin.H{}) @@ -284,8 +283,7 @@ func Def_router(r *gin.RouterGroup) { }) r.GET("/setting-security", func(ctx *gin.Context) { - is_login, _ := ctx.Get("is_login") - user_info, _ := ctx.Get("user_info") + user_info, is_login := ctx.Get("user_info") user, _ := ctx.Get("user") //判断是否登录 if is_login == true { diff --git a/gin_ops/templates/sign-in-01.html b/gin_ops/templates/sign-in-01.html index 0d20677..aa59922 100644 --- a/gin_ops/templates/sign-in-01.html +++ b/gin_ops/templates/sign-in-01.html @@ -25,8 +25,7 @@
- +
@@ -160,9 +159,12 @@ if (from_data_check) { const url = '/api/v1/user/login'; const sumt_data = { - username: username_dom.value, - password: password_dom.value, - is_keep_login: keep_login_dom.checked + data: { + username: username_dom.value, + password: password_dom.value, + is_keep_login: keep_login_dom.checked + }, + }; try { diff --git a/gin_ops/templates/sign-up.html b/gin_ops/templates/sign-up.html index 43f2d08..7c0644a 100644 --- a/gin_ops/templates/sign-up.html +++ b/gin_ops/templates/sign-up.html @@ -220,9 +220,12 @@ //console.log("ok"); const url = '/api/v1/user/add'; const sumt_data = { - username: username_dom.value, - useremail: email_dom.value, - userpass: password_dom.value + data: { + username: username_dom.value, + useremail: email_dom.value, + userpass: password_dom.value + }, + }; try { const response = axios.post(url, sumt_data, {