diff --git a/app/hdl/comm/hdl_comm.go b/app/hdl/comm/hdl_comm.go index d8b6943..f59b833 100644 --- a/app/hdl/comm/hdl_comm.go +++ b/app/hdl/comm/hdl_comm.go @@ -8,6 +8,8 @@ import ( "applet/app/svc" "applet/app/utils" "applet/app/utils/cache" + "applet/app/utils/logx" + "code.fnuoos.com/EggPlanet/egg_models.git/src/dao" "code.fnuoos.com/EggPlanet/egg_models.git/src/implement" "code.fnuoos.com/EggPlanet/egg_models.git/src/model" enum2 "code.fnuoos.com/EggPlanet/egg_system_rules.git/enum" @@ -39,6 +41,12 @@ func GetOssUrl(c *gin.Context) { } redisConn := cache.GetPool().Get() sysCfgDb := implement.NewSysCfgDb(db.Db, redisConn) + defer func(sysCfgDb dao.SysCfgDao) { + err := sysCfgDb.Close() + if err != nil { + logx.Error("redis close err:" + err.Error()) // 记录错误信息 + } + }(sysCfgDb) sysCfgs, err := sysCfgDb.SysCfgGetAll() if err != nil { e.OutErr(c, e.ERR_DB_ORM, err.Error()) diff --git a/app/hdl/hdl_login.go b/app/hdl/hdl_login.go index a2a0859..8e2d145 100644 --- a/app/hdl/hdl_login.go +++ b/app/hdl/hdl_login.go @@ -9,6 +9,8 @@ import ( "applet/app/svc" "applet/app/utils" "applet/app/utils/cache" + "applet/app/utils/logx" + "code.fnuoos.com/EggPlanet/egg_models.git/src/dao" "code.fnuoos.com/EggPlanet/egg_models.git/src/implement" "code.fnuoos.com/EggPlanet/egg_models.git/src/model" "code.fnuoos.com/EggPlanet/egg_system_rules.git/aliyun" @@ -321,6 +323,12 @@ func commReq(c *gin.Context, req md.RegisterReq) { var inviteCode string redisConn := cache.GetPool().Get() sysCfgDb := implement.NewSysCfgDb(db.Db, redisConn) + defer func(sysCfgDb dao.SysCfgDao) { + err := sysCfgDb.Close() + if err != nil { + logx.Error("redis close err:" + err.Error()) // 记录错误信息 + } + }(sysCfgDb) sysCfg := sysCfgDb.SysCfgFindWithDb(enum.AppInviteType, enum.AppInviteLength) inviteCode = svc.ReturnCode(utils.StrToInt(sysCfg[enum.AppInviteLength]), utils.StrToInt(sysCfg[enum.AppInviteType]), 0) if req.InviteCode != "" { diff --git a/app/hdl/hdl_wallet.go b/app/hdl/hdl_wallet.go index c9ab236..cbb37c5 100644 --- a/app/hdl/hdl_wallet.go +++ b/app/hdl/hdl_wallet.go @@ -9,6 +9,8 @@ import ( "applet/app/svc" "applet/app/utils" "applet/app/utils/cache" + "applet/app/utils/logx" + "code.fnuoos.com/EggPlanet/egg_models.git/src/dao" "code.fnuoos.com/EggPlanet/egg_models.git/src/implement" "code.fnuoos.com/EggPlanet/egg_models.git/src/model" rule2 "code.fnuoos.com/EggPlanet/egg_system_rules.git" @@ -412,6 +414,12 @@ func LaunchBindAlipayAccount(c *gin.Context) { redisConn := cache.GetPool().Get() sysCfgDb := implement.NewSysCfgDb(db.Db, redisConn) + defer func(sysCfgDb dao.SysCfgDao) { + err := sysCfgDb.Close() + if err != nil { + logx.Error("redis close err:" + err.Error()) // 记录错误信息 + } + }(sysCfgDb) sysCfgs, err := sysCfgDb.SysCfgGetAll() if err != nil { e.OutErr(c, e.ERR_DB_ORM, err.Error()) diff --git a/app/lib/alipay/face.go b/app/lib/alipay/face.go index 6fc1d23..62b476b 100644 --- a/app/lib/alipay/face.go +++ b/app/lib/alipay/face.go @@ -3,6 +3,8 @@ package alipay import ( "applet/app/db" "applet/app/utils/cache" + "applet/app/utils/logx" + "code.fnuoos.com/EggPlanet/egg_models.git/src/dao" "code.fnuoos.com/EggPlanet/egg_models.git/src/implement" "code.fnuoos.com/EggPlanet/egg_system_rules.git/enum" "errors" @@ -10,6 +12,12 @@ import ( func FacePrepareAlipayCode(method string, params map[string]string) (interface{}, error) { sysCfgDb := implement.NewSysCfgDb(db.Db, cache.GetPool().Get()) + defer func(sysCfgDb dao.SysCfgDao) { + err := sysCfgDb.Close() + if err != nil { + logx.Error("redis close err:" + err.Error()) // 记录错误信息 + } + }(sysCfgDb) sysCfgMap := sysCfgDb.SysCfgFindWithDb("alipay_face_url", enum.AlipayAppId, enum.AlipayPrivateKey, enum.AlipayPublicKey, enum.AlipayPublicContentRSA2, enum.AlipayRootContent, enum.AppPublicContent) // 获取私钥和APPID diff --git a/app/lib/gopay/init_alipay.go b/app/lib/gopay/init_alipay.go index 2d98696..f4beea6 100644 --- a/app/lib/gopay/init_alipay.go +++ b/app/lib/gopay/init_alipay.go @@ -3,6 +3,8 @@ package alipay import ( "applet/app/db" "applet/app/utils/cache" + "applet/app/utils/logx" + "code.fnuoos.com/EggPlanet/egg_models.git/src/dao" "code.fnuoos.com/EggPlanet/egg_models.git/src/implement" "code.fnuoos.com/EggPlanet/egg_system_rules.git/enum" "github.com/go-pay/gopay" @@ -27,6 +29,12 @@ type InitAlipayStruct struct { func InitAlipay(initData *InitAlipayStruct) (client *alipay.Client, err error) { if initData == nil { sysCfgDb := implement.NewSysCfgDb(db.Db, cache.GetPool().Get()) + defer func(sysCfgDb dao.SysCfgDao) { + err := sysCfgDb.Close() + if err != nil { + logx.Error("redis close err:" + err.Error()) // 记录错误信息 + } + }(sysCfgDb) sysCfgMap := sysCfgDb.SysCfgFindWithDb(enum.AlipayAppId, enum.AlipayPrivateKey, enum.AlipayPublicKey, enum.AlipayPublicContentRSA2, enum.AlipayRootContent, enum.AppPublicContent) initData = &InitAlipayStruct{ IsProd: true, diff --git a/app/svc/svc_aliyun_base.go b/app/svc/svc_aliyun_base.go index c029eb4..1f07052 100644 --- a/app/svc/svc_aliyun_base.go +++ b/app/svc/svc_aliyun_base.go @@ -3,6 +3,8 @@ package svc import ( "applet/app/db" "applet/app/utils/cache" + "applet/app/utils/logx" + "code.fnuoos.com/EggPlanet/egg_models.git/src/dao" "code.fnuoos.com/EggPlanet/egg_models.git/src/implement" "github.com/gin-gonic/gin" "github.com/tidwall/gjson" @@ -11,6 +13,12 @@ import ( func AliyunCaptchBase(c *gin.Context) (string, string) { redisConn := cache.GetPool().Get() sysCfgDb := implement.NewSysCfgDb(db.Db, redisConn) + defer func(sysCfgDb dao.SysCfgDao) { + err := sysCfgDb.Close() + if err != nil { + logx.Error("redis close err:" + err.Error()) // 记录错误信息 + } + }(sysCfgDb) data := sysCfgDb.SysCfgFindWithDb("aliyun_captch_id_android", "aliyun_captch_key_android", "aliyun_captch_id_ios", "aliyun_captch_key_ios", "aliyun_captch_id_h5", "aliyun_captch_key_h5") if c.GetHeader("platform") == "android" { return data["aliyun_captch_id_android"], data["aliyun_captch_key_android"] @@ -26,6 +34,12 @@ func AliyunCaptchBase(c *gin.Context) (string, string) { func AliyunSmsBase(c *gin.Context, types string) map[string]string { redisConn := cache.GetPool().Get() sysCfgDb := implement.NewSysCfgDb(db.Db, redisConn) + defer func(sysCfgDb dao.SysCfgDao) { + err := sysCfgDb.Close() + if err != nil { + logx.Error("redis close err:" + err.Error()) // 记录错误信息 + } + }(sysCfgDb) data := sysCfgDb.SysCfgFindWithDb("aliyun_sms_id", "aliyun_sms_secret", "aliyun_sms_code", "aliyun_sms_sign_name") data["aliyun_sms_code"] = gjson.Get(data["aliyun_sms_code"], types).String() return data diff --git a/app/svc/svc_common.go b/app/svc/svc_common.go index 8e3460c..d114545 100644 --- a/app/svc/svc_common.go +++ b/app/svc/svc_common.go @@ -5,6 +5,7 @@ import ( "applet/app/utils" "applet/app/utils/cache" "applet/app/utils/logx" + "code.fnuoos.com/EggPlanet/egg_models.git/src/dao" "code.fnuoos.com/EggPlanet/egg_models.git/src/implement" "code.fnuoos.com/EggPlanet/egg_models.git/src/model" "github.com/gin-gonic/gin" @@ -27,6 +28,12 @@ func UserImg(user *model.User) *model.User { func GetOssDomain() string { redisConn := cache.GetPool().Get() sysCfgDb := implement.NewSysCfgDb(db.Db, redisConn) + defer func(sysCfgDb dao.SysCfgDao) { + err := sysCfgDb.Close() + if err != nil { + logx.Error("redis close err:" + err.Error()) // 记录错误信息 + } + }(sysCfgDb) sysCfg := sysCfgDb.SysCfgFindWithDb("oss_domain", "oss_bucket_scheme") http := sysCfg["oss_bucket_scheme"] return http + "://" + sysCfg["oss_domain"] + "/" @@ -34,6 +41,12 @@ func GetOssDomain() string { func GetOssUrl(img string) string { redisConn := cache.GetPool().Get() sysCfgDb := implement.NewSysCfgDb(db.Db, redisConn) + defer func(sysCfgDb dao.SysCfgDao) { + err := sysCfgDb.Close() + if err != nil { + logx.Error("redis close err:" + err.Error()) // 记录错误信息 + } + }(sysCfgDb) sysCfg := sysCfgDb.SysCfgFindWithDb("oss_domain", "oss_bucket_scheme") if strings.Contains(img, "http") == false && img != "" { http := sysCfg["oss_bucket_scheme"] @@ -51,6 +64,12 @@ func NumFormat(num int) string { func GetSysCfgStr(key string) string { redisConn := cache.GetPool().Get() sysCfgDb := implement.NewSysCfgDb(db.Db, redisConn) + defer func(sysCfgDb dao.SysCfgDao) { + err := sysCfgDb.Close() + if err != nil { + logx.Error("redis close err:" + err.Error()) // 记录错误信息 + } + }(sysCfgDb) return sysCfgDb.SysCfgGetWithDb(key) } diff --git a/go.mod b/go.mod index 45903e8..0ae77c7 100644 --- a/go.mod +++ b/go.mod @@ -32,7 +32,7 @@ require ( ) require ( - code.fnuoos.com/EggPlanet/egg_models.git v0.2.1-0.20241210053355-df51eb14c56e + code.fnuoos.com/EggPlanet/egg_models.git v0.2.1-0.20241211055111-7c47b67b46d2 code.fnuoos.com/EggPlanet/egg_system_rules.git v0.0.4-0.20241207095445-64c8aa0b486e code.fnuoos.com/go_rely_warehouse/zyos_go_es.git v1.0.1-0.20241118083738-0f22da9ba0be code.fnuoos.com/go_rely_warehouse/zyos_go_mq.git v0.0.5