20220307

apiv1/system/user.go

@@ -2,6 +2,7 @@ package system
 
 import (
 	"github.com/gogf/gf/v2/frame/g"
+	"github.com/tiger1103/gfast/v3/internal/app/system/model"
 )
 
 type UserLoginReq struct {
@@ -12,6 +13,6 @@ type UserLoginReq struct {
 	VerifyKey  string `p:"verifyKey"`
 }
 type UserLoginRes struct {
-	g.Meta `mime:"text/html" example:""`
-	Data   g.Map `json:"data"`
+	g.Meta   `mime:"text/html" example:""`
+	UserInfo *model.LoginUserRes
 }

internal/app/common/controller/base.go

@@ -17,5 +17,5 @@ type BaseController struct {
 
 // Init 自动执行的初始化方法
 func (c *BaseController) Init(r *ghttp.Request) {
-	g.Log().Debug(r.GetCtx(), "AAAAAAAAAAAAAAAAAAAAAAAAA")
+	g.Log().Debug(r.GetCtx(), "BaseController.Init")
 }

internal/app/common/controller/captcah.go

@@ -23,7 +23,7 @@ func (c *captchaController) Get(ctx context.Context, req *common.CaptchaReq) (re
 	var (
 		idKeyC, base64stringC string
 	)
-	idKeyC, base64stringC, err = service.Captcha.GetVerifyImgString(ctx)
+	idKeyC, base64stringC, err = service.Captcha().GetVerifyImgString(ctx)
 	res = &common.CaptchaRes{
 		Key: idKeyC,
 		Img: base64stringC,

internal/app/system/controller/base.go

@@ -20,5 +20,5 @@ type baseController struct {
 // Init 自动执行的初始化方法
 func (c *baseController) Init(r *ghttp.Request) {
 	c.BaseController.Init(r)
-	g.Log().Debug(r.GetCtx(), "BBBBBBBBBBBBBBBB")
+	g.Log().Debug(r.GetCtx(), "system.baseController.Init")
 }

internal/app/system/controller/user.go

@@ -6,6 +6,7 @@ import (
 	"github.com/gogf/gf/v2/os/genv"
 	"github.com/tiger1103/gfast/v3/apiv1/system"
 	commonService "github.com/tiger1103/gfast/v3/internal/app/common/service"
+	"github.com/tiger1103/gfast/v3/internal/app/system/model"
 	"github.com/tiger1103/gfast/v3/internal/app/system/service"
 )
 
@@ -18,6 +19,7 @@ type UserController struct {
 }
 
 func (c *UserController) Login(ctx context.Context, req *system.UserLoginReq) (res *system.UserLoginRes, err error) {
+	var user *model.LoginUserRes
 	//判断验证码是否正确
 	debug := genv.GetWithCmd("gf.debug")
 	if debug.Int() != 1 {
@@ -28,6 +30,12 @@ func (c *UserController) Login(ctx context.Context, req *system.UserLoginReq) (r
 	}
 	//ip := libUtils.GetClientIp(ctx)
 	//userAgent := libUtils.GetUserAgent(ctx)
-	service.User().GetAdminUserByUsernamePassword(ctx, req)
+	user, err = service.User().GetAdminUserByUsernamePassword(ctx, req)
+	if err != nil {
+		return
+	}
+	res = &system.UserLoginRes{
+		UserInfo: user,
+	}
 	return
 }

internal/app/system/service/sys_user.go

@@ -54,7 +54,7 @@ func (s *userImpl) GetAdminUserByUsernamePassword(ctx context.Context, req *syst
 func (s *userImpl) GetUserByUsername(ctx context.Context, userName string) (user *model.LoginUserRes, err error) {
 	err = g.Try(func() {
 		user = &model.LoginUserRes{}
-		err = dao.SysUser.Ctx(ctx).Fields(user).Where(dao.SysUser.Columns().UserName, userName).Scan(user)
+		err = dao.SysUser.Ctx(ctx).Fields(user).Where("a=12").Where(dao.SysUser.Columns().UserName, userName).Scan(user)
 		liberr.ErrIsNil(ctx, err, "获取用户信息失败")
 	})
 	return

library/libMiddleware/middleware.go

@@ -7,7 +7,9 @@
 
 package libMiddleware
 
-import "github.com/gogf/gf/v2/net/ghttp"
+import (
+	"github.com/gogf/gf/v2/net/ghttp"
+)
 
 func MiddlewareCORS(r *ghttp.Request) {
 	corsOptions := r.Response.DefaultCORSOptions()

library/liberr/err.go

@@ -14,8 +14,8 @@ import (
 
 func ErrIsNil(ctx context.Context, err error, msg ...string) {
 	if !g.IsNil(err) {
-		g.Log().Error(ctx, err.Error())
 		if len(msg) > 0 {
+			g.Log().Error(ctx, err.Error())
 			panic(msg[0])
 		} else {
 			panic(err.Error())

manifest/config/config.yaml

@@ -23,6 +23,15 @@ logger:
   level: "all"
   stdout: true
 
+# Database.
+database:
+  logger:
+    level:   "all"
+    stdout:  true
+
+  default:
+    link:   "mysql:root:123456@tcp(127.0.0.1:3306)/gfast-v3"
+    debug:  true
 
 # CLI.
 gfcli: