@@ -6,10 +6,9 @@ import ( | |||||
"applet/app/enum" | "applet/app/enum" | ||||
"applet/app/md" | "applet/app/md" | ||||
"applet/app/svc" | "applet/app/svc" | ||||
"applet/app/svc/sys_cfg" | |||||
"applet/app/utils" | "applet/app/utils" | ||||
"applet/app/utils/cache" | "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/implement" | ||||
enum2 "code.fnuoos.com/EggPlanet/egg_system_rules.git/enum" | enum2 "code.fnuoos.com/EggPlanet/egg_system_rules.git/enum" | ||||
"fmt" | "fmt" | ||||
@@ -156,15 +155,7 @@ func GetOssUrl(c *gin.Context) { | |||||
CommOss(c, args) | CommOss(c, args) | ||||
} | } | ||||
func CommOss(c *gin.Context, args ImgReqUploadReq) { | func CommOss(c *gin.Context, args ImgReqUploadReq) { | ||||
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) | |||||
sysCfgDb := sys_cfg.NewSysCfgDb(db.Db) | |||||
sysCfgs, err := sysCfgDb.SysCfgGetAll() | sysCfgs, err := sysCfgDb.SysCfgGetAll() | ||||
if err != nil { | if err != nil { | ||||
e.OutErr(c, e.ERR_DB_ORM, err.Error()) | e.OutErr(c, e.ERR_DB_ORM, err.Error()) | ||||
@@ -231,15 +222,7 @@ type GetSTSVoucherResp struct { | |||||
// @Failure 400 {object} md.Response "具体错误" | // @Failure 400 {object} md.Response "具体错误" | ||||
// @Router /api/getSTSVoucher [GET] | // @Router /api/getSTSVoucher [GET] | ||||
func GetSTSVoucher(c *gin.Context) { | func GetSTSVoucher(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) | |||||
sysCfgDb := sys_cfg.NewSysCfgDb(db.Db) | |||||
sysCfgs, err := sysCfgDb.SysCfgGetAll() | sysCfgs, err := sysCfgDb.SysCfgGetAll() | ||||
if err != nil { | if err != nil { | ||||
e.OutErr(c, e.ERR_DB_ORM, err.Error()) | e.OutErr(c, e.ERR_DB_ORM, err.Error()) | ||||
@@ -6,10 +6,8 @@ import ( | |||||
md "applet/app/md/friend_circle" | md "applet/app/md/friend_circle" | ||||
"applet/app/svc" | "applet/app/svc" | ||||
"applet/app/utils" | "applet/app/utils" | ||||
"applet/app/utils/cache" | |||||
"code.fnuoos.com/EggPlanet/egg_models.git/src/implement" | "code.fnuoos.com/EggPlanet/egg_models.git/src/implement" | ||||
md2 "code.fnuoos.com/EggPlanet/egg_system_rules.git/md" | md2 "code.fnuoos.com/EggPlanet/egg_system_rules.git/md" | ||||
svc2 "code.fnuoos.com/EggPlanet/egg_system_rules.git/svc" | |||||
"code.fnuoos.com/go_rely_warehouse/zyos_go_es.git/es" | "code.fnuoos.com/go_rely_warehouse/zyos_go_es.git/es" | ||||
"context" | "context" | ||||
"encoding/json" | "encoding/json" | ||||
@@ -134,8 +132,7 @@ func GetDynamic(c *gin.Context) { | |||||
for _, user := range users { | for _, user := range users { | ||||
userMap[user.Id] = user.Nickname | userMap[user.Id] = user.Nickname | ||||
} | } | ||||
redisConn := cache.GetPool().Get() | |||||
scheme, domain := svc2.ImageBucket(db.Db, redisConn) | |||||
scheme, domain := svc.ImageBucket(db.Db) | |||||
list := make([]md.DynamicRespNode, len(docs)) | list := make([]md.DynamicRespNode, len(docs)) | ||||
for _, doc := range docs { | for _, doc := range docs { | ||||
switch doc.Kind { | switch doc.Kind { | ||||
@@ -144,8 +141,8 @@ func GetDynamic(c *gin.Context) { | |||||
case 2: | case 2: | ||||
doc.Username = adminMap[doc.Uid] | doc.Username = adminMap[doc.Uid] | ||||
} | } | ||||
imageStr := svc2.ImageFormatWithBucketForDataInfo(scheme, domain, doc.Image) | |||||
videoStr := svc2.ImageFormatWithBucketForDataInfo(scheme, domain, doc.Video) | |||||
imageStr := svc.ImageFormatWithBucketForDataInfo(scheme, domain, doc.Image) | |||||
videoStr := svc.ImageFormatWithBucketForDataInfo(scheme, domain, doc.Video) | |||||
images := strings.Split(imageStr, ";") | images := strings.Split(imageStr, ";") | ||||
videos := strings.Split(videoStr, ";") | videos := strings.Split(videoStr, ";") | ||||
temp := md.DynamicRespNode{ | temp := md.DynamicRespNode{ | ||||
@@ -289,8 +286,8 @@ func ReleaseDynamic(c *gin.Context) { | |||||
if req.IsTopUp == 0 { | if req.IsTopUp == 0 { | ||||
req.IsTopUp = 2 | req.IsTopUp = 2 | ||||
} | } | ||||
redisConn := cache.GetPool().Get() | |||||
scheme, domain := svc2.ImageBucket(db.Db, redisConn) | |||||
scheme, domain := svc.ImageBucket(db.Db) | |||||
var imageStr string | var imageStr string | ||||
if len(req.Image) > 0 { | if len(req.Image) > 0 { | ||||
imageStr = strings.Join(req.Image, ";") | imageStr = strings.Join(req.Image, ";") | ||||
@@ -4,9 +4,7 @@ import ( | |||||
"applet/app/db" | "applet/app/db" | ||||
"applet/app/e" | "applet/app/e" | ||||
md "applet/app/md/institutional_management/egg_energy" | md "applet/app/md/institutional_management/egg_energy" | ||||
"applet/app/utils/cache" | |||||
"applet/app/utils/logx" | |||||
"code.fnuoos.com/EggPlanet/egg_models.git/src/dao" | |||||
"applet/app/svc/sys_cfg" | |||||
"code.fnuoos.com/EggPlanet/egg_models.git/src/implement" | "code.fnuoos.com/EggPlanet/egg_models.git/src/implement" | ||||
"code.fnuoos.com/EggPlanet/egg_models.git/src/model" | "code.fnuoos.com/EggPlanet/egg_models.git/src/model" | ||||
enum2 "code.fnuoos.com/EggPlanet/egg_system_rules.git/enum" | enum2 "code.fnuoos.com/EggPlanet/egg_system_rules.git/enum" | ||||
@@ -27,15 +25,7 @@ import ( | |||||
// @Failure 400 {object} md.Response "具体错误" | // @Failure 400 {object} md.Response "具体错误" | ||||
// @Router /api/institutionalManagement/eggEnergy/platformRevenue/getVideoReward [post] | // @Router /api/institutionalManagement/eggEnergy/platformRevenue/getVideoReward [post] | ||||
func GetVideoReward(c *gin.Context) { | func GetVideoReward(c *gin.Context) { | ||||
conn := cache.GetPool().Get() | |||||
cfgDb := implement.NewSysCfgDb(db.Db, conn) | |||||
defer func(cfgDb dao.SysCfgDao) { | |||||
err := cfgDb.Close() | |||||
if err != nil { | |||||
logx.Error("redis close err:" + err.Error()) // 记录错误信息 | |||||
} | |||||
}(cfgDb) | |||||
cfgDb := sys_cfg.NewSysCfgDb(db.Db) | |||||
unitPrice, err2 := cfgDb.SysCfgGetOneNoDataNoErr(enum2.VideoRewardUnitPrice) | unitPrice, err2 := cfgDb.SysCfgGetOneNoDataNoErr(enum2.VideoRewardUnitPrice) | ||||
if err2 != nil { | if err2 != nil { | ||||
e.OutErr(c, e.ERR_INVALID_ARGS, err2.Error()) | e.OutErr(c, e.ERR_INVALID_ARGS, err2.Error()) | ||||
@@ -78,15 +68,7 @@ func SetVideoReward(c *gin.Context) { | |||||
return | return | ||||
} | } | ||||
conn := cache.GetPool().Get() | |||||
cfgDb := implement.NewSysCfgDb(db.Db, conn) | |||||
defer func(cfgDb dao.SysCfgDao) { | |||||
err := cfgDb.Close() | |||||
if err != nil { | |||||
logx.Error("redis close err:" + err.Error()) // 记录错误信息 | |||||
} | |||||
}(cfgDb) | |||||
cfgDb := sys_cfg.NewSysCfgDb(db.Db) | |||||
if !cfgDb.SysCfgUpdate(enum2.VideoRewardUnitPrice, req.UnitPrice) { | if !cfgDb.SysCfgUpdate(enum2.VideoRewardUnitPrice, req.UnitPrice) { | ||||
e.OutErr(c, e.ERR_DB_ORM, "更新:"+enum2.VideoReward.String(enum2.VideoRewardUnitPrice)+"失败!") | e.OutErr(c, e.ERR_DB_ORM, "更新:"+enum2.VideoReward.String(enum2.VideoRewardUnitPrice)+"失败!") | ||||
return | return | ||||
@@ -5,11 +5,10 @@ import ( | |||||
"applet/app/e" | "applet/app/e" | ||||
md2 "applet/app/md" | md2 "applet/app/md" | ||||
"applet/app/md/institutional_management/module_setting" | "applet/app/md/institutional_management/module_setting" | ||||
svc2 "applet/app/svc" | |||||
"applet/app/utils" | "applet/app/utils" | ||||
"applet/app/utils/cache" | |||||
"code.fnuoos.com/EggPlanet/egg_models.git/src/implement" | "code.fnuoos.com/EggPlanet/egg_models.git/src/implement" | ||||
"code.fnuoos.com/EggPlanet/egg_models.git/src/model" | "code.fnuoos.com/EggPlanet/egg_models.git/src/model" | ||||
"code.fnuoos.com/EggPlanet/egg_system_rules.git/svc" | |||||
"errors" | "errors" | ||||
"fmt" | "fmt" | ||||
"github.com/gin-gonic/gin" | "github.com/gin-gonic/gin" | ||||
@@ -70,9 +69,9 @@ func ModuleSettingGet(c *gin.Context) { | |||||
return | return | ||||
} | } | ||||
} | } | ||||
redisConn := cache.GetPool().Get() | |||||
scheme, domain := svc.ImageBucket(db.Db, redisConn) | |||||
moduleStyleStr := svc.ImageFormatWithBucketForDataInfo(scheme, domain, moduleStyle.Data) | |||||
scheme, domain := svc2.ImageBucket(db.Db) | |||||
moduleStyleStr := svc2.ImageFormatWithBucketForDataInfo(scheme, domain, moduleStyle.Data) | |||||
utils.Unserialize([]byte(moduleStyleStr), &data) | utils.Unserialize([]byte(moduleStyleStr), &data) | ||||
resp := md.ModuleSettingGetResp{ | resp := md.ModuleSettingGetResp{ | ||||
@@ -123,8 +122,7 @@ func ModuleSettingUpdate(c *gin.Context) { | |||||
moduleStyle.Data = utils.SerializeStr(req.Data) | moduleStyle.Data = utils.SerializeStr(req.Data) | ||||
// 替换所有 host | // 替换所有 host | ||||
redisConn := cache.GetPool().Get() | |||||
scheme, domain := svc.ImageBucket(db.Db, redisConn) | |||||
scheme, domain := svc2.ImageBucket(db.Db) | |||||
moduleStyle.Data = strings.ReplaceAll(moduleStyle.Data, fmt.Sprintf("%s://%s/", scheme, domain), "{{tempHost}}") | moduleStyle.Data = strings.ReplaceAll(moduleStyle.Data, fmt.Sprintf("%s://%s/", scheme, domain), "{{tempHost}}") | ||||
affected, err := moduleStyleDb.ModuleStyleUpdate(moduleStyle.ModId, moduleStyle, forceColumns...) | affected, err := moduleStyleDb.ModuleStyleUpdate(moduleStyle.ModId, moduleStyle, forceColumns...) | ||||
if err != nil { | if err != nil { | ||||
@@ -4,10 +4,7 @@ import ( | |||||
"applet/app/db" | "applet/app/db" | ||||
"applet/app/e" | "applet/app/e" | ||||
md "applet/app/md/setCenter/oss/aliyun" | md "applet/app/md/setCenter/oss/aliyun" | ||||
"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" | |||||
"applet/app/svc/sys_cfg" | |||||
enum2 "code.fnuoos.com/EggPlanet/egg_system_rules.git/enum" | enum2 "code.fnuoos.com/EggPlanet/egg_system_rules.git/enum" | ||||
"github.com/gin-gonic/gin" | "github.com/gin-gonic/gin" | ||||
) | ) | ||||
@@ -23,15 +20,7 @@ import ( | |||||
// @Failure 400 {object} md.Response "具体错误" | // @Failure 400 {object} md.Response "具体错误" | ||||
// @Router /api/settCenter/oss/aliYun/getBasic [get] | // @Router /api/settCenter/oss/aliYun/getBasic [get] | ||||
func GetBasic(c *gin.Context) { | func GetBasic(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) | |||||
sysCfgDb := sys_cfg.NewSysCfgDb(db.Db) | |||||
sysCfg, err := sysCfgDb.SysCfgGetAll() | sysCfg, err := sysCfgDb.SysCfgGetAll() | ||||
if err != nil { | if err != nil { | ||||
e.OutErr(c, e.ERR_DB_ORM, err.Error()) | e.OutErr(c, e.ERR_DB_ORM, err.Error()) | ||||
@@ -122,14 +111,7 @@ func SetBasic(c *gin.Context) { | |||||
return | return | ||||
} | } | ||||
redisConn := cache.GetPool().Get() | |||||
cfgDb := implement.NewSysCfgDb(db.Db, redisConn) | |||||
defer func(cfgDb dao.SysCfgDao) { | |||||
err := cfgDb.Close() | |||||
if err != nil { | |||||
logx.Error("redis close err:" + err.Error()) // 记录错误信息 | |||||
} | |||||
}(cfgDb) | |||||
cfgDb := sys_cfg.NewSysCfgDb(db.Db) | |||||
if req.OssAccessKeyId != "" { | if req.OssAccessKeyId != "" { | ||||
cfgDb.SysCfgUpdate(enum2.AliyunOssAccessKeyID, req.OssAccessKeyId) | cfgDb.SysCfgUpdate(enum2.AliyunOssAccessKeyID, req.OssAccessKeyId) | ||||
@@ -6,9 +6,7 @@ import ( | |||||
"applet/app/md" | "applet/app/md" | ||||
"applet/app/svc" | "applet/app/svc" | ||||
"applet/app/utils" | "applet/app/utils" | ||||
"applet/app/utils/cache" | |||||
"code.fnuoos.com/EggPlanet/egg_models.git/src/implement" | "code.fnuoos.com/EggPlanet/egg_models.git/src/implement" | ||||
svc2 "code.fnuoos.com/EggPlanet/egg_system_rules.git/svc" | |||||
"github.com/gin-gonic/gin" | "github.com/gin-gonic/gin" | ||||
) | ) | ||||
@@ -69,9 +67,8 @@ func GetModuleSetting(c *gin.Context) { | |||||
return | return | ||||
} | } | ||||
var dataMap interface{} | var dataMap interface{} | ||||
redisConn := cache.GetPool().Get() | |||||
scheme, domain := svc2.ImageBucket(db.Db, redisConn) | |||||
moduleStyle.Data = svc2.ImageFormatWithBucketForDataInfo(scheme, domain, moduleStyle.Data) | |||||
scheme, domain := svc.ImageBucket(db.Db) | |||||
moduleStyle.Data = svc.ImageFormatWithBucketForDataInfo(scheme, domain, moduleStyle.Data) | |||||
utils.Unserialize([]byte(moduleStyle.Data), &dataMap) | utils.Unserialize([]byte(moduleStyle.Data), &dataMap) | ||||
resp := md.GetModuleSettingResp{ | resp := md.GetModuleSettingResp{ | ||||
ModName: moduleStyle.ModName, | ModName: moduleStyle.ModName, | ||||
@@ -5,11 +5,8 @@ import ( | |||||
"applet/app/e" | "applet/app/e" | ||||
"applet/app/md" | "applet/app/md" | ||||
"applet/app/svc" | "applet/app/svc" | ||||
"applet/app/svc/sys_cfg" | |||||
"applet/app/utils" | "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" | |||||
"encoding/json" | "encoding/json" | ||||
"github.com/gin-gonic/gin" | "github.com/gin-gonic/gin" | ||||
) | ) | ||||
@@ -27,14 +24,7 @@ func ImgBaseSave(c *gin.Context) { | |||||
e.OutErr(c, e.ERR_INVALID_ARGS, err) | e.OutErr(c, e.ERR_INVALID_ARGS, err) | ||||
return | return | ||||
} | } | ||||
conn := cache.GetPool().Get() | |||||
cfgDb := implement.NewSysCfgDb(db.Db, conn) | |||||
defer func(cfgDb dao.SysCfgDao) { | |||||
err := cfgDb.Close() | |||||
if err != nil { | |||||
logx.Error("redis close err:" + err.Error()) // 记录错误信息 | |||||
} | |||||
}(cfgDb) | |||||
cfgDb := sys_cfg.NewSysCfgDb(db.Db) | |||||
cfgDb.SysCfgUpdate("app_cloud_bundle_data", utils.SerializeStr(req)) | cfgDb.SysCfgUpdate("app_cloud_bundle_data", utils.SerializeStr(req)) | ||||
e.OutSuc(c, "success", nil) | e.OutSuc(c, "success", nil) | ||||
@@ -5,11 +5,8 @@ import ( | |||||
"applet/app/e" | "applet/app/e" | ||||
"applet/app/md" | "applet/app/md" | ||||
"applet/app/svc" | "applet/app/svc" | ||||
"applet/app/svc/sys_cfg" | |||||
"applet/app/utils" | "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" | |||||
"encoding/json" | "encoding/json" | ||||
"github.com/gin-gonic/gin" | "github.com/gin-gonic/gin" | ||||
) | ) | ||||
@@ -50,15 +47,7 @@ func VersionBaseSave(c *gin.Context) { | |||||
e.OutErr(c, e.ERR_INVALID_ARGS, err) | e.OutErr(c, e.ERR_INVALID_ARGS, err) | ||||
return | return | ||||
} | } | ||||
conn := cache.GetPool().Get() | |||||
cfgDb := implement.NewSysCfgDb(db.Db, conn) | |||||
defer func(cfgDb dao.SysCfgDao) { | |||||
err := cfgDb.Close() | |||||
if err != nil { | |||||
logx.Error("redis close err:" + err.Error()) // 记录错误信息 | |||||
} | |||||
}(cfgDb) | |||||
cfgDb := sys_cfg.NewSysCfgDb(db.Db) | |||||
cfgDb.SysCfgUpdate("app_version", utils.SerializeStr(req)) | cfgDb.SysCfgUpdate("app_version", utils.SerializeStr(req)) | ||||
e.OutSuc(c, "success", nil) | e.OutSuc(c, "success", nil) | ||||
return | return | ||||
@@ -5,9 +5,8 @@ import ( | |||||
"applet/app/e" | "applet/app/e" | ||||
"applet/app/md" | "applet/app/md" | ||||
"applet/app/svc" | "applet/app/svc" | ||||
"applet/app/svc/sys_cfg" | |||||
"applet/app/utils" | "applet/app/utils" | ||||
"applet/app/utils/cache" | |||||
"code.fnuoos.com/EggPlanet/egg_models.git/src/implement" | |||||
"github.com/gin-gonic/gin" | "github.com/gin-gonic/gin" | ||||
"github.com/tidwall/gjson" | "github.com/tidwall/gjson" | ||||
) | ) | ||||
@@ -33,8 +32,8 @@ func PlayletBaseSave(c *gin.Context) { | |||||
e.OutErr(c, err1.Code, err1.Error()) | e.OutErr(c, err1.Code, err1.Error()) | ||||
return | return | ||||
} | } | ||||
redisConn := cache.GetPool().Get() | |||||
sysCfgDb := implement.NewSysCfgDb(db.Db, redisConn) | |||||
sysCfgDb := sys_cfg.NewSysCfgDb(db.Db) | |||||
sysCfgDb.SysCfgUpdate("playlet_base", utils.SerializeStr(req)) | sysCfgDb.SysCfgUpdate("playlet_base", utils.SerializeStr(req)) | ||||
e.OutSuc(c, "success", nil) | e.OutSuc(c, "success", nil) | ||||
return | return | ||||
@@ -5,9 +5,8 @@ import ( | |||||
"applet/app/e" | "applet/app/e" | ||||
"applet/app/md" | "applet/app/md" | ||||
"applet/app/svc" | "applet/app/svc" | ||||
"applet/app/svc/sys_cfg" | |||||
"applet/app/utils" | "applet/app/utils" | ||||
"applet/app/utils/cache" | |||||
"code.fnuoos.com/EggPlanet/egg_models.git/src/implement" | |||||
"github.com/gin-gonic/gin" | "github.com/gin-gonic/gin" | ||||
"github.com/tidwall/gjson" | "github.com/tidwall/gjson" | ||||
) | ) | ||||
@@ -33,8 +32,7 @@ func VideoBaseSave(c *gin.Context) { | |||||
e.OutErr(c, err1.Code, err1.Error()) | e.OutErr(c, err1.Code, err1.Error()) | ||||
return | return | ||||
} | } | ||||
redisConn := cache.GetPool().Get() | |||||
sysCfgDb := implement.NewSysCfgDb(db.Db, redisConn) | |||||
sysCfgDb := sys_cfg.NewSysCfgDb(db.Db) | |||||
sysCfgDb.SysCfgUpdate("video_base", utils.SerializeStr(req)) | sysCfgDb.SysCfgUpdate("video_base", utils.SerializeStr(req)) | ||||
e.OutSuc(c, "success", nil) | e.OutSuc(c, "success", nil) | ||||
return | return | ||||
@@ -4,10 +4,8 @@ import ( | |||||
"applet/app/db" | "applet/app/db" | ||||
"applet/app/e" | "applet/app/e" | ||||
"applet/app/md" | "applet/app/md" | ||||
"applet/app/svc/sys_cfg" | |||||
"applet/app/utils" | "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/implement" | ||||
"code.fnuoos.com/EggPlanet/egg_models.git/src/model" | "code.fnuoos.com/EggPlanet/egg_models.git/src/model" | ||||
"github.com/360EntSecGroup-Skylar/excelize" | "github.com/360EntSecGroup-Skylar/excelize" | ||||
@@ -119,16 +117,7 @@ func AliyunSmsDel(c *gin.Context) { | |||||
return | return | ||||
} | } | ||||
func AliyunSmsSaleBase(c *gin.Context) { | func AliyunSmsSaleBase(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) | |||||
sysCfgDb := sys_cfg.NewSysCfgDb(db.Db) | |||||
aliyunSmsNotice := sysCfgDb.SysCfgGetWithDb("aliyun_sms_sale_code") | aliyunSmsNotice := sysCfgDb.SysCfgGetWithDb("aliyun_sms_sale_code") | ||||
res := map[string]string{ | res := map[string]string{ | ||||
"aliyun_sms_sale_code": aliyunSmsNotice, | "aliyun_sms_sale_code": aliyunSmsNotice, | ||||
@@ -142,14 +131,7 @@ func AliyunSmsSaleSave(c *gin.Context) { | |||||
e.OutErr(c, e.ERR_INVALID_ARGS, err) | e.OutErr(c, e.ERR_INVALID_ARGS, err) | ||||
return | return | ||||
} | } | ||||
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) | |||||
sysCfgDb := sys_cfg.NewSysCfgDb(db.Db) | |||||
sysCfgDb.SysCfgUpdate("aliyun_sms_sale_code", req["aliyun_sms_sale_code"]) | sysCfgDb.SysCfgUpdate("aliyun_sms_sale_code", req["aliyun_sms_sale_code"]) | ||||
e.OutSuc(c, "success", nil) | e.OutSuc(c, "success", nil) | ||||
@@ -2,11 +2,8 @@ package svc | |||||
import ( | import ( | ||||
"applet/app/db" | "applet/app/db" | ||||
"applet/app/svc/sys_cfg" | |||||
"applet/app/utils" | "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_models.git/src/model" | ||||
openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" | openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" | ||||
ram20150501 "github.com/alibabacloud-go/ram-20150501/v2/client" | ram20150501 "github.com/alibabacloud-go/ram-20150501/v2/client" | ||||
@@ -19,14 +16,7 @@ import ( | |||||
) | ) | ||||
func GetOssUrl(img string) 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) | |||||
sysCfgDb := sys_cfg.NewSysCfgDb(db.Db) | |||||
sysCfg := sysCfgDb.SysCfgFindWithDb("oss_domain", "oss_bucket_scheme") | sysCfg := sysCfgDb.SysCfgFindWithDb("oss_domain", "oss_bucket_scheme") | ||||
if strings.Contains(img, "http") == false && img != "" { | if strings.Contains(img, "http") == false && img != "" { | ||||
http := sysCfg["oss_bucket_scheme"] | http := sysCfg["oss_bucket_scheme"] | ||||
@@ -35,41 +25,16 @@ func GetOssUrl(img string) string { | |||||
return img | return img | ||||
} | } | ||||
func GetOssDomain() string { | 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) | |||||
sysCfgDb := sys_cfg.NewSysCfgDb(db.Db) | |||||
sysCfg := sysCfgDb.SysCfgFindWithDb("oss_domain", "oss_bucket_scheme") | sysCfg := sysCfgDb.SysCfgFindWithDb("oss_domain", "oss_bucket_scheme") | ||||
http := sysCfg["oss_bucket_scheme"] | http := sysCfg["oss_bucket_scheme"] | ||||
return http + "://" + sysCfg["oss_domain"] + "/" | return http + "://" + sysCfg["oss_domain"] + "/" | ||||
} | } | ||||
func GetSysCfgStr(key string) 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) | |||||
return sys_cfg.NewSysCfgDb(db.Db).SysCfgGetWithDb(key) | |||||
} | } | ||||
func SetSysCfgStr(key, val string) bool { | func SetSysCfgStr(key, val string) bool { | ||||
redisConn := cache.GetPool().Get() | |||||
cfgDb := implement.NewSysCfgDb(db.Db, redisConn) | |||||
defer func(cfgDb dao.SysCfgDao) { | |||||
err := cfgDb.Close() | |||||
if err != nil { | |||||
logx.Error("redis close err:" + err.Error()) // 记录错误信息 | |||||
} | |||||
}(cfgDb) | |||||
cfgDb := sys_cfg.NewSysCfgDb(db.Db) | |||||
var bools bool | var bools bool | ||||
if val != "" { | if val != "" { | ||||
data, _ := cfgDb.SysCfgGetOne(key) | data, _ := cfgDb.SysCfgGetOne(key) | ||||
@@ -0,0 +1,41 @@ | |||||
package svc | |||||
import ( | |||||
"applet/app/svc/sys_cfg" | |||||
"code.fnuoos.com/EggPlanet/egg_system_rules.git/enum" | |||||
"fmt" | |||||
"strings" | |||||
"xorm.io/xorm" | |||||
) | |||||
// ImageBucket is 获取域名 | |||||
func ImageBucket(engine *xorm.Engine) (string, string) { | |||||
sysCfgDb := sys_cfg.NewSysCfgDb(engine) | |||||
res := sysCfgDb.SysCfgFindWithDb(enum.AliyunOssBucketScheme, enum.AliyunOssDomain) | |||||
return res[enum.AliyunOssBucketScheme], res[enum.AliyunOssDomain] | |||||
} | |||||
// ImageFormatWithBucket is 格式化成oss 域名 | |||||
func ImageFormatWithBucket(scheme, domain, name string) string { | |||||
if strings.Contains(name, "http") || name == "" { | |||||
return name | |||||
} | |||||
return fmt.Sprintf("%s://%s/%s", scheme, domain, name) | |||||
} | |||||
// ImageFormatWithBucketNew is 格式化成oss 域名 | |||||
func ImageFormatWithBucketNew(scheme, domain, name string) string { | |||||
if strings.Contains(name, "http") { | |||||
return name | |||||
} | |||||
name = strings.ReplaceAll(name, "{{tempHost}}", "") | |||||
return fmt.Sprintf("%s://%s/%s", scheme, domain, name) | |||||
} | |||||
// ImageFormatWithBucketForDataInfo is 格式化成oss 域名 (只格式化内容中的 url) | |||||
func ImageFormatWithBucketForDataInfo(scheme, domain, name string) string { | |||||
prefix := fmt.Sprintf("%s://%s/", scheme, domain) | |||||
name = strings.ReplaceAll(name, "{{tempHost}}", prefix) | |||||
return name | |||||
} |
@@ -0,0 +1,14 @@ | |||||
package sys_cfg | |||||
import "code.fnuoos.com/EggPlanet/egg_models.git/src/model" | |||||
type SysCfgDao interface { | |||||
SysCfgGetAll() (*[]model.SysCfg, error) | |||||
SysCfgGetOneNoDataNoErr(key string) (*model.SysCfg, error) | |||||
SysCfgGetOne(key string) (*model.SysCfg, error) | |||||
SysCfgInsert(key, val, memo string) bool | |||||
SysCfgUpdate(key, val string) bool | |||||
SysCfgGetWithDb(HKey string) string | |||||
SysCfgDel(HKey string) error | |||||
SysCfgFindWithDb(keys ...string) map[string]string | |||||
} |
@@ -0,0 +1,118 @@ | |||||
package sys_cfg | |||||
import ( | |||||
"applet/app/utils/cache" | |||||
"code.fnuoos.com/EggPlanet/egg_models.git/md" | |||||
"code.fnuoos.com/EggPlanet/egg_models.git/src/model" | |||||
zhios_order_relate_logx "code.fnuoos.com/EggPlanet/egg_models.git/utils/logx" | |||||
"fmt" | |||||
"xorm.io/xorm" | |||||
) | |||||
func NewSysCfgDb(engine *xorm.Engine) SysCfgDao { | |||||
return &SysCfgDb{ | |||||
Db: engine, | |||||
} | |||||
} | |||||
type SysCfgDb struct { | |||||
Db *xorm.Engine | |||||
} | |||||
func (s SysCfgDb) SysCfgGetAll() (*[]model.SysCfg, error) { | |||||
var cfgList []model.SysCfg | |||||
if err := s.Db.Cols("key,val,memo").Find(&cfgList); err != nil { | |||||
return nil, zhios_order_relate_logx.Error(err) | |||||
} | |||||
return &cfgList, nil | |||||
} | |||||
func (s SysCfgDb) SysCfgGetOneNoDataNoErr(key string) (*model.SysCfg, error) { | |||||
var cfgList model.SysCfg | |||||
_, err := s.Db.Where("`key`=?", key).Get(&cfgList) | |||||
if err != nil { | |||||
return nil, zhios_order_relate_logx.Error(err) | |||||
} | |||||
return &cfgList, nil | |||||
} | |||||
func (s SysCfgDb) SysCfgGetOne(key string) (*model.SysCfg, error) { | |||||
var cfgList model.SysCfg | |||||
if has, err := s.Db.Where("`key`=?", key).Get(&cfgList); err != nil || has == false { | |||||
return nil, zhios_order_relate_logx.Error(err) | |||||
} | |||||
return &cfgList, nil | |||||
} | |||||
func (s SysCfgDb) SysCfgInsert(key, val, memo string) bool { | |||||
cfg := model.SysCfg{Key: key, Val: val, Memo: memo} | |||||
_, err := s.Db.InsertOne(&cfg) | |||||
if err != nil { | |||||
zhios_order_relate_logx.Error(err) | |||||
return false | |||||
} | |||||
return true | |||||
} | |||||
func (s SysCfgDb) SysCfgUpdate(key, val string) bool { | |||||
cfg := model.SysCfg{Key: key, Val: val} | |||||
_, err := s.Db.Where("`key`=?", key).Cols("val").Update(&cfg) | |||||
if err != nil { | |||||
zhios_order_relate_logx.Error(err) | |||||
return false | |||||
} | |||||
s.SysCfgDel(key) | |||||
return true | |||||
} | |||||
func (s SysCfgDb) SysCfgGetWithDb(HKey string) string { | |||||
cacheKey := fmt.Sprintf(md.AppCfgCacheKey, HKey[0:1]) | |||||
get, err := cache.HGetString(cacheKey, HKey) | |||||
if err != nil || get == "" { | |||||
cfg, err := s.SysCfgGetOne(HKey) | |||||
if err != nil || cfg == nil { | |||||
_ = zhios_order_relate_logx.Error(err) | |||||
return "" | |||||
} | |||||
// key是否存在 | |||||
cacheKeyExist := false | |||||
if cache.Exists(cacheKey) { | |||||
cacheKeyExist = true | |||||
} | |||||
// 设置缓存 | |||||
_, err = cache.HSet(cacheKey, HKey, cfg.Val) | |||||
if err != nil { | |||||
_ = zhios_order_relate_logx.Error(err) | |||||
return "" | |||||
} | |||||
if !cacheKeyExist { // 如果是首次设置 设置过期时间 | |||||
_, err := cache.Expire(cacheKey, md.CfgCacheTime) | |||||
if err != nil { | |||||
_ = zhios_order_relate_logx.Error(err) | |||||
return "" | |||||
} | |||||
} | |||||
return cfg.Val | |||||
} | |||||
return get | |||||
} | |||||
func (s SysCfgDb) SysCfgDel(HKey string) error { | |||||
cacheKey := fmt.Sprintf(md.AppCfgCacheKey, HKey[0:1]) | |||||
_, err := cache.HDel(cacheKey, HKey) | |||||
if err != nil { | |||||
return err | |||||
} | |||||
return nil | |||||
} | |||||
func (s SysCfgDb) SysCfgFindWithDb(keys ...string) map[string]string { | |||||
res := map[string]string{} | |||||
for _, v := range keys { | |||||
val := s.SysCfgGetWithDb(v) | |||||
res[v] = val | |||||
} | |||||
return res | |||||
} |
@@ -5,10 +5,7 @@ import ( | |||||
"applet/app/e" | "applet/app/e" | ||||
"applet/app/md" | "applet/app/md" | ||||
"applet/app/svc" | "applet/app/svc" | ||||
"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" | |||||
"applet/app/svc/sys_cfg" | |||||
"github.com/gin-gonic/gin" | "github.com/gin-gonic/gin" | ||||
) | ) | ||||
@@ -25,15 +22,8 @@ func BaseSave(c *gin.Context) { | |||||
e.OutErr(c, e.ERR_INVALID_ARGS, err) | e.OutErr(c, e.ERR_INVALID_ARGS, err) | ||||
return | return | ||||
} | } | ||||
conn := cache.GetPool().Get() | |||||
cfgDb := implement.NewSysCfgDb(db.Db, conn) | |||||
defer func(cfgDb dao.SysCfgDao) { | |||||
err := cfgDb.Close() | |||||
if err != nil { | |||||
logx.Error("redis close err:" + err.Error()) // 记录错误信息 | |||||
} | |||||
}(cfgDb) | |||||
cfgDb := sys_cfg.NewSysCfgDb(db.Db) | |||||
cfgDb.SysCfgUpdate("user_real_name_money", req.UserRealNameMoney) | cfgDb.SysCfgUpdate("user_real_name_money", req.UserRealNameMoney) | ||||
cfgDb.SysCfgUpdate("user_real_name_rule", req.UserRealNameRule) | cfgDb.SysCfgUpdate("user_real_name_rule", req.UserRealNameRule) | ||||
e.OutSuc(c, "success", nil) | e.OutSuc(c, "success", nil) | ||||
@@ -87,14 +87,14 @@ func doTask(fnName string) func() { | |||||
// 增加自动任务队列 | // 增加自动任务队列 | ||||
func initTasks() { | func initTasks() { | ||||
jobs[taskMd.CronEggEnergyAutoRecordPrices] = taskEggEnergyAutoRecordPrices | |||||
jobs[taskMd.CronEggEnergyDealPlatformRevenueData] = taskEggEnergyDealPlatformRevenueData | |||||
jobs[taskMd.CronEggEnergyDealFundData] = taskEggEnergyDealFundData | |||||
jobs[taskMd.CronEggEnergyUserEggScore] = taskCronEggEnergyUserEggScore | |||||
jobs[taskMd.CornEggEnergyAutoReleaseTeamEggEnergy] = taskEggEnergyAutoReleaseTeamEggEnergy // 蛋蛋能量-自动释放团队蛋蛋能量到个人能量 | |||||
jobs[taskMd.CornSettlementStarLevelDividends] = taskEggEnergySettlementStarLevelDividends // 蛋蛋能量-结算星级分红 | |||||
jobs[taskMd.CornEggEnergyDealUserPublicPlatoonPunish] = taskEggEnergyDealUserPublicPlatoonPunish // 蛋蛋能量-公排处罚 | |||||
jobs[taskMd.CornEggEnergyAutoAdjustPrice] = taskEggEnergyAutoAdjustPrice // 蛋蛋能量-自动调整价格 | |||||
jobs[taskMd.CornEggEnergyAutoCommunityDividends] = taskEggEnergyCommunityDividends // 蛋蛋能量-社区分红 | |||||
//jobs[taskMd.CronEggEnergyAutoRecordPrices] = taskEggEnergyAutoRecordPrices | |||||
//jobs[taskMd.CronEggEnergyDealPlatformRevenueData] = taskEggEnergyDealPlatformRevenueData | |||||
//jobs[taskMd.CronEggEnergyDealFundData] = taskEggEnergyDealFundData | |||||
//jobs[taskMd.CronEggEnergyUserEggScore] = taskCronEggEnergyUserEggScore | |||||
//jobs[taskMd.CornEggEnergyAutoReleaseTeamEggEnergy] = taskEggEnergyAutoReleaseTeamEggEnergy // 蛋蛋能量-自动释放团队蛋蛋能量到个人能量 | |||||
//jobs[taskMd.CornSettlementStarLevelDividends] = taskEggEnergySettlementStarLevelDividends // 蛋蛋能量-结算星级分红 | |||||
//jobs[taskMd.CornEggEnergyDealUserPublicPlatoonPunish] = taskEggEnergyDealUserPublicPlatoonPunish // 蛋蛋能量-公排处罚 | |||||
jobs[taskMd.CornEggEnergyAutoAdjustPrice] = taskEggEnergyAutoAdjustPrice // 蛋蛋能量-自动调整价格 | |||||
//jobs[taskMd.CornEggEnergyAutoCommunityDividends] = taskEggEnergyCommunityDividends // 蛋蛋能量-社区分红 | |||||
} | } |
@@ -20,6 +20,7 @@ db: | |||||
max_idle_conns: 100 | max_idle_conns: 100 | ||||
path: 'tmp/%s.log' | path: 'tmp/%s.log' | ||||
im_db: | im_db: | ||||
host: '119.23.182.117:3306' | host: '119.23.182.117:3306' | ||||
name: 'egg-im' | name: 'egg-im' | ||||
@@ -33,8 +33,8 @@ require ( | |||||
) | ) | ||||
require ( | require ( | ||||
code.fnuoos.com/EggPlanet/egg_models.git v0.2.1-0.20241211152610-0c5e1e903c99 | |||||
code.fnuoos.com/EggPlanet/egg_system_rules.git v0.0.4-0.20241212114007-477fc46cda14 | |||||
code.fnuoos.com/EggPlanet/egg_models.git v0.2.1-0.20241212120727-3681308aeb14 | |||||
code.fnuoos.com/EggPlanet/egg_system_rules.git v0.0.4-0.20241212122404-22c05dd7f73c | |||||
code.fnuoos.com/go_rely_warehouse/zyos_go_es.git v1.0.1-0.20241118083738-0f22da9ba0be | 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 | code.fnuoos.com/go_rely_warehouse/zyos_go_mq.git v0.0.5 | ||||
github.com/360EntSecGroup-Skylar/excelize v1.4.1 | github.com/360EntSecGroup-Skylar/excelize v1.4.1 | ||||