refactor(bookmark): 重构书签服务入口文件并整合用户权限功能
将 bookmark.go 重命名为 main.go,并调整包引用路径。将 bookmarks 和 user_np 两个模块的处理逻辑合并到同一个服务中,统一注册路由。同时更新了相关 API 的引用路径,确保生成代码与内部实现正确绑定。 此外,移除了独立的 user_np 服务入口文件,其功能已整合至 bookmark 服务中。 配置文件中调整了 user_np 和 vfs 服务的端口及部分接口定义,完善了用户 相关操作的路径参数和请求体结构。
This commit is contained in:
209
internal/bookmarks/user_np.go
Normal file
209
internal/bookmarks/user_np.go
Normal file
@ -0,0 +1,209 @@
|
||||
// internal/handlers/user_np.go
|
||||
|
||||
package bookmarks
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"net/http"
|
||||
|
||||
api "git.zzyxyz.com/zzy/zzyxyz_go_api/gen/user_np"
|
||||
client "git.zzyxyz.com/zzy/zzyxyz_go_api/gen/vfs"
|
||||
"git.zzyxyz.com/zzy/zzyxyz_go_api/internal/bookmarks/models"
|
||||
"github.com/gin-gonic/gin"
|
||||
"gorm.io/driver/sqlite"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
type UserNPImpl struct {
|
||||
db *gorm.DB
|
||||
client *client.ClientWithResponses
|
||||
vfsToken string
|
||||
}
|
||||
|
||||
func NewUserNP(dbPath string) (*UserNPImpl, error) {
|
||||
var err error
|
||||
var db *gorm.DB
|
||||
db, err = gorm.Open(sqlite.Open(dbPath), &gorm.Config{})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// 自动迁移表结构
|
||||
err = db.AutoMigrate(&models.UserNP{})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
client, err := client.NewClientWithResponses("http://localhost:8080/api")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &UserNPImpl{
|
||||
db: db,
|
||||
client: client,
|
||||
vfsToken: "random_token",
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (u *UserNPImpl) RegisterVFSService(username, token string) (*string, error) {
|
||||
ctx := context.Background()
|
||||
reqs, err := u.client.CreateUserWithResponse(ctx, username, func(ctx context.Context, req *http.Request) error {
|
||||
req.Header.Set("X-VFS-Token", token)
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if reqs.StatusCode() != http.StatusCreated {
|
||||
return nil, fmt.Errorf("failed to register vfs service: %s", reqs.Status())
|
||||
}
|
||||
|
||||
tokenHeader := reqs.HTTPResponse.Header.Get("X-VFS-Token")
|
||||
if tokenHeader == "" {
|
||||
return nil, fmt.Errorf("X-VFS-Token header is missing")
|
||||
}
|
||||
return &tokenHeader, nil
|
||||
}
|
||||
|
||||
func (u *UserNPImpl) UnregisterVFSService(username, token string) error {
|
||||
ctx := context.Background()
|
||||
reqs, err := u.client.DeleteUserWithResponse(ctx, username, func(ctx context.Context, req *http.Request) error {
|
||||
req.Header.Set("X-VFS-Token", token)
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if reqs.StatusCode() == http.StatusNoContent {
|
||||
return nil
|
||||
}
|
||||
|
||||
if reqs.JSON404 != nil {
|
||||
return fmt.Errorf("用户不存在 %s", reqs.JSON404.Message)
|
||||
}
|
||||
|
||||
if reqs.JSON500 != nil {
|
||||
return fmt.Errorf("服务器错误 %s", reqs.JSON500.Message)
|
||||
}
|
||||
|
||||
return fmt.Errorf("未知错误")
|
||||
}
|
||||
|
||||
// PostAuthLogin 用户登录
|
||||
func (u *UserNPImpl) PostAuthLogin(c *gin.Context) {
|
||||
var req api.PostAuthLoginJSONRequestBody
|
||||
if err := c.ShouldBindJSON(&req); err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
||||
return
|
||||
}
|
||||
|
||||
// 查找用户
|
||||
var user models.UserNP
|
||||
if err := u.db.Where("username = ?", req.Username).First(&user).Error; err != nil {
|
||||
c.JSON(http.StatusUnauthorized, gin.H{"error": "用户名或密码错误"})
|
||||
return
|
||||
}
|
||||
|
||||
// 验证密码
|
||||
if !user.CheckPassword(req.Password) {
|
||||
c.JSON(http.StatusUnauthorized, gin.H{"error": "用户名或密码错误"})
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, api.LoginResponse{
|
||||
Token: user.Token,
|
||||
UserId: &user.ID,
|
||||
})
|
||||
}
|
||||
|
||||
// PostAuthRegister 用户注册
|
||||
func (u *UserNPImpl) PostAuthRegister(c *gin.Context) {
|
||||
var req api.PostAuthRegisterJSONRequestBody
|
||||
if err := c.ShouldBindJSON(&req); err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
||||
return
|
||||
}
|
||||
|
||||
// 检查用户名是否已存在
|
||||
var existingUser models.UserNP
|
||||
if err := u.db.Where("username = ?", req.Username).First(&existingUser).Error; err == nil {
|
||||
c.JSON(http.StatusConflict, gin.H{"error": "用户名已存在"})
|
||||
return
|
||||
}
|
||||
|
||||
// 创建新用户
|
||||
user := models.UserNP{
|
||||
Username: req.Username,
|
||||
Email: req.Email,
|
||||
}
|
||||
|
||||
// 加密密码
|
||||
if err := user.HashPassword(req.Password); err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "密码处理失败"})
|
||||
return
|
||||
}
|
||||
|
||||
// 保存到数据库
|
||||
if err := u.db.Create(&user).Error; err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "用户创建失败"})
|
||||
}
|
||||
|
||||
if token, err := u.RegisterVFSService(req.Username, u.vfsToken); err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "无法生成访问令牌"})
|
||||
u.db.Delete(&user)
|
||||
} else {
|
||||
user.Token = token
|
||||
u.db.Save(&user)
|
||||
}
|
||||
|
||||
c.JSON(http.StatusCreated, nil)
|
||||
}
|
||||
|
||||
// PutAuthPassword 修改密码
|
||||
func (u *UserNPImpl) PutAuthPassword(c *gin.Context) {
|
||||
// 获取Authorization头中的token
|
||||
authHeader := c.GetHeader("Authorization")
|
||||
if authHeader == "" {
|
||||
c.JSON(http.StatusUnauthorized, gin.H{"error": "缺少访问令牌"})
|
||||
return
|
||||
}
|
||||
|
||||
var req api.PutAuthPasswordJSONRequestBody
|
||||
if err := c.ShouldBindJSON(&req); err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
||||
return
|
||||
}
|
||||
|
||||
// 查找用户
|
||||
var user models.UserNP
|
||||
if err := u.db.Where("username = ?", req.UserName).First(&user).Error; err != nil {
|
||||
c.JSON(http.StatusUnauthorized, gin.H{"error": "用户不存在"})
|
||||
return
|
||||
}
|
||||
|
||||
// 验证旧密码
|
||||
if !user.CheckPassword(req.OldPassword) {
|
||||
c.JSON(http.StatusUnauthorized, gin.H{"error": "旧密码错误"})
|
||||
return
|
||||
}
|
||||
|
||||
// 加密新密码
|
||||
if err := user.HashPassword(req.NewPassword); err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "密码处理失败"})
|
||||
return
|
||||
}
|
||||
|
||||
// 保存到数据库
|
||||
if err := u.db.Save(&user).Error; err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "密码更新失败"})
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, nil)
|
||||
}
|
||||
|
||||
// Make sure we conform to ServerInterface
|
||||
var _ api.ServerInterface = (*UserNPImpl)(nil)
|
Reference in New Issue
Block a user