refactor: user API routes and update form actions

funnyzak · Feb 21, 2024 · 3b52f65 · 3b52f65
1 parent d56fa32
commit 3b52f65
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/cmd/srv/controller/user_api.go b/cmd/srv/controller/user_api.go
@@ -19,8 +19,8 @@ type userAPI struct {
 
 func (ua *userAPI) serve() {
 	ur := ua.r.Group("")
-	ur.POST("/login", ua.login)
-	ur.POST("/register", ua.register)
+	ur.POST("/user/login", ua.login)
+	ur.POST("/user/register", ua.register)
 
 	v1 := ua.r.Group("v1")
 	{

diff --git a/model/user.go b/model/user.go
@@ -13,7 +13,7 @@ import (
 type User struct {
 	Common
 	UserName           string `json:"username,omitempty" gorm:"unique;column:username"`
-	Password           string `json:"password,omitempty" gorm:"column:password"`
+	Password           string `json:"-" gorm:"column:password"`
 	ForgotPasswordCode string `json:"forgot_password_code,omitempty" gorm:"column:forgot_password_code"`
 	VerificationCode   string `json:"verification_code,omitempty" gorm:"column:verification_code"`
 

diff --git a/resource/template/login.html b/resource/template/login.html
@@ -1,6 +1,6 @@
 {{ define "login" }}
 {{template "base/header" .}}
-    <form class="gogin-form" action="{{ .Conf.Site.BaseURL }}/api/login?page=1" method="post">
+    <form class="gogin-form" action="{{ .Conf.Site.BaseURL }}/api/user/login?page=1" method="post">
         <h1>Go-Gin Login</h1>
         <label for="username">Username</label>
         <input type="text" id="username" name="username" required>

diff --git a/resource/template/register.html b/resource/template/register.html
@@ -1,6 +1,6 @@
 {{ define "register" }}
 {{template "base/header" .}}
-    <form class="gogin-form" action="{{ .Conf.Site.BaseURL }}/api/register?page=1" method="post">
+    <form class="gogin-form" action="{{ .Conf.Site.BaseURL }}/api/user/register?page=1" method="post">
         <h1>Go-Gin Register</h1>
         <label for="username">Username</label>
         <input type="text" id="username" name="username" required>