Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop

model/gmodel/fs_address_logic.go

@@ -7,7 +7,7 @@ import (
 )
 
 func (a *FsAddressModel) GetOne(ctx context.Context, id int64, userId int64) (resp *FsAddress, err error) {
-	err = a.db.WithContext(ctx).Model(&FsAddress{}).Where("`id` = ? and `user_id` = ? and `status` = ? ", id, userId, 1).Take(resp).Error
+	err = a.db.WithContext(ctx).Model(&FsAddress{}).Where("`id` = ? and `user_id` = ? and `status` = ? ", id, userId, 1).Take(&resp).Error
 	return resp, err
 }
 

model/gmodel/fs_canteen_type_logic.go

@@ -20,6 +20,6 @@ func (c *FsCanteenTypeModel) FindAllGetType(ctx context.Context) (resp []*FsGetT
 	return resp, nil
 }
 func (c *FsCanteenTypeModel) FindOne(ctx context.Context, id int64) (resp *FsCanteenType, err error) {
-	err = c.db.WithContext(ctx).Model(&FsCanteenType{}).Where("`id` = ?", id).First(resp).Error
+	err = c.db.WithContext(ctx).Model(&FsCanteenType{}).Where("`id` = ?", id).First(&resp).Error
 	return resp, err
 }

model/gmodel/fs_cart_logic.go

@@ -17,7 +17,7 @@ type FindOneCartByParamsReq struct {
 }
 
 func (c *FsCartModel) FindOne(ctx context.Context, id int64) (resp *FsCart, err error) {
-	err = c.db.WithContext(ctx).Model(&FsCart{}).Where("`id` = ?", id).First(resp).Error
+	err = c.db.WithContext(ctx).Model(&FsCart{}).Where("`id` = ?", id).First(&resp).Error
 	return resp, err
 }
 func (c *FsCartModel) FindOneCartByParams(ctx context.Context, req FindOneCartByParamsReq) (resp *FsCart, err error) {

model/gmodel/fs_gerent_logic.go

@@ -4,7 +4,7 @@ import "context"
 
 // TODO: 使用model的属性做你想做的
 
-func (g *FsGerentModel) Find(ctx context.Context, authKey string) (resp FsGerent, err error) {
+func (g *FsGerentModel) Find(ctx context.Context, authKey string) (resp *FsGerent, err error) {
 	err = g.db.WithContext(ctx).Model(&FsGerent{}).Where("`auth_key` = ?", authKey).Take(&resp).Error
 	return resp, err
 }

model/gmodel/fs_order_logic.go

@@ -5,12 +5,12 @@ import (
 )
 
 func (o *FsOrderModel) FindOneBySn(ctx context.Context, userId int64, sn string) (resp *FsOrder, err error) {
-	err = o.db.WithContext(ctx).Model(&FsOrder{}).Where(" `user_id` = ? and  `sn` = ? ", userId, sn).Take(resp).Error
+	err = o.db.WithContext(ctx).Model(&FsOrder{}).Where(" `user_id` = ? and  `sn` = ? ", userId, sn).Take(&resp).Error
 	return resp, err
 }
 
 func (o *FsOrderModel) FindOne(ctx context.Context, userId int64, OrderId int64) (order *FsOrder, err error) {
-	err = o.db.WithContext(ctx).Model(&order).Where("`user_id` = ? and `id` = ?", userId, OrderId).Take(order).Error
+	err = o.db.WithContext(ctx).Model(&order).Where("`user_id` = ? and `id` = ?", userId, OrderId).Take(&order).Error
 	if err != nil {
 		return nil, err
 	}

server/canteen/internal/svc/servicecontext.go

@@ -3,10 +3,12 @@ package svc
 import (
 	"errors"
 	"fmt"
-	"fusenapi/initalize"
 	"fusenapi/server/canteen/internal/config"
 	"net/http"
 
+	"fusenapi/initalize"
+	"fusenapi/model/gmodel"
+
 	"github.com/golang-jwt/jwt"
 	"gorm.io/gorm"
 )
@@ -15,6 +17,7 @@ type ServiceContext struct {
 	Config config.Config
 
 	MysqlConn *gorm.DB
+	AllModels *gmodel.AllModelsGen
 }
 
 func NewServiceContext(c config.Config) *ServiceContext {
@@ -22,6 +25,7 @@ func NewServiceContext(c config.Config) *ServiceContext {
 	return &ServiceContext{
 		Config:    c,
 		MysqlConn: initalize.InitMysql(c.SourceMysql),
+		AllModels: gmodel.NewAllModels(initalize.InitMysql(c.SourceMysql)),
 	}
 }
 
@@ -37,7 +41,7 @@ func (svcCtx *ServiceContext) ParseJwtToken(r *http.Request) (jwt.MapClaims, err
 			return nil, fmt.Errorf("unexpected signing method: %v", token.Header["alg"])
 		}
 		// 返回用于验证签名的密钥
-		return svcCtx.Config.Auth.AccessSecret, nil
+		return []byte(svcCtx.Config.Auth.AccessSecret), nil
 	})
 	if err != nil {
 		return nil, errors.New(fmt.Sprint("Error parsing token:", err))

server/data-transfer/internal/svc/servicecontext.go

@@ -3,10 +3,12 @@ package svc
 import (
 	"errors"
 	"fmt"
-	"fusenapi/initalize"
 	"fusenapi/server/data-transfer/internal/config"
 	"net/http"
 
+	"fusenapi/initalize"
+	"fusenapi/model/gmodel"
+
 	"github.com/golang-jwt/jwt"
 	"gorm.io/gorm"
 )
@@ -15,6 +17,7 @@ type ServiceContext struct {
 	Config config.Config
 
 	MysqlConn *gorm.DB
+	AllModels *gmodel.AllModelsGen
 }
 
 func NewServiceContext(c config.Config) *ServiceContext {
@@ -22,6 +25,7 @@ func NewServiceContext(c config.Config) *ServiceContext {
 	return &ServiceContext{
 		Config:    c,
 		MysqlConn: initalize.InitMysql(c.SourceMysql),
+		AllModels: gmodel.NewAllModels(initalize.InitMysql(c.SourceMysql)),
 	}
 }
 
@@ -37,7 +41,7 @@ func (svcCtx *ServiceContext) ParseJwtToken(r *http.Request) (jwt.MapClaims, err
 			return nil, fmt.Errorf("unexpected signing method: %v", token.Header["alg"])
 		}
 		// 返回用于验证签名的密钥
-		return svcCtx.Config.Auth.AccessSecret, nil
+		return []byte(svcCtx.Config.Auth.AccessSecret), nil
 	})
 	if err != nil {
 		return nil, errors.New(fmt.Sprint("Error parsing token:", err))

server/map-library/internal/svc/servicecontext.go

@@ -3,10 +3,12 @@ package svc
 import (
 	"errors"
 	"fmt"
-	"fusenapi/initalize"
 	"fusenapi/server/map-library/internal/config"
 	"net/http"
 
+	"fusenapi/initalize"
+	"fusenapi/model/gmodel"
+
 	"github.com/golang-jwt/jwt"
 	"gorm.io/gorm"
 )
@@ -15,6 +17,7 @@ type ServiceContext struct {
 	Config config.Config
 
 	MysqlConn *gorm.DB
+	AllModels *gmodel.AllModelsGen
 }
 
 func NewServiceContext(c config.Config) *ServiceContext {
@@ -22,6 +25,7 @@ func NewServiceContext(c config.Config) *ServiceContext {
 	return &ServiceContext{
 		Config:    c,
 		MysqlConn: initalize.InitMysql(c.SourceMysql),
+		AllModels: gmodel.NewAllModels(initalize.InitMysql(c.SourceMysql)),
 	}
 }
 
@@ -37,7 +41,7 @@ func (svcCtx *ServiceContext) ParseJwtToken(r *http.Request) (jwt.MapClaims, err
 			return nil, fmt.Errorf("unexpected signing method: %v", token.Header["alg"])
 		}
 		// 返回用于验证签名的密钥
-		return svcCtx.Config.Auth.AccessSecret, nil
+		return []byte(svcCtx.Config.Auth.AccessSecret), nil
 	})
 	if err != nil {
 		return nil, errors.New(fmt.Sprint("Error parsing token:", err))

server/orders/internal/svc/servicecontext.go

@@ -3,10 +3,12 @@ package svc
 import (
 	"errors"
 	"fmt"
-	"fusenapi/initalize"
 	"fusenapi/server/orders/internal/config"
 	"net/http"
 
+	"fusenapi/initalize"
+	"fusenapi/model/gmodel"
+
 	"github.com/golang-jwt/jwt"
 	"gorm.io/gorm"
 )
@@ -15,6 +17,7 @@ type ServiceContext struct {
 	Config config.Config
 
 	MysqlConn *gorm.DB
+	AllModels *gmodel.AllModelsGen
 }
 
 func NewServiceContext(c config.Config) *ServiceContext {
@@ -22,6 +25,7 @@ func NewServiceContext(c config.Config) *ServiceContext {
 	return &ServiceContext{
 		Config:    c,
 		MysqlConn: initalize.InitMysql(c.SourceMysql),
+		AllModels: gmodel.NewAllModels(initalize.InitMysql(c.SourceMysql)),
 	}
 }
 
@@ -37,7 +41,7 @@ func (svcCtx *ServiceContext) ParseJwtToken(r *http.Request) (jwt.MapClaims, err
 			return nil, fmt.Errorf("unexpected signing method: %v", token.Header["alg"])
 		}
 		// 返回用于验证签名的密钥
-		return svcCtx.Config.Auth.AccessSecret, nil
+		return []byte(svcCtx.Config.Auth.AccessSecret), nil
 	})
 	if err != nil {
 		return nil, errors.New(fmt.Sprint("Error parsing token:", err))

server/product-templatev2/etc/product-templatev2.yaml

@@ -1,6 +1,6 @@
 Name: product-templatev2
 Host: 0.0.0.0
-Port: 8895
+Port: 8896
 SourceMysql: fusentest:XErSYmLELKMnf3Dh@tcp(110.41.19.98:3306)/fusentest
 Auth:
     AccessSecret: fusen2023

server/product-templatev2/internal/svc/servicecontext.go

@@ -3,10 +3,12 @@ package svc
 import (
 	"errors"
 	"fmt"
-	"fusenapi/initalize"
 	"fusenapi/server/product-templatev2/internal/config"
 	"net/http"
 
+	"fusenapi/initalize"
+	"fusenapi/model/gmodel"
+
 	"github.com/golang-jwt/jwt"
 	"gorm.io/gorm"
 )
@@ -15,6 +17,7 @@ type ServiceContext struct {
 	Config config.Config
 
 	MysqlConn *gorm.DB
+	AllModels *gmodel.AllModelsGen
 }
 
 func NewServiceContext(c config.Config) *ServiceContext {
@@ -22,6 +25,7 @@ func NewServiceContext(c config.Config) *ServiceContext {
 	return &ServiceContext{
 		Config:    c,
 		MysqlConn: initalize.InitMysql(c.SourceMysql),
+		AllModels: gmodel.NewAllModels(initalize.InitMysql(c.SourceMysql)),
 	}
 }
 
@@ -37,7 +41,7 @@ func (svcCtx *ServiceContext) ParseJwtToken(r *http.Request) (jwt.MapClaims, err
 			return nil, fmt.Errorf("unexpected signing method: %v", token.Header["alg"])
 		}
 		// 返回用于验证签名的密钥
-		return svcCtx.Config.Auth.AccessSecret, nil
+		return []byte(svcCtx.Config.Auth.AccessSecret), nil
 	})
 	if err != nil {
 		return nil, errors.New(fmt.Sprint("Error parsing token:", err))

server/product/internal/svc/servicecontext.go

@@ -3,10 +3,12 @@ package svc
 import (
 	"errors"
 	"fmt"
-	"fusenapi/initalize"
 	"fusenapi/server/product/internal/config"
 	"net/http"
 
+	"fusenapi/initalize"
+	"fusenapi/model/gmodel"
+
 	"github.com/golang-jwt/jwt"
 	"gorm.io/gorm"
 )
@@ -15,6 +17,7 @@ type ServiceContext struct {
 	Config config.Config
 
 	MysqlConn *gorm.DB
+	AllModels *gmodel.AllModelsGen
 }
 
 func NewServiceContext(c config.Config) *ServiceContext {
@@ -22,6 +25,7 @@ func NewServiceContext(c config.Config) *ServiceContext {
 	return &ServiceContext{
 		Config:    c,
 		MysqlConn: initalize.InitMysql(c.SourceMysql),
+		AllModels: gmodel.NewAllModels(initalize.InitMysql(c.SourceMysql)),
 	}
 }
 
@@ -37,7 +41,7 @@ func (svcCtx *ServiceContext) ParseJwtToken(r *http.Request) (jwt.MapClaims, err
 			return nil, fmt.Errorf("unexpected signing method: %v", token.Header["alg"])
 		}
 		// 返回用于验证签名的密钥
-		return svcCtx.Config.Auth.AccessSecret, nil
+		return []byte(svcCtx.Config.Auth.AccessSecret), nil
 	})
 	if err != nil {
 		return nil, errors.New(fmt.Sprint("Error parsing token:", err))

server/shopping-cart-confirmation/internal/svc/servicecontext.go

@@ -3,10 +3,12 @@ package svc
 import (
 	"errors"
 	"fmt"
-	"fusenapi/initalize"
 	"fusenapi/server/shopping-cart-confirmation/internal/config"
 	"net/http"
 
+	"fusenapi/initalize"
+	"fusenapi/model/gmodel"
+
 	"github.com/golang-jwt/jwt"
 	"gorm.io/gorm"
 )
@@ -15,6 +17,7 @@ type ServiceContext struct {
 	Config config.Config
 
 	MysqlConn *gorm.DB
+	AllModels *gmodel.AllModelsGen
 }
 
 func NewServiceContext(c config.Config) *ServiceContext {
@@ -22,6 +25,7 @@ func NewServiceContext(c config.Config) *ServiceContext {
 	return &ServiceContext{
 		Config:    c,
 		MysqlConn: initalize.InitMysql(c.SourceMysql),
+		AllModels: gmodel.NewAllModels(initalize.InitMysql(c.SourceMysql)),
 	}
 }
 
@@ -37,7 +41,7 @@ func (svcCtx *ServiceContext) ParseJwtToken(r *http.Request) (jwt.MapClaims, err
 			return nil, fmt.Errorf("unexpected signing method: %v", token.Header["alg"])
 		}
 		// 返回用于验证签名的密钥
-		return svcCtx.Config.Auth.AccessSecret, nil
+		return []byte(svcCtx.Config.Auth.AccessSecret), nil
 	})
 	if err != nil {
 		return nil, errors.New(fmt.Sprint("Error parsing token:", err))