add: user accomplished

app/users/rpc/internal/svc/serviceContext.go

@@ -7,49 +7,60 @@ import (
 	"juwan-backend/app/users/rpc/internal/utils"
 	"juwan-backend/common/redisx"
 	"juwan-backend/common/snowflakex"
+	"juwan-backend/pkg/adapter"
 	"time"
 
+	"ariga.io/entcache"
+	"entgo.io/ent/dialect/sql"
 	"github.com/redis/go-redis/v9"
 	"github.com/zeromicro/go-zero/core/logx"
-	"github.com/zeromicro/go-zero/core/stores/sqlx"
 )
 
 type ServiceContext struct {
 	Config       config.Config
-	UsersModelRW models.UsersModel
-	UsersModelRO models.UsersModel
+	UsersModelRW *models.UsersClient
+	UsersModelRO *models.UsersClient
 	RedisCluster *redis.ClusterClient
 	Snowflake    snowflake.SnowflakeServiceClient
 	JwtManager   *utils.JwtManager
 }
 
 func NewServiceContext(c config.Config) *ServiceContext {
-	RWDBConn := sqlx.NewSqlConn("postgres", c.DB.Master)
-	RODBConn := sqlx.NewSqlConn("postgres", c.DB.Slave)
+
+	RWConn, err := sql.Open("pgx", c.DB.Master)
+	if err != nil {
+		panic(err)
+	}
+	ROConn, err := sql.Open("pgx", c.DB.Slave)
+	if err != nil {
+		panic(err)
+	}
 	logx.Infof("success to connect to postgres~")
 
 	// Initialize Redis Cluster client from CacheConf
 	redisConn, err := redisx.ConnectMasterSlaveCluster(c.CacheConf, 5*time.Second)
+	if err != nil || redisConn == nil {
+		logx.Errorf("redis connect master error: %s", err)
+		panic(err)
+	}
 	redisCluster := redisConn.Client
 	if redisCluster != nil {
-		if err != nil {
-			logx.Errorf("failed to connect to redis cluster: %v", err)
+		if redisConn.HasSlave {
+			logx.Infof("success to connect to redis master/slave (M: %s, S: %s)", redisConn.MasterHost, redisConn.SlaveHost)
 		} else {
-			if redisConn.HasSlave {
-				logx.Infof("success to connect to redis master/slave (M: %s, S: %s)", redisConn.MasterHost, redisConn.SlaveHost)
-			} else {
-				logx.Infof("success to connect to redis master (M: %s), slave not configured", redisConn.MasterHost)
-			}
+			logx.Infof("success to connect to redis master (M: %s), slave not configured", redisConn.MasterHost)
 		}
 	}
 
 	// Initialize JWT Manager
 	jwtManager := utils.NewJwtManager(redisCluster, c.Jwt.SecretKey, c.Jwt.Issuer)
 
+	RODrv := entcache.NewDriver(ROConn, entcache.TTL(time.Second*30), entcache.Levels(adapter.NewRedisCache(redisCluster)))
+	RWDrv := entcache.NewDriver(RWConn, entcache.TTL(time.Second*30), entcache.Levels(adapter.NewRedisCache(redisCluster)))
 	return &ServiceContext{
 		Config:       c,
-		UsersModelRW: models.NewUsersModel(RWDBConn, c.CacheConf),
-		UsersModelRO: models.NewUsersModel(RODBConn, c.CacheConf),
+		UsersModelRW: models.NewClient(models.Driver(RWDrv)).Users,
+		UsersModelRO: models.NewClient(models.Driver(RODrv)).Users,
 		RedisCluster: redisCluster,
 		JwtManager:   jwtManager,
 		Snowflake:    snowflakex.NewClient(c.SnowflakeRpcConf),