diff --git a/oa/Makefile b/oa/Makefile index 8d9bb6c..b6eb1dc 100644 --- a/oa/Makefile +++ b/oa/Makefile @@ -19,7 +19,7 @@ fmt: @goctl api format --dir ./api gen_sql: - @goctl model mysql ddl -c --database oa -d ./models -s ./protoc/sql/base.sql + @goctl model mysql ddl --database oa -d ./models -s ./protoc/sql/20240801061157_base.sql # add sql script # sqlx migrate --source ./protoc/sql add base @@ -32,3 +32,6 @@ gen_db: gen_api: @goctl api go -api ./protoc/api/all.api -dir ./ + +run: + @go run main.go -f ./etc/main.yaml diff --git a/oa/errs/errors.go b/oa/errs/errors.go new file mode 100644 index 0000000..229084b --- /dev/null +++ b/oa/errs/errors.go @@ -0,0 +1,32 @@ +// +// errors.go +// Copyright (C) 2024 veypi +// 2024-08-01 15:40 +// Distributed under terms of the MIT license. +// + +package errs + +import ( + "fmt" +) + +type CodeMsg struct { + Code int + Msg string +} + +func (c *CodeMsg) Error() string { + return fmt.Sprintf("code: %d, msg: %s", c.Code, c.Msg) +} + +// New creates a new CodeMsg. +func New(code int, msg string) error { + return &CodeMsg{Code: code, Msg: msg} +} + +var ( + AuthFailed = New(401, "auth failed") + AuthExpired = New(401, "auth expired") + AuthInvalid = New(401, "auth invalid") +) diff --git a/oa/errs/response.go b/oa/errs/response.go new file mode 100644 index 0000000..1ef4a27 --- /dev/null +++ b/oa/errs/response.go @@ -0,0 +1,39 @@ +// +// response.go +// Copyright (C) 2024 veypi +// 2024-08-01 16:42 +// Distributed under terms of the MIT license. +// + +package errs + +import ( + "fmt" + "net/http" + + "github.com/go-sql-driver/mysql" + "github.com/zeromicro/go-zero/rest/httpx" +) + +func Response(w http.ResponseWriter, resp interface{}, err error) { + if err != nil { + httpx.Error(w, err) + } else if resp != nil { + httpx.OkJson(w, resp) + } else { + httpx.Ok(w) + } +} + +func ErrorHandler(err error) (int, any) { + switch e := err.(type) { + case *CodeMsg: + return e.Code, e.Msg + case *mysql.MySQLError: + fmt.Printf("\nerror: %v| %v\n", e.SQLState, e.Number) + return http.StatusUnprocessableEntity, e.Message + default: + fmt.Printf("\nerror: %T| %v\n", err, err) + return http.StatusInternalServerError, err.Error() + } +} diff --git a/oa/etc/main.yaml b/oa/etc/main.yaml index e83c759..31bc68f 100644 --- a/oa/etc/main.yaml +++ b/oa/etc/main.yaml @@ -1,3 +1,10 @@ -Name: main -Host: 0.0.0.0 -Port: 8888 +name: oa +host: 0.0.0.0 +port: 4000 +verbose: true +uuid: FR9P5t8debxc11aFF +db: root:123456@tcp(localhost:3306)/oa +auth: + AccessSecret: AMpjwQHwVjGsb1WC4WG6 + AccessExpire: 3600 + diff --git a/oa/go.mod b/oa/go.mod index 5158b29..ddb90b8 100644 --- a/oa/go.mod +++ b/oa/go.mod @@ -2,7 +2,10 @@ module oa go 1.21.5 -require github.com/zeromicro/go-zero v1.7.0 +require ( + github.com/zeromicro/go-zero v1.7.0 + github.com/zeromicro/x v0.0.0-20240408115609-8224c482b07e +) require ( filippo.io/edwards25519 v1.1.0 // indirect diff --git a/oa/go.sum b/oa/go.sum index 41d2871..bcb3054 100644 --- a/oa/go.sum +++ b/oa/go.sum @@ -85,6 +85,8 @@ github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw= github.com/zeromicro/go-zero v1.7.0 h1:B+y7tUVlo3qVQ6F0I0R9bi+Dq4I1QdO9ZB+dz1r0p1s= github.com/zeromicro/go-zero v1.7.0/go.mod h1:ypW4PzQI+jUrMcNJDDQ+7YW+pE+tMua9Xj/pmtmS1Dc= +github.com/zeromicro/x v0.0.0-20240408115609-8224c482b07e h1:F5waakzloTfbJg2lcO1xvrzO6ssn7jQ38lXIDBz+nbQ= +github.com/zeromicro/x v0.0.0-20240408115609-8224c482b07e/go.mod h1:5TP11tc1RHPCi5C/KDL0kIB0KgJAb9FB3ChpT/qM/jA= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/exporters/jaeger v1.17.0 h1:D7UpUy2Xc2wsi1Ras6V40q806WM07rqoCWzXu7Sqy+4= diff --git a/oa/internal/config/config.go b/oa/internal/config/config.go index 8da153d..a10b695 100644 --- a/oa/internal/config/config.go +++ b/oa/internal/config/config.go @@ -4,4 +4,5 @@ import "github.com/zeromicro/go-zero/rest" type Config struct { rest.RestConf + DB string } diff --git a/oa/internal/handler/app/loginhandler.go b/oa/internal/handler/app/loginhandler.go index 9e17d15..7510597 100644 --- a/oa/internal/handler/app/loginhandler.go +++ b/oa/internal/handler/app/loginhandler.go @@ -3,6 +3,8 @@ package app import ( "net/http" + "oa/errs" + "github.com/zeromicro/go-zero/rest/httpx" "oa/internal/logic/app" "oa/internal/svc" @@ -13,16 +15,12 @@ func LoginHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { var req types.AppReq if err := httpx.Parse(r, &req); err != nil { - httpx.ErrorCtx(r.Context(), w, err) + errs.Response(w, nil, err) return } l := app.NewLoginLogic(r.Context(), svcCtx) resp, err := l.Login(&req) - if err != nil { - httpx.ErrorCtx(r.Context(), w, err) - } else { - httpx.OkJsonCtx(r.Context(), w, resp) - } + errs.Response(w, resp, err) } } diff --git a/oa/internal/handler/routes.go b/oa/internal/handler/routes.go index dd85735..88883c1 100644 --- a/oa/internal/handler/routes.go +++ b/oa/internal/handler/routes.go @@ -26,11 +26,35 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { server.AddRoutes( []rest.Route{ { - Method: http.MethodPost, - Path: "/login", + Method: http.MethodHead, + Path: "/", Handler: user.LoginHandler(serverCtx), }, + { + Method: http.MethodPost, + Path: "/", + Handler: user.RegHandler(serverCtx), + }, }, rest.WithPrefix("/api/user"), ) + + server.AddRoutes( + rest.WithMiddlewares( + []rest.Middleware{serverCtx.Auth}, + []rest.Route{ + { + Method: http.MethodGet, + Path: "/", + Handler: user.ListHandler(serverCtx), + }, + { + Method: http.MethodGet, + Path: "/:id", + Handler: user.GetHandler(serverCtx), + }, + }..., + ), + rest.WithPrefix("/api/user"), + ) } diff --git a/oa/internal/handler/user/gethandler.go b/oa/internal/handler/user/gethandler.go new file mode 100644 index 0000000..b1e530c --- /dev/null +++ b/oa/internal/handler/user/gethandler.go @@ -0,0 +1,26 @@ +package user + +import ( + "net/http" + + "oa/errs" + + "github.com/zeromicro/go-zero/rest/httpx" + "oa/internal/logic/user" + "oa/internal/svc" + "oa/internal/types" +) + +func GetHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + var req types.GetReq + if err := httpx.Parse(r, &req); err != nil { + errs.Response(w, nil, err) + return + } + + l := user.NewGetLogic(r.Context(), svcCtx) + resp, err := l.Get(&req) + errs.Response(w, resp, err) + } +} diff --git a/oa/internal/handler/user/listhandler.go b/oa/internal/handler/user/listhandler.go new file mode 100644 index 0000000..5f7c5fd --- /dev/null +++ b/oa/internal/handler/user/listhandler.go @@ -0,0 +1,26 @@ +package user + +import ( + "net/http" + + "oa/errs" + + "github.com/zeromicro/go-zero/rest/httpx" + "oa/internal/logic/user" + "oa/internal/svc" + "oa/internal/types" +) + +func ListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + var req types.ListReq + if err := httpx.Parse(r, &req); err != nil { + errs.Response(w, nil, err) + return + } + + l := user.NewListLogic(r.Context(), svcCtx) + resp, err := l.List(&req) + errs.Response(w, resp, err) + } +} diff --git a/oa/internal/handler/user/loginhandler.go b/oa/internal/handler/user/loginhandler.go index 9786607..859433a 100644 --- a/oa/internal/handler/user/loginhandler.go +++ b/oa/internal/handler/user/loginhandler.go @@ -3,6 +3,8 @@ package user import ( "net/http" + "oa/errs" + "github.com/zeromicro/go-zero/rest/httpx" "oa/internal/logic/user" "oa/internal/svc" @@ -13,16 +15,12 @@ func LoginHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { var req types.LoginReq if err := httpx.Parse(r, &req); err != nil { - httpx.ErrorCtx(r.Context(), w, err) + errs.Response(w, nil, err) return } l := user.NewLoginLogic(r.Context(), svcCtx) - resp, err := l.Login(&req) - if err != nil { - httpx.ErrorCtx(r.Context(), w, err) - } else { - httpx.OkJsonCtx(r.Context(), w, resp) - } + err := l.Login(&req) + errs.Response(w, nil, err) } } diff --git a/oa/internal/handler/user/reghandler.go b/oa/internal/handler/user/reghandler.go new file mode 100644 index 0000000..fe5d281 --- /dev/null +++ b/oa/internal/handler/user/reghandler.go @@ -0,0 +1,27 @@ +package user + +import ( + "net/http" + + "oa/errs" + + "oa/internal/logic/user" + "oa/internal/svc" + "oa/internal/types" + + "github.com/zeromicro/go-zero/rest/httpx" +) + +func RegHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + var req types.RegReq + if err := httpx.Parse(r, &req); err != nil { + errs.Response(w, nil, err) + return + } + + l := user.NewRegLogic(r.Context(), svcCtx) + err := l.Reg(&req) + errs.Response(w, nil, err) + } +} diff --git a/oa/internal/logic/user/getlogic.go b/oa/internal/logic/user/getlogic.go new file mode 100644 index 0000000..6a3e9a7 --- /dev/null +++ b/oa/internal/logic/user/getlogic.go @@ -0,0 +1,30 @@ +package user + +import ( + "context" + + "oa/internal/svc" + "oa/internal/types" + + "github.com/zeromicro/go-zero/core/logx" +) + +type GetLogic struct { + logx.Logger + ctx context.Context + svcCtx *svc.ServiceContext +} + +func NewGetLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetLogic { + return &GetLogic{ + Logger: logx.WithContext(ctx), + ctx: ctx, + svcCtx: svcCtx, + } +} + +func (l *GetLogic) Get(req *types.GetReq) (resp *types.UserResp, err error) { + // todo: add your logic here and delete this line + + return +} diff --git a/oa/internal/logic/user/listlogic.go b/oa/internal/logic/user/listlogic.go new file mode 100644 index 0000000..81d9dd3 --- /dev/null +++ b/oa/internal/logic/user/listlogic.go @@ -0,0 +1,30 @@ +package user + +import ( + "context" + + "oa/internal/svc" + "oa/internal/types" + + "github.com/zeromicro/go-zero/core/logx" +) + +type ListLogic struct { + logx.Logger + ctx context.Context + svcCtx *svc.ServiceContext +} + +func NewListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ListLogic { + return &ListLogic{ + Logger: logx.WithContext(ctx), + ctx: ctx, + svcCtx: svcCtx, + } +} + +func (l *ListLogic) List(req *types.ListReq) (resp []types.UserResp, err error) { + // todo: add your logic here and delete this line + + return +} diff --git a/oa/internal/logic/user/loginlogic.go b/oa/internal/logic/user/loginlogic.go index 354d1ce..bffac4c 100644 --- a/oa/internal/logic/user/loginlogic.go +++ b/oa/internal/logic/user/loginlogic.go @@ -23,8 +23,8 @@ func NewLoginLogic(ctx context.Context, svcCtx *svc.ServiceContext) *LoginLogic } } -func (l *LoginLogic) Login(req *types.LoginReq) (resp *types.LoginResp, err error) { +func (l *LoginLogic) Login(req *types.LoginReq) error { // todo: add your logic here and delete this line - return + return nil } diff --git a/oa/internal/logic/user/reglogic.go b/oa/internal/logic/user/reglogic.go new file mode 100644 index 0000000..eeca781 --- /dev/null +++ b/oa/internal/logic/user/reglogic.go @@ -0,0 +1,43 @@ +package user + +import ( + "context" + "strings" + "time" + + "oa/internal/svc" + "oa/internal/types" + "oa/models" + + "github.com/google/uuid" + "github.com/zeromicro/go-zero/core/logx" +) + +type RegLogic struct { + logx.Logger + ctx context.Context + svcCtx *svc.ServiceContext +} + +func NewRegLogic(ctx context.Context, svcCtx *svc.ServiceContext) *RegLogic { + return &RegLogic{ + Logger: logx.WithContext(ctx), + ctx: ctx, + svcCtx: svcCtx, + } +} + +func (l *RegLogic) Reg(req *types.RegReq) error { + // todo: add your logic here and delete this line + + m := models.NewUserModel(l.svcCtx.Sqlx()) + u := &models.User{ + Id: strings.ReplaceAll(uuid.New().String(), "-", ""), + Created: time.Now(), + Updated: time.Now(), + Username: req.Username, + } + l.Infof("user: %v", u.Id) + _, e := m.Insert(l.ctx, u) + return e +} diff --git a/oa/internal/middleware/authmiddleware.go b/oa/internal/middleware/authmiddleware.go new file mode 100644 index 0000000..2c72a83 --- /dev/null +++ b/oa/internal/middleware/authmiddleware.go @@ -0,0 +1,25 @@ +package middleware + +import ( + "context" + "net/http" +) + +type AuthMiddleware struct { + ID string `json:"id"` +} + +func NewAuthMiddleware() *AuthMiddleware { + return &AuthMiddleware{} +} + +func (m *AuthMiddleware) Handle(next http.HandlerFunc) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + // TODO generate middleware implement function, delete after code implementation + + // Passthrough to next handler if need + // val := r.Header.Get("User-Agent") + ctx := context.WithValue(r.Context(), "u", "123") + next(w, r.WithContext(ctx)) + } +} diff --git a/oa/internal/svc/servicecontext.go b/oa/internal/svc/servicecontext.go index 47d564e..07d85fe 100644 --- a/oa/internal/svc/servicecontext.go +++ b/oa/internal/svc/servicecontext.go @@ -2,14 +2,28 @@ package svc import ( "oa/internal/config" + "oa/internal/middleware" + + "github.com/zeromicro/go-zero/core/stores/sqlx" + "github.com/zeromicro/go-zero/rest" ) type ServiceContext struct { Config config.Config + Auth rest.Middleware + _conn sqlx.SqlConn +} + +func (s *ServiceContext) Sqlx() sqlx.SqlConn { + if s._conn == nil { + s._conn = sqlx.NewMysql(s.Config.DB) + } + return s._conn } func NewServiceContext(c config.Config) *ServiceContext { return &ServiceContext{ Config: c, + Auth: middleware.NewAuthMiddleware().Handle, } } diff --git a/oa/internal/types/types.go b/oa/internal/types/types.go index 8b9fb43..8f51ddc 100644 --- a/oa/internal/types/types.go +++ b/oa/internal/types/types.go @@ -2,7 +2,6 @@ package types type AppReq struct { - Error Appname string `json:"username"` Password string `json:"password"` } @@ -15,19 +14,38 @@ type AppResp struct { } type LoginReq struct { - Error + Id string `json:"id"` + Code string `json:"code"` + Verify string `json:"verify"` +} + +type RegReq struct { Username string `json:"username"` - Password string `json:"password"` + Pwd string `json:"pwd"` } -type LoginResp struct { - Id int64 `json:"id"` - Name string `json:"name"` - Token string `json:"token"` - ExpireAt string `json:"expireAt"` +type Auth struct { + Authorization string `header:"authorization"` +} + +type GetReq struct { + Id int64 `path:"id"` } -type Error struct { - Status string `json:"status"` - Code int `json:"code"` +type ListReq struct { + Username string `query:"username"` +} + +type UserResp struct { + Id string `json:"id"` + Created uint `json:"created"` + Updated uint `json:"updated"` + Username string `json:"username"` + Nickname string `json:"nickname"` + Email string `json:"email"` + Phone string `json:"phone"` + Icon string `json:"icon"` + Status int64 `json:"status"` // 状态（0：ok，1：disabled） + Used int64 `json:"used"` + Space int64 `json:"space"` } diff --git a/oa/main.go b/oa/main.go index d9356a2..0fbcf8e 100644 --- a/oa/main.go +++ b/oa/main.go @@ -4,12 +4,14 @@ import ( "flag" "fmt" + "oa/errs" "oa/internal/config" "oa/internal/handler" "oa/internal/svc" "github.com/zeromicro/go-zero/core/conf" "github.com/zeromicro/go-zero/rest" + "github.com/zeromicro/go-zero/rest/httpx" ) var configFile = flag.String("f", "etc/main.yaml", "the config file") @@ -25,6 +27,7 @@ func main() { ctx := svc.NewServiceContext(c) handler.RegisterHandlers(server, ctx) + httpx.SetErrorHandler(errs.ErrorHandler) fmt.Printf("Starting server at %s:%d...\n", c.Host, c.Port) server.Start() diff --git a/oa/models/accessmodel.go b/oa/models/accessmodel.go index 556a1f1..92d59ac 100755 --- a/oa/models/accessmodel.go +++ b/oa/models/accessmodel.go @@ -1,9 +1,6 @@ package models -import ( - "github.com/zeromicro/go-zero/core/stores/cache" - "github.com/zeromicro/go-zero/core/stores/sqlx" -) +import "github.com/zeromicro/go-zero/core/stores/sqlx" var _ AccessModel = (*customAccessModel)(nil) @@ -12,6 +9,7 @@ type ( // and implement the added methods in customAccessModel. AccessModel interface { accessModel + withSession(session sqlx.Session) AccessModel } customAccessModel struct { @@ -20,8 +18,12 @@ type ( ) // NewAccessModel returns a model for the database table. -func NewAccessModel(conn sqlx.SqlConn, c cache.CacheConf, opts ...cache.Option) AccessModel { +func NewAccessModel(conn sqlx.SqlConn) AccessModel { return &customAccessModel{ - defaultAccessModel: newAccessModel(conn, c, opts...), + defaultAccessModel: newAccessModel(conn), } } + +func (m *customAccessModel) withSession(session sqlx.Session) AccessModel { + return NewAccessModel(sqlx.NewSqlConnFromSession(session)) +} diff --git a/oa/models/accessmodel_gen.go b/oa/models/accessmodel_gen.go index 9962cda..651eaad 100755 --- a/oa/models/accessmodel_gen.go +++ b/oa/models/accessmodel_gen.go @@ -10,8 +10,6 @@ import ( "time" "github.com/zeromicro/go-zero/core/stores/builder" - "github.com/zeromicro/go-zero/core/stores/cache" - "github.com/zeromicro/go-zero/core/stores/sqlc" "github.com/zeromicro/go-zero/core/stores/sqlx" "github.com/zeromicro/go-zero/core/stringx" ) @@ -21,8 +19,6 @@ var ( accessRows = strings.Join(accessFieldNames, ",") accessRowsExpectAutoSet = strings.Join(stringx.Remove(accessFieldNames, "`id`", "`create_at`", "`create_time`", "`created_at`", "`update_at`", "`update_time`", "`updated_at`"), ",") accessRowsWithPlaceHolder = strings.Join(stringx.Remove(accessFieldNames, "`id`", "`create_at`", "`create_time`", "`created_at`", "`update_at`", "`update_time`", "`updated_at`"), "=?,") + "=?" - - cacheOaAccessIdPrefix = "cache:oa:access:id:" ) type ( @@ -34,7 +30,7 @@ type ( } defaultAccessModel struct { - sqlc.CachedConn + conn sqlx.SqlConn table string } @@ -52,33 +48,27 @@ type ( } ) -func newAccessModel(conn sqlx.SqlConn, c cache.CacheConf, opts ...cache.Option) *defaultAccessModel { +func newAccessModel(conn sqlx.SqlConn) *defaultAccessModel { return &defaultAccessModel{ - CachedConn: sqlc.NewConn(conn, c, opts...), - table: "`access`", + conn: conn, + table: "`access`", } } func (m *defaultAccessModel) Delete(ctx context.Context, id int64) error { - oaAccessIdKey := fmt.Sprintf("%s%v", cacheOaAccessIdPrefix, id) - _, err := m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { - query := fmt.Sprintf("delete from %s where `id` = ?", m.table) - return conn.ExecCtx(ctx, query, id) - }, oaAccessIdKey) + query := fmt.Sprintf("delete from %s where `id` = ?", m.table) + _, err := m.conn.ExecCtx(ctx, query, id) return err } func (m *defaultAccessModel) FindOne(ctx context.Context, id int64) (*Access, error) { - oaAccessIdKey := fmt.Sprintf("%s%v", cacheOaAccessIdPrefix, id) + query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", accessRows, m.table) var resp Access - err := m.QueryRowCtx(ctx, &resp, oaAccessIdKey, func(ctx context.Context, conn sqlx.SqlConn, v any) error { - query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", accessRows, m.table) - return conn.QueryRowCtx(ctx, v, query, id) - }) + err := m.conn.QueryRowCtx(ctx, &resp, query, id) switch err { case nil: return &resp, nil - case sqlc.ErrNotFound: + case sqlx.ErrNotFound: return nil, ErrNotFound default: return nil, err @@ -86,32 +76,17 @@ func (m *defaultAccessModel) FindOne(ctx context.Context, id int64) (*Access, er } func (m *defaultAccessModel) Insert(ctx context.Context, data *Access) (sql.Result, error) { - oaAccessIdKey := fmt.Sprintf("%s%v", cacheOaAccessIdPrefix, data.Id) - ret, err := m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { - query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, accessRowsExpectAutoSet) - return conn.ExecCtx(ctx, query, data.Created, data.Updated, data.AppId, data.AccessId, data.Name, data.RoleId, data.UserId, data.Rid, data.Level) - }, oaAccessIdKey) + query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, accessRowsExpectAutoSet) + ret, err := m.conn.ExecCtx(ctx, query, data.Created, data.Updated, data.AppId, data.AccessId, data.Name, data.RoleId, data.UserId, data.Rid, data.Level) return ret, err } func (m *defaultAccessModel) Update(ctx context.Context, data *Access) error { - oaAccessIdKey := fmt.Sprintf("%s%v", cacheOaAccessIdPrefix, data.Id) - _, err := m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { - query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, accessRowsWithPlaceHolder) - return conn.ExecCtx(ctx, query, data.Created, data.Updated, data.AppId, data.AccessId, data.Name, data.RoleId, data.UserId, data.Rid, data.Level, data.Id) - }, oaAccessIdKey) + query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, accessRowsWithPlaceHolder) + _, err := m.conn.ExecCtx(ctx, query, data.Created, data.Updated, data.AppId, data.AccessId, data.Name, data.RoleId, data.UserId, data.Rid, data.Level, data.Id) return err } -func (m *defaultAccessModel) formatPrimary(primary any) string { - return fmt.Sprintf("%s%v", cacheOaAccessIdPrefix, primary) -} - -func (m *defaultAccessModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary any) error { - query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", accessRows, m.table) - return conn.QueryRowCtx(ctx, v, query, primary) -} - func (m *defaultAccessModel) tableName() string { return m.table } diff --git a/oa/models/appmodel.go b/oa/models/appmodel.go index ba22ae9..38cd916 100755 --- a/oa/models/appmodel.go +++ b/oa/models/appmodel.go @@ -1,9 +1,6 @@ package models -import ( - "github.com/zeromicro/go-zero/core/stores/cache" - "github.com/zeromicro/go-zero/core/stores/sqlx" -) +import "github.com/zeromicro/go-zero/core/stores/sqlx" var _ AppModel = (*customAppModel)(nil) @@ -12,6 +9,7 @@ type ( // and implement the added methods in customAppModel. AppModel interface { appModel + withSession(session sqlx.Session) AppModel } customAppModel struct { @@ -20,8 +18,12 @@ type ( ) // NewAppModel returns a model for the database table. -func NewAppModel(conn sqlx.SqlConn, c cache.CacheConf, opts ...cache.Option) AppModel { +func NewAppModel(conn sqlx.SqlConn) AppModel { return &customAppModel{ - defaultAppModel: newAppModel(conn, c, opts...), + defaultAppModel: newAppModel(conn), } } + +func (m *customAppModel) withSession(session sqlx.Session) AppModel { + return NewAppModel(sqlx.NewSqlConnFromSession(session)) +} diff --git a/oa/models/appmodel_gen.go b/oa/models/appmodel_gen.go index f4fcea1..ef0a5c6 100755 --- a/oa/models/appmodel_gen.go +++ b/oa/models/appmodel_gen.go @@ -10,8 +10,6 @@ import ( "time" "github.com/zeromicro/go-zero/core/stores/builder" - "github.com/zeromicro/go-zero/core/stores/cache" - "github.com/zeromicro/go-zero/core/stores/sqlc" "github.com/zeromicro/go-zero/core/stores/sqlx" "github.com/zeromicro/go-zero/core/stringx" ) @@ -21,8 +19,6 @@ var ( appRows = strings.Join(appFieldNames, ",") appRowsExpectAutoSet = strings.Join(stringx.Remove(appFieldNames, "`create_at`", "`create_time`", "`created_at`", "`update_at`", "`update_time`", "`updated_at`"), ",") appRowsWithPlaceHolder = strings.Join(stringx.Remove(appFieldNames, "`id`", "`create_at`", "`create_time`", "`created_at`", "`update_at`", "`update_time`", "`updated_at`"), "=?,") + "=?" - - cacheOaAppIdPrefix = "cache:oa:app:id:" ) type ( @@ -34,7 +30,7 @@ type ( } defaultAppModel struct { - sqlc.CachedConn + conn sqlx.SqlConn table string } @@ -56,33 +52,27 @@ type ( } ) -func newAppModel(conn sqlx.SqlConn, c cache.CacheConf, opts ...cache.Option) *defaultAppModel { +func newAppModel(conn sqlx.SqlConn) *defaultAppModel { return &defaultAppModel{ - CachedConn: sqlc.NewConn(conn, c, opts...), - table: "`app`", + conn: conn, + table: "`app`", } } func (m *defaultAppModel) Delete(ctx context.Context, id string) error { - oaAppIdKey := fmt.Sprintf("%s%v", cacheOaAppIdPrefix, id) - _, err := m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { - query := fmt.Sprintf("delete from %s where `id` = ?", m.table) - return conn.ExecCtx(ctx, query, id) - }, oaAppIdKey) + query := fmt.Sprintf("delete from %s where `id` = ?", m.table) + _, err := m.conn.ExecCtx(ctx, query, id) return err } func (m *defaultAppModel) FindOne(ctx context.Context, id string) (*App, error) { - oaAppIdKey := fmt.Sprintf("%s%v", cacheOaAppIdPrefix, id) + query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", appRows, m.table) var resp App - err := m.QueryRowCtx(ctx, &resp, oaAppIdKey, func(ctx context.Context, conn sqlx.SqlConn, v any) error { - query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", appRows, m.table) - return conn.QueryRowCtx(ctx, v, query, id) - }) + err := m.conn.QueryRowCtx(ctx, &resp, query, id) switch err { case nil: return &resp, nil - case sqlc.ErrNotFound: + case sqlx.ErrNotFound: return nil, ErrNotFound default: return nil, err @@ -90,32 +80,17 @@ func (m *defaultAppModel) FindOne(ctx context.Context, id string) (*App, error) } func (m *defaultAppModel) Insert(ctx context.Context, data *App) (sql.Result, error) { - oaAppIdKey := fmt.Sprintf("%s%v", cacheOaAppIdPrefix, data.Id) - ret, err := m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { - query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, appRowsExpectAutoSet) - return conn.ExecCtx(ctx, query, data.Id, data.Created, data.Updated, data.Key, data.Name, data.Icon, data.Des, data.UserCount, data.Hide, data.JoinMethod, data.RoleId, data.Host, data.Redirect, data.Status) - }, oaAppIdKey) + query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, appRowsExpectAutoSet) + ret, err := m.conn.ExecCtx(ctx, query, data.Id, data.Created, data.Updated, data.Key, data.Name, data.Icon, data.Des, data.UserCount, data.Hide, data.JoinMethod, data.RoleId, data.Host, data.Redirect, data.Status) return ret, err } func (m *defaultAppModel) Update(ctx context.Context, data *App) error { - oaAppIdKey := fmt.Sprintf("%s%v", cacheOaAppIdPrefix, data.Id) - _, err := m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { - query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, appRowsWithPlaceHolder) - return conn.ExecCtx(ctx, query, data.Created, data.Updated, data.Key, data.Name, data.Icon, data.Des, data.UserCount, data.Hide, data.JoinMethod, data.RoleId, data.Host, data.Redirect, data.Status, data.Id) - }, oaAppIdKey) + query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, appRowsWithPlaceHolder) + _, err := m.conn.ExecCtx(ctx, query, data.Created, data.Updated, data.Key, data.Name, data.Icon, data.Des, data.UserCount, data.Hide, data.JoinMethod, data.RoleId, data.Host, data.Redirect, data.Status, data.Id) return err } -func (m *defaultAppModel) formatPrimary(primary any) string { - return fmt.Sprintf("%s%v", cacheOaAppIdPrefix, primary) -} - -func (m *defaultAppModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary any) error { - query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", appRows, m.table) - return conn.QueryRowCtx(ctx, v, query, primary) -} - func (m *defaultAppModel) tableName() string { return m.table } diff --git a/oa/models/appusermodel.go b/oa/models/appusermodel.go index e37de58..6543291 100755 --- a/oa/models/appusermodel.go +++ b/oa/models/appusermodel.go @@ -1,9 +1,6 @@ package models -import ( - "github.com/zeromicro/go-zero/core/stores/cache" - "github.com/zeromicro/go-zero/core/stores/sqlx" -) +import "github.com/zeromicro/go-zero/core/stores/sqlx" var _ AppUserModel = (*customAppUserModel)(nil) @@ -12,6 +9,7 @@ type ( // and implement the added methods in customAppUserModel. AppUserModel interface { appUserModel + withSession(session sqlx.Session) AppUserModel } customAppUserModel struct { @@ -20,8 +18,12 @@ type ( ) // NewAppUserModel returns a model for the database table. -func NewAppUserModel(conn sqlx.SqlConn, c cache.CacheConf, opts ...cache.Option) AppUserModel { +func NewAppUserModel(conn sqlx.SqlConn) AppUserModel { return &customAppUserModel{ - defaultAppUserModel: newAppUserModel(conn, c, opts...), + defaultAppUserModel: newAppUserModel(conn), } } + +func (m *customAppUserModel) withSession(session sqlx.Session) AppUserModel { + return NewAppUserModel(sqlx.NewSqlConnFromSession(session)) +} diff --git a/oa/models/appusermodel_gen.go b/oa/models/appusermodel_gen.go index c20a968..29e1e97 100755 --- a/oa/models/appusermodel_gen.go +++ b/oa/models/appusermodel_gen.go @@ -10,8 +10,6 @@ import ( "time" "github.com/zeromicro/go-zero/core/stores/builder" - "github.com/zeromicro/go-zero/core/stores/cache" - "github.com/zeromicro/go-zero/core/stores/sqlc" "github.com/zeromicro/go-zero/core/stores/sqlx" "github.com/zeromicro/go-zero/core/stringx" ) @@ -21,9 +19,6 @@ var ( appUserRows = strings.Join(appUserFieldNames, ",") appUserRowsExpectAutoSet = strings.Join(stringx.Remove(appUserFieldNames, "`id`", "`create_at`", "`create_time`", "`created_at`", "`update_at`", "`update_time`", "`updated_at`"), ",") appUserRowsWithPlaceHolder = strings.Join(stringx.Remove(appUserFieldNames, "`id`", "`create_at`", "`create_time`", "`created_at`", "`update_at`", "`update_time`", "`updated_at`"), "=?,") + "=?" - - cacheOaAppUserIdPrefix = "cache:oa:appUser:id:" - cacheOaAppUserUserIdAppIdPrefix = "cache:oa:appUser:userId:appId:" ) type ( @@ -36,7 +31,7 @@ type ( } defaultAppUserModel struct { - sqlc.CachedConn + conn sqlx.SqlConn table string } @@ -50,39 +45,27 @@ type ( } ) -func newAppUserModel(conn sqlx.SqlConn, c cache.CacheConf, opts ...cache.Option) *defaultAppUserModel { +func newAppUserModel(conn sqlx.SqlConn) *defaultAppUserModel { return &defaultAppUserModel{ - CachedConn: sqlc.NewConn(conn, c, opts...), - table: "`app_user`", + conn: conn, + table: "`app_user`", } } func (m *defaultAppUserModel) Delete(ctx context.Context, id int64) error { - data, err := m.FindOne(ctx, id) - if err != nil { - return err - } - - oaAppUserIdKey := fmt.Sprintf("%s%v", cacheOaAppUserIdPrefix, id) - oaAppUserUserIdAppIdKey := fmt.Sprintf("%s%v:%v", cacheOaAppUserUserIdAppIdPrefix, data.UserId, data.AppId) - _, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { - query := fmt.Sprintf("delete from %s where `id` = ?", m.table) - return conn.ExecCtx(ctx, query, id) - }, oaAppUserIdKey, oaAppUserUserIdAppIdKey) + query := fmt.Sprintf("delete from %s where `id` = ?", m.table) + _, err := m.conn.ExecCtx(ctx, query, id) return err } func (m *defaultAppUserModel) FindOne(ctx context.Context, id int64) (*AppUser, error) { - oaAppUserIdKey := fmt.Sprintf("%s%v", cacheOaAppUserIdPrefix, id) + query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", appUserRows, m.table) var resp AppUser - err := m.QueryRowCtx(ctx, &resp, oaAppUserIdKey, func(ctx context.Context, conn sqlx.SqlConn, v any) error { - query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", appUserRows, m.table) - return conn.QueryRowCtx(ctx, v, query, id) - }) + err := m.conn.QueryRowCtx(ctx, &resp, query, id) switch err { case nil: return &resp, nil - case sqlc.ErrNotFound: + case sqlx.ErrNotFound: return nil, ErrNotFound default: return nil, err @@ -90,19 +73,13 @@ func (m *defaultAppUserModel) FindOne(ctx context.Context, id int64) (*AppUser, } func (m *defaultAppUserModel) FindOneByUserIdAppId(ctx context.Context, userId string, appId string) (*AppUser, error) { - oaAppUserUserIdAppIdKey := fmt.Sprintf("%s%v:%v", cacheOaAppUserUserIdAppIdPrefix, userId, appId) var resp AppUser - err := m.QueryRowIndexCtx(ctx, &resp, oaAppUserUserIdAppIdKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v any) (i any, e error) { - query := fmt.Sprintf("select %s from %s where `user_id` = ? and `app_id` = ? limit 1", appUserRows, m.table) - if err := conn.QueryRowCtx(ctx, &resp, query, userId, appId); err != nil { - return nil, err - } - return resp.Id, nil - }, m.queryPrimary) + query := fmt.Sprintf("select %s from %s where `user_id` = ? and `app_id` = ? limit 1", appUserRows, m.table) + err := m.conn.QueryRowCtx(ctx, &resp, query, userId, appId) switch err { case nil: return &resp, nil - case sqlc.ErrNotFound: + case sqlx.ErrNotFound: return nil, ErrNotFound default: return nil, err @@ -110,39 +87,17 @@ func (m *defaultAppUserModel) FindOneByUserIdAppId(ctx context.Context, userId s } func (m *defaultAppUserModel) Insert(ctx context.Context, data *AppUser) (sql.Result, error) { - oaAppUserIdKey := fmt.Sprintf("%s%v", cacheOaAppUserIdPrefix, data.Id) - oaAppUserUserIdAppIdKey := fmt.Sprintf("%s%v:%v", cacheOaAppUserUserIdAppIdPrefix, data.UserId, data.AppId) - ret, err := m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { - query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?)", m.table, appUserRowsExpectAutoSet) - return conn.ExecCtx(ctx, query, data.Created, data.Updated, data.AppId, data.UserId, data.Status) - }, oaAppUserIdKey, oaAppUserUserIdAppIdKey) + query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?)", m.table, appUserRowsExpectAutoSet) + ret, err := m.conn.ExecCtx(ctx, query, data.Created, data.Updated, data.AppId, data.UserId, data.Status) return ret, err } func (m *defaultAppUserModel) Update(ctx context.Context, newData *AppUser) error { - data, err := m.FindOne(ctx, newData.Id) - if err != nil { - return err - } - - oaAppUserIdKey := fmt.Sprintf("%s%v", cacheOaAppUserIdPrefix, data.Id) - oaAppUserUserIdAppIdKey := fmt.Sprintf("%s%v:%v", cacheOaAppUserUserIdAppIdPrefix, data.UserId, data.AppId) - _, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { - query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, appUserRowsWithPlaceHolder) - return conn.ExecCtx(ctx, query, newData.Created, newData.Updated, newData.AppId, newData.UserId, newData.Status, newData.Id) - }, oaAppUserIdKey, oaAppUserUserIdAppIdKey) + query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, appUserRowsWithPlaceHolder) + _, err := m.conn.ExecCtx(ctx, query, newData.Created, newData.Updated, newData.AppId, newData.UserId, newData.Status, newData.Id) return err } -func (m *defaultAppUserModel) formatPrimary(primary any) string { - return fmt.Sprintf("%s%v", cacheOaAppUserIdPrefix, primary) -} - -func (m *defaultAppUserModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary any) error { - query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", appUserRows, m.table) - return conn.QueryRowCtx(ctx, v, query, primary) -} - func (m *defaultAppUserModel) tableName() string { return m.table } diff --git a/oa/models/resourcemodel.go b/oa/models/resourcemodel.go index de2172a..780aa8d 100755 --- a/oa/models/resourcemodel.go +++ b/oa/models/resourcemodel.go @@ -1,9 +1,6 @@ package models -import ( - "github.com/zeromicro/go-zero/core/stores/cache" - "github.com/zeromicro/go-zero/core/stores/sqlx" -) +import "github.com/zeromicro/go-zero/core/stores/sqlx" var _ ResourceModel = (*customResourceModel)(nil) @@ -12,6 +9,7 @@ type ( // and implement the added methods in customResourceModel. ResourceModel interface { resourceModel + withSession(session sqlx.Session) ResourceModel } customResourceModel struct { @@ -20,8 +18,12 @@ type ( ) // NewResourceModel returns a model for the database table. -func NewResourceModel(conn sqlx.SqlConn, c cache.CacheConf, opts ...cache.Option) ResourceModel { +func NewResourceModel(conn sqlx.SqlConn) ResourceModel { return &customResourceModel{ - defaultResourceModel: newResourceModel(conn, c, opts...), + defaultResourceModel: newResourceModel(conn), } } + +func (m *customResourceModel) withSession(session sqlx.Session) ResourceModel { + return NewResourceModel(sqlx.NewSqlConnFromSession(session)) +} diff --git a/oa/models/resourcemodel_gen.go b/oa/models/resourcemodel_gen.go index de6b3a4..7bdebce 100755 --- a/oa/models/resourcemodel_gen.go +++ b/oa/models/resourcemodel_gen.go @@ -10,8 +10,6 @@ import ( "time" "github.com/zeromicro/go-zero/core/stores/builder" - "github.com/zeromicro/go-zero/core/stores/cache" - "github.com/zeromicro/go-zero/core/stores/sqlc" "github.com/zeromicro/go-zero/core/stores/sqlx" "github.com/zeromicro/go-zero/core/stringx" ) @@ -21,9 +19,6 @@ var ( resourceRows = strings.Join(resourceFieldNames, ",") resourceRowsExpectAutoSet = strings.Join(stringx.Remove(resourceFieldNames, "`id`", "`create_at`", "`create_time`", "`created_at`", "`update_at`", "`update_time`", "`updated_at`"), ",") resourceRowsWithPlaceHolder = strings.Join(stringx.Remove(resourceFieldNames, "`id`", "`create_at`", "`create_time`", "`created_at`", "`update_at`", "`update_time`", "`updated_at`"), "=?,") + "=?" - - cacheOaResourceIdPrefix = "cache:oa:resource:id:" - cacheOaResourceAppIdNamePrefix = "cache:oa:resource:appId:name:" ) type ( @@ -36,7 +31,7 @@ type ( } defaultResourceModel struct { - sqlc.CachedConn + conn sqlx.SqlConn table string } @@ -50,39 +45,27 @@ type ( } ) -func newResourceModel(conn sqlx.SqlConn, c cache.CacheConf, opts ...cache.Option) *defaultResourceModel { +func newResourceModel(conn sqlx.SqlConn) *defaultResourceModel { return &defaultResourceModel{ - CachedConn: sqlc.NewConn(conn, c, opts...), - table: "`resource`", + conn: conn, + table: "`resource`", } } func (m *defaultResourceModel) Delete(ctx context.Context, id int64) error { - data, err := m.FindOne(ctx, id) - if err != nil { - return err - } - - oaResourceAppIdNameKey := fmt.Sprintf("%s%v:%v", cacheOaResourceAppIdNamePrefix, data.AppId, data.Name) - oaResourceIdKey := fmt.Sprintf("%s%v", cacheOaResourceIdPrefix, id) - _, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { - query := fmt.Sprintf("delete from %s where `id` = ?", m.table) - return conn.ExecCtx(ctx, query, id) - }, oaResourceAppIdNameKey, oaResourceIdKey) + query := fmt.Sprintf("delete from %s where `id` = ?", m.table) + _, err := m.conn.ExecCtx(ctx, query, id) return err } func (m *defaultResourceModel) FindOne(ctx context.Context, id int64) (*Resource, error) { - oaResourceIdKey := fmt.Sprintf("%s%v", cacheOaResourceIdPrefix, id) + query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", resourceRows, m.table) var resp Resource - err := m.QueryRowCtx(ctx, &resp, oaResourceIdKey, func(ctx context.Context, conn sqlx.SqlConn, v any) error { - query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", resourceRows, m.table) - return conn.QueryRowCtx(ctx, v, query, id) - }) + err := m.conn.QueryRowCtx(ctx, &resp, query, id) switch err { case nil: return &resp, nil - case sqlc.ErrNotFound: + case sqlx.ErrNotFound: return nil, ErrNotFound default: return nil, err @@ -90,19 +73,13 @@ func (m *defaultResourceModel) FindOne(ctx context.Context, id int64) (*Resource } func (m *defaultResourceModel) FindOneByAppIdName(ctx context.Context, appId string, name string) (*Resource, error) { - oaResourceAppIdNameKey := fmt.Sprintf("%s%v:%v", cacheOaResourceAppIdNamePrefix, appId, name) var resp Resource - err := m.QueryRowIndexCtx(ctx, &resp, oaResourceAppIdNameKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v any) (i any, e error) { - query := fmt.Sprintf("select %s from %s where `app_id` = ? and `name` = ? limit 1", resourceRows, m.table) - if err := conn.QueryRowCtx(ctx, &resp, query, appId, name); err != nil { - return nil, err - } - return resp.Id, nil - }, m.queryPrimary) + query := fmt.Sprintf("select %s from %s where `app_id` = ? and `name` = ? limit 1", resourceRows, m.table) + err := m.conn.QueryRowCtx(ctx, &resp, query, appId, name) switch err { case nil: return &resp, nil - case sqlc.ErrNotFound: + case sqlx.ErrNotFound: return nil, ErrNotFound default: return nil, err @@ -110,39 +87,17 @@ func (m *defaultResourceModel) FindOneByAppIdName(ctx context.Context, appId str } func (m *defaultResourceModel) Insert(ctx context.Context, data *Resource) (sql.Result, error) { - oaResourceAppIdNameKey := fmt.Sprintf("%s%v:%v", cacheOaResourceAppIdNamePrefix, data.AppId, data.Name) - oaResourceIdKey := fmt.Sprintf("%s%v", cacheOaResourceIdPrefix, data.Id) - ret, err := m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { - query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?)", m.table, resourceRowsExpectAutoSet) - return conn.ExecCtx(ctx, query, data.Created, data.Updated, data.AppId, data.Name, data.Des) - }, oaResourceAppIdNameKey, oaResourceIdKey) + query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?)", m.table, resourceRowsExpectAutoSet) + ret, err := m.conn.ExecCtx(ctx, query, data.Created, data.Updated, data.AppId, data.Name, data.Des) return ret, err } func (m *defaultResourceModel) Update(ctx context.Context, newData *Resource) error { - data, err := m.FindOne(ctx, newData.Id) - if err != nil { - return err - } - - oaResourceAppIdNameKey := fmt.Sprintf("%s%v:%v", cacheOaResourceAppIdNamePrefix, data.AppId, data.Name) - oaResourceIdKey := fmt.Sprintf("%s%v", cacheOaResourceIdPrefix, data.Id) - _, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { - query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, resourceRowsWithPlaceHolder) - return conn.ExecCtx(ctx, query, newData.Created, newData.Updated, newData.AppId, newData.Name, newData.Des, newData.Id) - }, oaResourceAppIdNameKey, oaResourceIdKey) + query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, resourceRowsWithPlaceHolder) + _, err := m.conn.ExecCtx(ctx, query, newData.Created, newData.Updated, newData.AppId, newData.Name, newData.Des, newData.Id) return err } -func (m *defaultResourceModel) formatPrimary(primary any) string { - return fmt.Sprintf("%s%v", cacheOaResourceIdPrefix, primary) -} - -func (m *defaultResourceModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary any) error { - query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", resourceRows, m.table) - return conn.QueryRowCtx(ctx, v, query, primary) -} - func (m *defaultResourceModel) tableName() string { return m.table } diff --git a/oa/models/rolemodel.go b/oa/models/rolemodel.go index dcbc4a7..cc5079d 100755 --- a/oa/models/rolemodel.go +++ b/oa/models/rolemodel.go @@ -1,9 +1,6 @@ package models -import ( - "github.com/zeromicro/go-zero/core/stores/cache" - "github.com/zeromicro/go-zero/core/stores/sqlx" -) +import "github.com/zeromicro/go-zero/core/stores/sqlx" var _ RoleModel = (*customRoleModel)(nil) @@ -12,6 +9,7 @@ type ( // and implement the added methods in customRoleModel. RoleModel interface { roleModel + withSession(session sqlx.Session) RoleModel } customRoleModel struct { @@ -20,8 +18,12 @@ type ( ) // NewRoleModel returns a model for the database table. -func NewRoleModel(conn sqlx.SqlConn, c cache.CacheConf, opts ...cache.Option) RoleModel { +func NewRoleModel(conn sqlx.SqlConn) RoleModel { return &customRoleModel{ - defaultRoleModel: newRoleModel(conn, c, opts...), + defaultRoleModel: newRoleModel(conn), } } + +func (m *customRoleModel) withSession(session sqlx.Session) RoleModel { + return NewRoleModel(sqlx.NewSqlConnFromSession(session)) +} diff --git a/oa/models/rolemodel_gen.go b/oa/models/rolemodel_gen.go index 26c06de..7fb3ab6 100755 --- a/oa/models/rolemodel_gen.go +++ b/oa/models/rolemodel_gen.go @@ -10,8 +10,6 @@ import ( "time" "github.com/zeromicro/go-zero/core/stores/builder" - "github.com/zeromicro/go-zero/core/stores/cache" - "github.com/zeromicro/go-zero/core/stores/sqlc" "github.com/zeromicro/go-zero/core/stores/sqlx" "github.com/zeromicro/go-zero/core/stringx" ) @@ -21,8 +19,6 @@ var ( roleRows = strings.Join(roleFieldNames, ",") roleRowsExpectAutoSet = strings.Join(stringx.Remove(roleFieldNames, "`create_at`", "`create_time`", "`created_at`", "`update_at`", "`update_time`", "`updated_at`"), ",") roleRowsWithPlaceHolder = strings.Join(stringx.Remove(roleFieldNames, "`id`", "`create_at`", "`create_time`", "`created_at`", "`update_at`", "`update_time`", "`updated_at`"), "=?,") + "=?" - - cacheOaRoleIdPrefix = "cache:oa:role:id:" ) type ( @@ -34,7 +30,7 @@ type ( } defaultRoleModel struct { - sqlc.CachedConn + conn sqlx.SqlConn table string } @@ -49,33 +45,27 @@ type ( } ) -func newRoleModel(conn sqlx.SqlConn, c cache.CacheConf, opts ...cache.Option) *defaultRoleModel { +func newRoleModel(conn sqlx.SqlConn) *defaultRoleModel { return &defaultRoleModel{ - CachedConn: sqlc.NewConn(conn, c, opts...), - table: "`role`", + conn: conn, + table: "`role`", } } func (m *defaultRoleModel) Delete(ctx context.Context, id string) error { - oaRoleIdKey := fmt.Sprintf("%s%v", cacheOaRoleIdPrefix, id) - _, err := m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { - query := fmt.Sprintf("delete from %s where `id` = ?", m.table) - return conn.ExecCtx(ctx, query, id) - }, oaRoleIdKey) + query := fmt.Sprintf("delete from %s where `id` = ?", m.table) + _, err := m.conn.ExecCtx(ctx, query, id) return err } func (m *defaultRoleModel) FindOne(ctx context.Context, id string) (*Role, error) { - oaRoleIdKey := fmt.Sprintf("%s%v", cacheOaRoleIdPrefix, id) + query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", roleRows, m.table) var resp Role - err := m.QueryRowCtx(ctx, &resp, oaRoleIdKey, func(ctx context.Context, conn sqlx.SqlConn, v any) error { - query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", roleRows, m.table) - return conn.QueryRowCtx(ctx, v, query, id) - }) + err := m.conn.QueryRowCtx(ctx, &resp, query, id) switch err { case nil: return &resp, nil - case sqlc.ErrNotFound: + case sqlx.ErrNotFound: return nil, ErrNotFound default: return nil, err @@ -83,32 +73,17 @@ func (m *defaultRoleModel) FindOne(ctx context.Context, id string) (*Role, error } func (m *defaultRoleModel) Insert(ctx context.Context, data *Role) (sql.Result, error) { - oaRoleIdKey := fmt.Sprintf("%s%v", cacheOaRoleIdPrefix, data.Id) - ret, err := m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { - query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?)", m.table, roleRowsExpectAutoSet) - return conn.ExecCtx(ctx, query, data.Id, data.Created, data.Updated, data.AppId, data.Name, data.Des, data.UserCount) - }, oaRoleIdKey) + query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?)", m.table, roleRowsExpectAutoSet) + ret, err := m.conn.ExecCtx(ctx, query, data.Id, data.Created, data.Updated, data.AppId, data.Name, data.Des, data.UserCount) return ret, err } func (m *defaultRoleModel) Update(ctx context.Context, data *Role) error { - oaRoleIdKey := fmt.Sprintf("%s%v", cacheOaRoleIdPrefix, data.Id) - _, err := m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { - query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, roleRowsWithPlaceHolder) - return conn.ExecCtx(ctx, query, data.Created, data.Updated, data.AppId, data.Name, data.Des, data.UserCount, data.Id) - }, oaRoleIdKey) + query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, roleRowsWithPlaceHolder) + _, err := m.conn.ExecCtx(ctx, query, data.Created, data.Updated, data.AppId, data.Name, data.Des, data.UserCount, data.Id) return err } -func (m *defaultRoleModel) formatPrimary(primary any) string { - return fmt.Sprintf("%s%v", cacheOaRoleIdPrefix, primary) -} - -func (m *defaultRoleModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary any) error { - query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", roleRows, m.table) - return conn.QueryRowCtx(ctx, v, query, primary) -} - func (m *defaultRoleModel) tableName() string { return m.table } diff --git a/oa/models/tokenmodel.go b/oa/models/tokenmodel.go new file mode 100755 index 0000000..a00175f --- /dev/null +++ b/oa/models/tokenmodel.go @@ -0,0 +1,29 @@ +package models + +import "github.com/zeromicro/go-zero/core/stores/sqlx" + +var _ TokenModel = (*customTokenModel)(nil) + +type ( + // TokenModel is an interface to be customized, add more methods here, + // and implement the added methods in customTokenModel. + TokenModel interface { + tokenModel + withSession(session sqlx.Session) TokenModel + } + + customTokenModel struct { + *defaultTokenModel + } +) + +// NewTokenModel returns a model for the database table. +func NewTokenModel(conn sqlx.SqlConn) TokenModel { + return &customTokenModel{ + defaultTokenModel: newTokenModel(conn), + } +} + +func (m *customTokenModel) withSession(session sqlx.Session) TokenModel { + return NewTokenModel(sqlx.NewSqlConnFromSession(session)) +} diff --git a/oa/models/tokenmodel_gen.go b/oa/models/tokenmodel_gen.go new file mode 100755 index 0000000..f05eb13 --- /dev/null +++ b/oa/models/tokenmodel_gen.go @@ -0,0 +1,90 @@ +// Code generated by goctl. DO NOT EDIT. + +package models + +import ( + "context" + "database/sql" + "fmt" + "strings" + "time" + + "github.com/zeromicro/go-zero/core/stores/builder" + "github.com/zeromicro/go-zero/core/stores/sqlx" + "github.com/zeromicro/go-zero/core/stringx" +) + +var ( + tokenFieldNames = builder.RawFieldNames(&Token{}) + tokenRows = strings.Join(tokenFieldNames, ",") + tokenRowsExpectAutoSet = strings.Join(stringx.Remove(tokenFieldNames, "`create_at`", "`create_time`", "`created_at`", "`update_at`", "`update_time`", "`updated_at`"), ",") + tokenRowsWithPlaceHolder = strings.Join(stringx.Remove(tokenFieldNames, "`code`", "`create_at`", "`create_time`", "`created_at`", "`update_at`", "`update_time`", "`updated_at`"), "=?,") + "=?" +) + +type ( + tokenModel interface { + Insert(ctx context.Context, data *Token) (sql.Result, error) + FindOne(ctx context.Context, code string) (*Token, error) + Update(ctx context.Context, data *Token) error + Delete(ctx context.Context, code string) error + } + + defaultTokenModel struct { + conn sqlx.SqlConn + table string + } + + Token struct { + Code string `db:"code"` + Created time.Time `db:"created"` + Updated time.Time `db:"updated"` + Expired time.Time `db:"expired"` + ClientId string `db:"client_id"` + AppId string `db:"app_id"` + UserId string `db:"user_id"` + Meta sql.NullString `db:"meta"` + } +) + +func newTokenModel(conn sqlx.SqlConn) *defaultTokenModel { + return &defaultTokenModel{ + conn: conn, + table: "`token`", + } +} + +func (m *defaultTokenModel) Delete(ctx context.Context, code string) error { + query := fmt.Sprintf("delete from %s where `code` = ?", m.table) + _, err := m.conn.ExecCtx(ctx, query, code) + return err +} + +func (m *defaultTokenModel) FindOne(ctx context.Context, code string) (*Token, error) { + query := fmt.Sprintf("select %s from %s where `code` = ? limit 1", tokenRows, m.table) + var resp Token + err := m.conn.QueryRowCtx(ctx, &resp, query, code) + switch err { + case nil: + return &resp, nil + case sqlx.ErrNotFound: + return nil, ErrNotFound + default: + return nil, err + } +} + +func (m *defaultTokenModel) Insert(ctx context.Context, data *Token) (sql.Result, error) { + query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?)", m.table, tokenRowsExpectAutoSet) + ret, err := m.conn.ExecCtx(ctx, query, data.Code, data.Created, data.Updated, data.Expired, data.ClientId, data.AppId, data.UserId, data.Meta) + return ret, err +} + +func (m *defaultTokenModel) Update(ctx context.Context, data *Token) error { + query := fmt.Sprintf("update %s set %s where `code` = ?", m.table, tokenRowsWithPlaceHolder) + _, err := m.conn.ExecCtx(ctx, query, data.Created, data.Updated, data.Expired, data.ClientId, data.AppId, data.UserId, data.Meta, data.Code) + return err +} + +func (m *defaultTokenModel) tableName() string { + return m.table +} diff --git a/oa/models/usermodel.go b/oa/models/usermodel.go index c1f4be5..99f071d 100755 --- a/oa/models/usermodel.go +++ b/oa/models/usermodel.go @@ -1,9 +1,6 @@ package models -import ( - "github.com/zeromicro/go-zero/core/stores/cache" - "github.com/zeromicro/go-zero/core/stores/sqlx" -) +import "github.com/zeromicro/go-zero/core/stores/sqlx" var _ UserModel = (*customUserModel)(nil) @@ -12,6 +9,7 @@ type ( // and implement the added methods in customUserModel. UserModel interface { userModel + withSession(session sqlx.Session) UserModel } customUserModel struct { @@ -20,8 +18,12 @@ type ( ) // NewUserModel returns a model for the database table. -func NewUserModel(conn sqlx.SqlConn, c cache.CacheConf, opts ...cache.Option) UserModel { +func NewUserModel(conn sqlx.SqlConn) UserModel { return &customUserModel{ - defaultUserModel: newUserModel(conn, c, opts...), + defaultUserModel: newUserModel(conn), } } + +func (m *customUserModel) withSession(session sqlx.Session) UserModel { + return NewUserModel(sqlx.NewSqlConnFromSession(session)) +} diff --git a/oa/models/usermodel_gen.go b/oa/models/usermodel_gen.go index ddb76c7..404d99c 100755 --- a/oa/models/usermodel_gen.go +++ b/oa/models/usermodel_gen.go @@ -10,8 +10,6 @@ import ( "time" "github.com/zeromicro/go-zero/core/stores/builder" - "github.com/zeromicro/go-zero/core/stores/cache" - "github.com/zeromicro/go-zero/core/stores/sqlc" "github.com/zeromicro/go-zero/core/stores/sqlx" "github.com/zeromicro/go-zero/core/stringx" ) @@ -21,11 +19,6 @@ var ( userRows = strings.Join(userFieldNames, ",") userRowsExpectAutoSet = strings.Join(stringx.Remove(userFieldNames, "`create_at`", "`create_time`", "`created_at`", "`update_at`", "`update_time`", "`updated_at`"), ",") userRowsWithPlaceHolder = strings.Join(stringx.Remove(userFieldNames, "`id`", "`create_at`", "`create_time`", "`created_at`", "`update_at`", "`update_time`", "`updated_at`"), "=?,") + "=?" - - cacheOaUserIdPrefix = "cache:oa:user:id:" - cacheOaUserEmailPrefix = "cache:oa:user:email:" - cacheOaUserPhonePrefix = "cache:oa:user:phone:" - cacheOaUserUsernamePrefix = "cache:oa:user:username:" ) type ( @@ -40,7 +33,7 @@ type ( } defaultUserModel struct { - sqlc.CachedConn + conn sqlx.SqlConn table string } @@ -61,41 +54,27 @@ type ( } ) -func newUserModel(conn sqlx.SqlConn, c cache.CacheConf, opts ...cache.Option) *defaultUserModel { +func newUserModel(conn sqlx.SqlConn) *defaultUserModel { return &defaultUserModel{ - CachedConn: sqlc.NewConn(conn, c, opts...), - table: "`user`", + conn: conn, + table: "`user`", } } func (m *defaultUserModel) Delete(ctx context.Context, id string) error { - data, err := m.FindOne(ctx, id) - if err != nil { - return err - } - - oaUserEmailKey := fmt.Sprintf("%s%v", cacheOaUserEmailPrefix, data.Email) - oaUserIdKey := fmt.Sprintf("%s%v", cacheOaUserIdPrefix, id) - oaUserPhoneKey := fmt.Sprintf("%s%v", cacheOaUserPhonePrefix, data.Phone) - oaUserUsernameKey := fmt.Sprintf("%s%v", cacheOaUserUsernamePrefix, data.Username) - _, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { - query := fmt.Sprintf("delete from %s where `id` = ?", m.table) - return conn.ExecCtx(ctx, query, id) - }, oaUserEmailKey, oaUserIdKey, oaUserPhoneKey, oaUserUsernameKey) + query := fmt.Sprintf("delete from %s where `id` = ?", m.table) + _, err := m.conn.ExecCtx(ctx, query, id) return err } func (m *defaultUserModel) FindOne(ctx context.Context, id string) (*User, error) { - oaUserIdKey := fmt.Sprintf("%s%v", cacheOaUserIdPrefix, id) + query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", userRows, m.table) var resp User - err := m.QueryRowCtx(ctx, &resp, oaUserIdKey, func(ctx context.Context, conn sqlx.SqlConn, v any) error { - query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", userRows, m.table) - return conn.QueryRowCtx(ctx, v, query, id) - }) + err := m.conn.QueryRowCtx(ctx, &resp, query, id) switch err { case nil: return &resp, nil - case sqlc.ErrNotFound: + case sqlx.ErrNotFound: return nil, ErrNotFound default: return nil, err @@ -103,19 +82,13 @@ func (m *defaultUserModel) FindOne(ctx context.Context, id string) (*User, error } func (m *defaultUserModel) FindOneByEmail(ctx context.Context, email sql.NullString) (*User, error) { - oaUserEmailKey := fmt.Sprintf("%s%v", cacheOaUserEmailPrefix, email) var resp User - err := m.QueryRowIndexCtx(ctx, &resp, oaUserEmailKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v any) (i any, e error) { - query := fmt.Sprintf("select %s from %s where `email` = ? limit 1", userRows, m.table) - if err := conn.QueryRowCtx(ctx, &resp, query, email); err != nil { - return nil, err - } - return resp.Id, nil - }, m.queryPrimary) + query := fmt.Sprintf("select %s from %s where `email` = ? limit 1", userRows, m.table) + err := m.conn.QueryRowCtx(ctx, &resp, query, email) switch err { case nil: return &resp, nil - case sqlc.ErrNotFound: + case sqlx.ErrNotFound: return nil, ErrNotFound default: return nil, err @@ -123,19 +96,13 @@ func (m *defaultUserModel) FindOneByEmail(ctx context.Context, email sql.NullStr } func (m *defaultUserModel) FindOneByPhone(ctx context.Context, phone sql.NullString) (*User, error) { - oaUserPhoneKey := fmt.Sprintf("%s%v", cacheOaUserPhonePrefix, phone) var resp User - err := m.QueryRowIndexCtx(ctx, &resp, oaUserPhoneKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v any) (i any, e error) { - query := fmt.Sprintf("select %s from %s where `phone` = ? limit 1", userRows, m.table) - if err := conn.QueryRowCtx(ctx, &resp, query, phone); err != nil { - return nil, err - } - return resp.Id, nil - }, m.queryPrimary) + query := fmt.Sprintf("select %s from %s where `phone` = ? limit 1", userRows, m.table) + err := m.conn.QueryRowCtx(ctx, &resp, query, phone) switch err { case nil: return &resp, nil - case sqlc.ErrNotFound: + case sqlx.ErrNotFound: return nil, ErrNotFound default: return nil, err @@ -143,19 +110,13 @@ func (m *defaultUserModel) FindOneByPhone(ctx context.Context, phone sql.NullStr } func (m *defaultUserModel) FindOneByUsername(ctx context.Context, username string) (*User, error) { - oaUserUsernameKey := fmt.Sprintf("%s%v", cacheOaUserUsernamePrefix, username) var resp User - err := m.QueryRowIndexCtx(ctx, &resp, oaUserUsernameKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v any) (i any, e error) { - query := fmt.Sprintf("select %s from %s where `username` = ? limit 1", userRows, m.table) - if err := conn.QueryRowCtx(ctx, &resp, query, username); err != nil { - return nil, err - } - return resp.Id, nil - }, m.queryPrimary) + query := fmt.Sprintf("select %s from %s where `username` = ? limit 1", userRows, m.table) + err := m.conn.QueryRowCtx(ctx, &resp, query, username) switch err { case nil: return &resp, nil - case sqlc.ErrNotFound: + case sqlx.ErrNotFound: return nil, ErrNotFound default: return nil, err @@ -163,43 +124,17 @@ func (m *defaultUserModel) FindOneByUsername(ctx context.Context, username strin } func (m *defaultUserModel) Insert(ctx context.Context, data *User) (sql.Result, error) { - oaUserEmailKey := fmt.Sprintf("%s%v", cacheOaUserEmailPrefix, data.Email) - oaUserIdKey := fmt.Sprintf("%s%v", cacheOaUserIdPrefix, data.Id) - oaUserPhoneKey := fmt.Sprintf("%s%v", cacheOaUserPhonePrefix, data.Phone) - oaUserUsernameKey := fmt.Sprintf("%s%v", cacheOaUserUsernamePrefix, data.Username) - ret, err := m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { - query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, userRowsExpectAutoSet) - return conn.ExecCtx(ctx, query, data.Id, data.Created, data.Updated, data.Username, data.Nickname, data.Email, data.Phone, data.Icon, data.RealCode, data.CheckCode, data.Status, data.Used, data.Space) - }, oaUserEmailKey, oaUserIdKey, oaUserPhoneKey, oaUserUsernameKey) + query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, userRowsExpectAutoSet) + ret, err := m.conn.ExecCtx(ctx, query, data.Id, data.Created, data.Updated, data.Username, data.Nickname, data.Email, data.Phone, data.Icon, data.RealCode, data.CheckCode, data.Status, data.Used, data.Space) return ret, err } func (m *defaultUserModel) Update(ctx context.Context, newData *User) error { - data, err := m.FindOne(ctx, newData.Id) - if err != nil { - return err - } - - oaUserEmailKey := fmt.Sprintf("%s%v", cacheOaUserEmailPrefix, data.Email) - oaUserIdKey := fmt.Sprintf("%s%v", cacheOaUserIdPrefix, data.Id) - oaUserPhoneKey := fmt.Sprintf("%s%v", cacheOaUserPhonePrefix, data.Phone) - oaUserUsernameKey := fmt.Sprintf("%s%v", cacheOaUserUsernamePrefix, data.Username) - _, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { - query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, userRowsWithPlaceHolder) - return conn.ExecCtx(ctx, query, newData.Created, newData.Updated, newData.Username, newData.Nickname, newData.Email, newData.Phone, newData.Icon, newData.RealCode, newData.CheckCode, newData.Status, newData.Used, newData.Space, newData.Id) - }, oaUserEmailKey, oaUserIdKey, oaUserPhoneKey, oaUserUsernameKey) + query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, userRowsWithPlaceHolder) + _, err := m.conn.ExecCtx(ctx, query, newData.Created, newData.Updated, newData.Username, newData.Nickname, newData.Email, newData.Phone, newData.Icon, newData.RealCode, newData.CheckCode, newData.Status, newData.Used, newData.Space, newData.Id) return err } -func (m *defaultUserModel) formatPrimary(primary any) string { - return fmt.Sprintf("%s%v", cacheOaUserIdPrefix, primary) -} - -func (m *defaultUserModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary any) error { - query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", userRows, m.table) - return conn.QueryRowCtx(ctx, v, query, primary) -} - func (m *defaultUserModel) tableName() string { return m.table } diff --git a/oa/models/userrolemodel.go b/oa/models/userrolemodel.go index 422382f..210f6c1 100755 --- a/oa/models/userrolemodel.go +++ b/oa/models/userrolemodel.go @@ -1,9 +1,6 @@ package models -import ( - "github.com/zeromicro/go-zero/core/stores/cache" - "github.com/zeromicro/go-zero/core/stores/sqlx" -) +import "github.com/zeromicro/go-zero/core/stores/sqlx" var _ UserRoleModel = (*customUserRoleModel)(nil) @@ -12,6 +9,7 @@ type ( // and implement the added methods in customUserRoleModel. UserRoleModel interface { userRoleModel + withSession(session sqlx.Session) UserRoleModel } customUserRoleModel struct { @@ -20,8 +18,12 @@ type ( ) // NewUserRoleModel returns a model for the database table. -func NewUserRoleModel(conn sqlx.SqlConn, c cache.CacheConf, opts ...cache.Option) UserRoleModel { +func NewUserRoleModel(conn sqlx.SqlConn) UserRoleModel { return &customUserRoleModel{ - defaultUserRoleModel: newUserRoleModel(conn, c, opts...), + defaultUserRoleModel: newUserRoleModel(conn), } } + +func (m *customUserRoleModel) withSession(session sqlx.Session) UserRoleModel { + return NewUserRoleModel(sqlx.NewSqlConnFromSession(session)) +} diff --git a/oa/models/userrolemodel_gen.go b/oa/models/userrolemodel_gen.go index 3c5db72..ac71d7a 100755 --- a/oa/models/userrolemodel_gen.go +++ b/oa/models/userrolemodel_gen.go @@ -10,8 +10,6 @@ import ( "time" "github.com/zeromicro/go-zero/core/stores/builder" - "github.com/zeromicro/go-zero/core/stores/cache" - "github.com/zeromicro/go-zero/core/stores/sqlc" "github.com/zeromicro/go-zero/core/stores/sqlx" "github.com/zeromicro/go-zero/core/stringx" ) @@ -21,9 +19,6 @@ var ( userRoleRows = strings.Join(userRoleFieldNames, ",") userRoleRowsExpectAutoSet = strings.Join(stringx.Remove(userRoleFieldNames, "`id`", "`create_at`", "`create_time`", "`created_at`", "`update_at`", "`update_time`", "`updated_at`"), ",") userRoleRowsWithPlaceHolder = strings.Join(stringx.Remove(userRoleFieldNames, "`id`", "`create_at`", "`create_time`", "`created_at`", "`update_at`", "`update_time`", "`updated_at`"), "=?,") + "=?" - - cacheOaUserRoleIdPrefix = "cache:oa:userRole:id:" - cacheOaUserRoleUserIdRoleIdPrefix = "cache:oa:userRole:userId:roleId:" ) type ( @@ -36,7 +31,7 @@ type ( } defaultUserRoleModel struct { - sqlc.CachedConn + conn sqlx.SqlConn table string } @@ -50,39 +45,27 @@ type ( } ) -func newUserRoleModel(conn sqlx.SqlConn, c cache.CacheConf, opts ...cache.Option) *defaultUserRoleModel { +func newUserRoleModel(conn sqlx.SqlConn) *defaultUserRoleModel { return &defaultUserRoleModel{ - CachedConn: sqlc.NewConn(conn, c, opts...), - table: "`user_role`", + conn: conn, + table: "`user_role`", } } func (m *defaultUserRoleModel) Delete(ctx context.Context, id int64) error { - data, err := m.FindOne(ctx, id) - if err != nil { - return err - } - - oaUserRoleIdKey := fmt.Sprintf("%s%v", cacheOaUserRoleIdPrefix, id) - oaUserRoleUserIdRoleIdKey := fmt.Sprintf("%s%v:%v", cacheOaUserRoleUserIdRoleIdPrefix, data.UserId, data.RoleId) - _, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { - query := fmt.Sprintf("delete from %s where `id` = ?", m.table) - return conn.ExecCtx(ctx, query, id) - }, oaUserRoleIdKey, oaUserRoleUserIdRoleIdKey) + query := fmt.Sprintf("delete from %s where `id` = ?", m.table) + _, err := m.conn.ExecCtx(ctx, query, id) return err } func (m *defaultUserRoleModel) FindOne(ctx context.Context, id int64) (*UserRole, error) { - oaUserRoleIdKey := fmt.Sprintf("%s%v", cacheOaUserRoleIdPrefix, id) + query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", userRoleRows, m.table) var resp UserRole - err := m.QueryRowCtx(ctx, &resp, oaUserRoleIdKey, func(ctx context.Context, conn sqlx.SqlConn, v any) error { - query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", userRoleRows, m.table) - return conn.QueryRowCtx(ctx, v, query, id) - }) + err := m.conn.QueryRowCtx(ctx, &resp, query, id) switch err { case nil: return &resp, nil - case sqlc.ErrNotFound: + case sqlx.ErrNotFound: return nil, ErrNotFound default: return nil, err @@ -90,19 +73,13 @@ func (m *defaultUserRoleModel) FindOne(ctx context.Context, id int64) (*UserRole } func (m *defaultUserRoleModel) FindOneByUserIdRoleId(ctx context.Context, userId string, roleId string) (*UserRole, error) { - oaUserRoleUserIdRoleIdKey := fmt.Sprintf("%s%v:%v", cacheOaUserRoleUserIdRoleIdPrefix, userId, roleId) var resp UserRole - err := m.QueryRowIndexCtx(ctx, &resp, oaUserRoleUserIdRoleIdKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v any) (i any, e error) { - query := fmt.Sprintf("select %s from %s where `user_id` = ? and `role_id` = ? limit 1", userRoleRows, m.table) - if err := conn.QueryRowCtx(ctx, &resp, query, userId, roleId); err != nil { - return nil, err - } - return resp.Id, nil - }, m.queryPrimary) + query := fmt.Sprintf("select %s from %s where `user_id` = ? and `role_id` = ? limit 1", userRoleRows, m.table) + err := m.conn.QueryRowCtx(ctx, &resp, query, userId, roleId) switch err { case nil: return &resp, nil - case sqlc.ErrNotFound: + case sqlx.ErrNotFound: return nil, ErrNotFound default: return nil, err @@ -110,39 +87,17 @@ func (m *defaultUserRoleModel) FindOneByUserIdRoleId(ctx context.Context, userId } func (m *defaultUserRoleModel) Insert(ctx context.Context, data *UserRole) (sql.Result, error) { - oaUserRoleIdKey := fmt.Sprintf("%s%v", cacheOaUserRoleIdPrefix, data.Id) - oaUserRoleUserIdRoleIdKey := fmt.Sprintf("%s%v:%v", cacheOaUserRoleUserIdRoleIdPrefix, data.UserId, data.RoleId) - ret, err := m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { - query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?)", m.table, userRoleRowsExpectAutoSet) - return conn.ExecCtx(ctx, query, data.Created, data.Updated, data.UserId, data.RoleId, data.Status) - }, oaUserRoleIdKey, oaUserRoleUserIdRoleIdKey) + query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?)", m.table, userRoleRowsExpectAutoSet) + ret, err := m.conn.ExecCtx(ctx, query, data.Created, data.Updated, data.UserId, data.RoleId, data.Status) return ret, err } func (m *defaultUserRoleModel) Update(ctx context.Context, newData *UserRole) error { - data, err := m.FindOne(ctx, newData.Id) - if err != nil { - return err - } - - oaUserRoleIdKey := fmt.Sprintf("%s%v", cacheOaUserRoleIdPrefix, data.Id) - oaUserRoleUserIdRoleIdKey := fmt.Sprintf("%s%v:%v", cacheOaUserRoleUserIdRoleIdPrefix, data.UserId, data.RoleId) - _, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { - query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, userRoleRowsWithPlaceHolder) - return conn.ExecCtx(ctx, query, newData.Created, newData.Updated, newData.UserId, newData.RoleId, newData.Status, newData.Id) - }, oaUserRoleIdKey, oaUserRoleUserIdRoleIdKey) + query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, userRoleRowsWithPlaceHolder) + _, err := m.conn.ExecCtx(ctx, query, newData.Created, newData.Updated, newData.UserId, newData.RoleId, newData.Status, newData.Id) return err } -func (m *defaultUserRoleModel) formatPrimary(primary any) string { - return fmt.Sprintf("%s%v", cacheOaUserRoleIdPrefix, primary) -} - -func (m *defaultUserRoleModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary any) error { - query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", userRoleRows, m.table) - return conn.QueryRowCtx(ctx, v, query, primary) -} - func (m *defaultUserRoleModel) tableName() string { return m.table } diff --git a/oa/protoc/api/app.api b/oa/protoc/api/app.api index 2472378..a8a0ec6 100644 --- a/oa/protoc/api/app.api +++ b/oa/protoc/api/app.api @@ -4,7 +4,6 @@ import "base.api" type ( // 定义登录接口的请求体 AppReq { - error appname string `json:"username"` Password string `json:"password"` } diff --git a/oa/protoc/api/base.api b/oa/protoc/api/base.api index 9fd940a..2f5f826 100644 --- a/oa/protoc/api/base.api +++ b/oa/protoc/api/base.api @@ -1,5 +1,4 @@ -type error { - status string `json:"status"` - code int `json:"code"` +type auth { + Authorization string `header:"authorization"` } diff --git a/oa/protoc/api/user.api b/oa/protoc/api/user.api index c134fbb..f762eec 100644 --- a/oa/protoc/api/user.api +++ b/oa/protoc/api/user.api @@ -2,38 +2,61 @@ import "base.api" type ( - // 定义登录接口的请求体 LoginReq { - error - Username string `json:"username"` - Password string `json:"password"` + id string `json:"id"` + code string `json:"code"` + verify string `json:"verify"` } - // 定义登录接口的响应体 - LoginResp { - Id int64 `json:"id"` - Name string `json:"name"` - Token string `json:"token"` - ExpireAt string `json:"expireAt"` + RegReq { + username string `json:"username"` + pwd string `json:"pwd"` + } + + getReq { + Id int64 `path:"id"` + } + listReq { + Username string `query:"username"` + } + userResp { + Id string `json:"id"` + Created uint `json:"created"` + Updated uint `json:"updated"` + Username string `json:"username"` + Nickname string `json:"nickname"` + Email string `json:"email"` + Phone string `json:"phone"` + Icon string `json:"icon"` + Status int64 `json:"status"` // 状态（0：ok，1：disabled） + Used int64 `json:"used"` + Space int64 `json:"space"` } ) @server ( - // 代表当前 service 代码块下的路由生成代码时都会被放到 user 目录下 group: user - // 定义路由前缀为 "/v1" prefix: /api/user ) - -// 定义 HTTP 服务 -// 微服务名称为main，生成的代码目录和配置文件将和 user 值相关 service main { - // 定义 http.HandleFunc 转换的 go 文件名称及方法 @handler Login - // 定义接口 - // 请求方法为 post - // 路由为 /user/login - // 请求体为 LoginReq - // 响应体为 LoginResp，响应体必须有 returns 关键字修饰 - post /login (LoginReq) returns (LoginResp) + head / (LoginReq) returns () + + @handler Reg + post / (RegReq) returns () +} + + +@server ( + group: user + middleware: Auth + prefix: /api/user +) + +service main { + @handler get + get /:id (getReq) returns (userResp) + + @handler list + get / (listReq) returns ([]userResp) }