diff --git a/controller/user.go b/controller/user.go index f500569..22c958c 100644 --- a/controller/user.go +++ b/controller/user.go @@ -3,6 +3,7 @@ package controller import ( "electricity_bill_calc/cache" "electricity_bill_calc/exceptions" + "electricity_bill_calc/logger" "electricity_bill_calc/model" "electricity_bill_calc/repository" "electricity_bill_calc/response" @@ -12,12 +13,16 @@ import ( "strconv" "github.com/gofiber/fiber/v2" + "go.uber.org/zap" ) +var userLog = logger.Named("Handler", "User") + func InitializeUserHandlers(router *fiber.App) { router.Delete("/login", security.MustAuthenticated, doLogout) router.Post("/login", doLogin) - router.Get("/account", security.ManagementAuthorize, searchUsers) + router.Get("/account", security.OPSAuthorize, searchUsers) + router.Get("/expiration", security.EnterpriseAuthorize, getAccountExpiration) } type _LoginForm struct { @@ -30,12 +35,14 @@ func doLogin(c *fiber.Ctx) error { result := response.NewResult(c) loginData := new(_LoginForm) if err := c.BodyParser(loginData); err != nil { + userLog.Error("表单解析失败!", zap.Error(err)) return result.Error(http.StatusInternalServerError, "表单解析失败。") } var ( session *model.Session err error ) + userLog.Info("有用户请求登录。", zap.String("username", loginData.Username), zap.Int16("type", loginData.Type)) if loginData.Type == model.USER_TYPE_ENT { session, err = service.UserService.ProcessEnterpriseUserLogin(loginData.Username, loginData.Password) } else { @@ -48,6 +55,7 @@ func doLogin(c *fiber.Ctx) error { } return result.Error(int(authError.Code), authError.Message) } else { + userLog.Error("用户登录请求处理失败!", zap.Error(err)) return result.Error(http.StatusInternalServerError, err.Error()) } } @@ -62,6 +70,7 @@ func doLogout(c *fiber.Ctx) error { } _, err = cache.ClearSession(session.Token) if err != nil { + userLog.Error("用户登出处理失败!", zap.Error(err)) return result.Error(http.StatusInternalServerError, err.Error()) } return result.Success("用户已成功登出系统。") @@ -101,3 +110,21 @@ func searchUsers(c *fiber.Ctx) error { fiber.Map{"accounts": users}, ) } + +func getAccountExpiration(c *fiber.Ctx) error { + result := response.NewResult(c) + session, err := _retreiveSession(c) + if err != nil { + userLog.Error("未找到有效的用户会话。", zap.Error(err)) + return result.Error(http.StatusInternalServerError, err.Error()) + } + userDetail, err := repository.UserRepository.FindUserDetailById(session.Uid) + if err != nil { + return result.NotFound("未找到指定的用户档案") + } + return result.Json( + http.StatusOK, + "已经取得用户的服务期限信息", + fiber.Map{"expiration": userDetail.ServiceExpiration.Format("2006-01-02")}, + ) +}