diff --git a/app/admin/apis/process/wf_classify.go b/app/admin/apis/process/wf_classify.go index 6a484cc9..19e3b21f 100644 --- a/app/admin/apis/process/wf_classify.go +++ b/app/admin/apis/process/wf_classify.go @@ -19,10 +19,9 @@ type WfProcessClassify struct { func (e *WfProcessClassify) GetWfProcessClassifyList(c *gin.Context) { log := e.GetLogger(c) d := new(dto.WfProcessClassifySearch) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -54,10 +53,9 @@ func (e *WfProcessClassify) GetWfProcessClassifyList(c *gin.Context) { func (e *WfProcessClassify) GetWfProcessClassify(c *gin.Context) { log := e.GetLogger(c) control := new(dto.WfProcessClassifyById) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -88,10 +86,9 @@ func (e *WfProcessClassify) GetWfProcessClassify(c *gin.Context) { func (e *WfProcessClassify) InsertWfProcessClassify(c *gin.Context) { log := e.GetLogger(c) control := new(dto.WfProcessClassifyControl) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -125,10 +122,9 @@ func (e *WfProcessClassify) InsertWfProcessClassify(c *gin.Context) { func (e *WfProcessClassify) UpdateWfProcessClassify(c *gin.Context) { log := e.GetLogger(c) control := new(dto.WfProcessClassifyControl) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -163,10 +159,9 @@ func (e *WfProcessClassify) UpdateWfProcessClassify(c *gin.Context) { func (e *WfProcessClassify) DeleteWfProcessClassify(c *gin.Context) { log := e.GetLogger(c) control := new(dto.WfProcessClassifyById) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } diff --git a/app/admin/apis/sys_china_area_data/sys_china_area_data.go b/app/admin/apis/sys_china_area_data/sys_china_area_data.go index cf5d52f2..1647312b 100644 --- a/app/admin/apis/sys_china_area_data/sys_china_area_data.go +++ b/app/admin/apis/sys_china_area_data/sys_china_area_data.go @@ -20,10 +20,9 @@ type SysChinaAreaData struct { func (e *SysChinaAreaData) GetSysChinaAreaDataList(c *gin.Context) { log := e.GetLogger(c) d := new(dto.SysChinaAreaDataSearch) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -54,10 +53,9 @@ func (e *SysChinaAreaData) GetSysChinaAreaDataList(c *gin.Context) { func (e *SysChinaAreaData) GetSysChinaAreaData(c *gin.Context) { log := e.GetLogger(c) control := new(dto.SysChinaAreaDataById) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -87,10 +85,9 @@ func (e *SysChinaAreaData) GetSysChinaAreaData(c *gin.Context) { func (e *SysChinaAreaData) InsertSysChinaAreaData(c *gin.Context) { log := e.GetLogger(c) control := new(dto.SysChinaAreaDataControl) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -124,10 +121,9 @@ func (e *SysChinaAreaData) InsertSysChinaAreaData(c *gin.Context) { func (e *SysChinaAreaData) UpdateSysChinaAreaData(c *gin.Context) { log := e.GetLogger(c) control := new(dto.SysChinaAreaDataControl) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -161,10 +157,9 @@ func (e *SysChinaAreaData) UpdateSysChinaAreaData(c *gin.Context) { func (e *SysChinaAreaData) DeleteSysChinaAreaData(c *gin.Context) { log := e.GetLogger(c) control := new(dto.SysChinaAreaDataById) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } diff --git a/app/admin/apis/sys_file/sys_file_dir.go b/app/admin/apis/sys_file/sys_file_dir.go index d9763444..70524fb8 100644 --- a/app/admin/apis/sys_file/sys_file_dir.go +++ b/app/admin/apis/sys_file/sys_file_dir.go @@ -20,10 +20,9 @@ type SysFileDir struct { func (e *SysFileDir) GetSysFileDirList(c *gin.Context) { log := e.GetLogger(c) search := new(dto.SysFileDirSearch) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -49,10 +48,9 @@ func (e *SysFileDir) GetSysFileDirList(c *gin.Context) { func (e *SysFileDir) GetSysFileDir(c *gin.Context) { control := new(dto.SysFileDirById) log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -81,10 +79,9 @@ func (e *SysFileDir) GetSysFileDir(c *gin.Context) { func (e *SysFileDir) InsertSysFileDir(c *gin.Context) { control := new(dto.SysFileDirControl) log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -120,10 +117,9 @@ func (e *SysFileDir) InsertSysFileDir(c *gin.Context) { func (e *SysFileDir) UpdateSysFileDir(c *gin.Context) { control := new(dto.SysFileDirControl) log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -158,10 +154,9 @@ func (e *SysFileDir) UpdateSysFileDir(c *gin.Context) { func (e *SysFileDir) DeleteSysFileDir(c *gin.Context) { control := new(dto.SysFileDirById) log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } diff --git a/app/admin/apis/sys_file/sys_file_info.go b/app/admin/apis/sys_file/sys_file_info.go index 088f0686..d9be4ed4 100644 --- a/app/admin/apis/sys_file/sys_file_info.go +++ b/app/admin/apis/sys_file/sys_file_info.go @@ -20,10 +20,9 @@ type SysFileInfo struct { func (e *SysFileInfo) GetSysFileInfoList(c *gin.Context) { log := e.GetLogger(c) search := new(dto.SysFileInfoSearch) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } err = c.ShouldBind(search) @@ -54,10 +53,9 @@ func (e *SysFileInfo) GetSysFileInfoList(c *gin.Context) { func (e *SysFileInfo) GetSysFileInfo(c *gin.Context) { control := new(dto.SysFileInfoById) log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -90,10 +88,9 @@ func (e *SysFileInfo) GetSysFileInfo(c *gin.Context) { func (e *SysFileInfo) InsertSysFileInfo(c *gin.Context) { control := new(dto.SysFileInfoControl) log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -129,10 +126,9 @@ func (e *SysFileInfo) InsertSysFileInfo(c *gin.Context) { func (e *SysFileInfo) UpdateSysFileInfo(c *gin.Context) { control := new(dto.SysFileInfoControl) log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -169,10 +165,9 @@ func (e *SysFileInfo) UpdateSysFileInfo(c *gin.Context) { func (e *SysFileInfo) DeleteSysFileInfo(c *gin.Context) { control := new(dto.SysFileInfoById) log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } diff --git a/app/admin/apis/sys_job/sys_job.go b/app/admin/apis/sys_job/sys_job.go index f5f30b4c..bb6351bb 100644 --- a/app/admin/apis/sys_job/sys_job.go +++ b/app/admin/apis/sys_job/sys_job.go @@ -20,8 +20,7 @@ func (e *SysJob) RemoveJobForService(c *gin.Context) { log := e.GetLogger(c) db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } var v dto.GeneralDelDto @@ -34,7 +33,7 @@ func (e *SysJob) RemoveJobForService(c *gin.Context) { s := service.SysJob{} s.Log = log s.Orm = db - s.Cron = global.Cfg.GetCrontabKey(c.Request.Host) + s.Cron = global.Runtime.GetCrontabKey(c.Request.Host) err = s.RemoveJob(&v) if err != nil { log.Errorf("RemoveJob error, %s", err.Error()) @@ -49,8 +48,7 @@ func (e *SysJob) StartJobForService(c *gin.Context) { log := e.GetLogger(c) db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } var v dto.GeneralGetDto @@ -63,7 +61,7 @@ func (e *SysJob) StartJobForService(c *gin.Context) { s := service.SysJob{} s.Orm = db s.Log = log - s.Cron = global.Cfg.GetCrontabKey(c.Request.Host) + s.Cron = global.Runtime.GetCrontabKey(c.Request.Host) err = s.StartJob(&v) if err != nil { log.Errorf("GetCrontabKey error, %s", err.Error()) diff --git a/app/admin/apis/sys_user/sys_user.go b/app/admin/apis/sys_user/sys_user.go index a31eb7a8..d2b0dd7c 100644 --- a/app/admin/apis/sys_user/sys_user.go +++ b/app/admin/apis/sys_user/sys_user.go @@ -31,10 +31,9 @@ type SysUser struct { func (e *SysUser) GetSysUserList(c *gin.Context) { log := e.GetLogger(c) d := new(dto.SysUserSearch) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -75,10 +74,9 @@ func (e *SysUser) GetSysUserList(c *gin.Context) { func (e *SysUser) GetSysUser(c *gin.Context) { log := e.GetLogger(c) control := new(dto.SysUserById) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -118,10 +116,9 @@ func (e *SysUser) GetSysUser(c *gin.Context) { func (e *SysUser) InsertSysUser(c *gin.Context) { log := e.GetLogger(c) control := new(dto.SysUserControl) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -167,10 +164,9 @@ func (e *SysUser) UpdateSysUser(c *gin.Context) { control := new(dto.SysUserControl) log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -214,10 +210,9 @@ func (e *SysUser) DeleteSysUser(c *gin.Context) { log := e.GetLogger(c) control := new(dto.SysUserById) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -263,10 +258,9 @@ func (e *SysUser) DeleteSysUser(c *gin.Context) { // @Router /api/v1/user/avatar [post] func (e *SysUser) InsetSysUserAvatar(c *gin.Context) { log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -314,10 +308,9 @@ func (e *SysUser) InsetSysUserAvatar(c *gin.Context) { // @Security Bearer func (e *SysUser) SysUserUpdatePwd(c *gin.Context) { log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -355,10 +348,9 @@ func (e *SysUser) SysUserUpdatePwd(c *gin.Context) { // @Security Bearer func (e *SysUser) GetSysUserProfile(c *gin.Context) { log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -416,10 +408,9 @@ func (e *SysUser) GetSysUserProfile(c *gin.Context) { func (e *SysUser) GetInfo(c *gin.Context) { log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } diff --git a/app/admin/apis/system/dict/sys_dict_data.go b/app/admin/apis/system/dict/sys_dict_data.go index 0c43882d..7489dc89 100644 --- a/app/admin/apis/system/dict/sys_dict_data.go +++ b/app/admin/apis/system/dict/sys_dict_data.go @@ -30,10 +30,9 @@ type SysDictData struct { // @Security Bearer func (e *SysDictData) GetSysDictDataList(c *gin.Context) { log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -71,10 +70,9 @@ func (e *SysDictData) GetSysDictDataList(c *gin.Context) { // @Security Bearer func (e *SysDictData) GetSysDictData(c *gin.Context) { log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -113,10 +111,9 @@ func (e *SysDictData) GetSysDictData(c *gin.Context) { // @Security Bearer func (e *SysDictData) InsertSysDictData(c *gin.Context) { log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -157,10 +154,9 @@ func (e *SysDictData) InsertSysDictData(c *gin.Context) { // @Security Bearer func (e *SysDictData) UpdateSysDictData(c *gin.Context) { log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -196,10 +192,9 @@ func (e *SysDictData) UpdateSysDictData(c *gin.Context) { // @Router /api/v1/dict/data/{dictCode} [delete] func (e *SysDictData) DeleteSysDictData(c *gin.Context) { log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -236,10 +231,9 @@ func (e *SysDictData) DeleteSysDictData(c *gin.Context) { func (e *SysDictData) GetSysDictDataAll(c *gin.Context) { log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } diff --git a/app/admin/apis/system/dict/sys_dict_type.go b/app/admin/apis/system/dict/sys_dict_type.go index 45dbdb2c..37a4a48a 100644 --- a/app/admin/apis/system/dict/sys_dict_type.go +++ b/app/admin/apis/system/dict/sys_dict_type.go @@ -30,10 +30,9 @@ type SysDictType struct { // @Security Bearer func (e *SysDictType) GetSysDictTypeList(c *gin.Context) { log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -69,10 +68,9 @@ func (e *SysDictType) GetSysDictTypeList(c *gin.Context) { // @Security Bearer func (e *SysDictType) GetSysDictType(c *gin.Context) { log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -109,10 +107,9 @@ func (e *SysDictType) GetSysDictType(c *gin.Context) { // @Security Bearer func (e *SysDictType) InsertSysDictType(c *gin.Context) { log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -152,10 +149,9 @@ func (e *SysDictType) InsertSysDictType(c *gin.Context) { // @Security Bearer func (e *SysDictType) UpdateSysDictType(c *gin.Context) { log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -189,10 +185,9 @@ func (e *SysDictType) UpdateSysDictType(c *gin.Context) { // @Router /api/v1/dict/type/{dictId} [delete] func (e *SysDictType) DeleteSysDictType(c *gin.Context) { log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -236,10 +231,9 @@ func (e *SysDictType) DeleteSysDictType(c *gin.Context) { // @Security Bearer func (e *SysDictType) GetSysDictTypeAll(c *gin.Context) { log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } diff --git a/app/admin/apis/system/settings.go b/app/admin/apis/system/settings.go index c5e887c1..ca133089 100644 --- a/app/admin/apis/system/settings.go +++ b/app/admin/apis/system/settings.go @@ -11,7 +11,6 @@ import ( "go-admin/app/admin/service" "go-admin/app/admin/service/dto" "go-admin/common/apis" - "go-admin/tools" ) type SysSetting struct { @@ -26,10 +25,9 @@ type SysSetting struct { // @Router /api/v1/setting [get] func (e *SysSetting) GetSetting(c *gin.Context) { log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -62,10 +60,9 @@ func (e *SysSetting) GetSetting(c *gin.Context) { func (e *SysSetting) CreateOrUpdateSetting(c *gin.Context) { control := new(dto.SysSettingControl) log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } diff --git a/app/admin/apis/system/sys_config/sys_config.go b/app/admin/apis/system/sys_config/sys_config.go index d23b73a6..37b0c318 100644 --- a/app/admin/apis/system/sys_config/sys_config.go +++ b/app/admin/apis/system/sys_config/sys_config.go @@ -19,10 +19,9 @@ type SysConfig struct { func (e *SysConfig) GetSysConfigList(c *gin.Context) { log := e.GetLogger(c) d := new(dto.SysConfigSearch) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("Orm获取失败, error:%s", err) - app.Error(c, 500, err, "Orm获取失败") + log.Error(err) return } @@ -51,11 +50,9 @@ func (e *SysConfig) GetSysConfigList(c *gin.Context) { func (e *SysConfig) GetSysConfig(c *gin.Context) { log := e.GetLogger(c) control := new(dto.SysConfigById) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - e.Error(c, http.StatusUnprocessableEntity, err, "Orm获取失败") - log.Errorf("Orm获取失败, error:%s", err) - app.Error(c, 500, err, "Orm获取失败") + log.Error(err) return } //查看详情 @@ -85,11 +82,9 @@ func (e *SysConfig) GetSysConfig(c *gin.Context) { func (e *SysConfig) InsertSysConfig(c *gin.Context) { log := e.GetLogger(c) control := new(dto.SysConfigControl) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - e.Error(c, http.StatusUnprocessableEntity, err, "Orm获取失败") - log.Errorf("Orm获取失败, error:%s", err) - app.Error(c, 500, err, "Orm获取失败") + log.Error(err) return } @@ -129,11 +124,9 @@ func (e *SysConfig) InsertSysConfig(c *gin.Context) { func (e *SysConfig) UpdateSysConfig(c *gin.Context) { log := e.GetLogger(c) control := new(dto.SysConfigControl) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - e.Error(c, http.StatusUnprocessableEntity, err, "Orm获取失败") - log.Errorf("Orm获取失败, error:%s", err) - app.Error(c, 500, err, "Orm获取失败") + log.Error(err) return } @@ -171,11 +164,9 @@ func (e *SysConfig) UpdateSysConfig(c *gin.Context) { func (e *SysConfig) DeleteSysConfig(c *gin.Context) { log := e.GetLogger(c) control := new(dto.SysConfigById) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - e.Error(c, http.StatusUnprocessableEntity, err, "Orm获取失败") - log.Errorf("Orm获取失败, error:%s", err) - app.Error(c, 500, err, "Orm获取失败") + log.Error(err) return } @@ -217,8 +208,7 @@ func (e *SysConfig) GetSysConfigByKEYForService(c *gin.Context) { log := e.GetLogger(c) db, err := e.GetOrm(c) if err != nil { - log.Errorf("error:%s", err) - app.Error(c, 500, err, "") + log.Error(err) return } var v dto.SysConfigControl diff --git a/app/admin/apis/system/sys_dept/sys_dept.go b/app/admin/apis/system/sys_dept/sys_dept.go index d1c6fd61..2ef15135 100644 --- a/app/admin/apis/system/sys_dept/sys_dept.go +++ b/app/admin/apis/system/sys_dept/sys_dept.go @@ -28,10 +28,9 @@ type SysDept struct { func (e *SysDept) GetSysDeptList(c *gin.Context) { log := e.GetLogger(c) d := new(dto.SysDeptSearch) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -66,10 +65,9 @@ func (e *SysDept) GetSysDeptList(c *gin.Context) { func (e *SysDept) GetSysDept(c *gin.Context) { log := e.GetLogger(c) control := new(dto.SysDeptById) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -106,10 +104,9 @@ func (e *SysDept) GetSysDept(c *gin.Context) { func (e *SysDept) InsertSysDept(c *gin.Context) { log := e.GetLogger(c) control := new(dto.SysDeptControl) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -154,10 +151,9 @@ func (e *SysDept) InsertSysDept(c *gin.Context) { func (e *SysDept) UpdateSysDept(c *gin.Context) { log := e.GetLogger(c) control := new(dto.SysDeptControl) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -195,10 +191,9 @@ func (e *SysDept) UpdateSysDept(c *gin.Context) { func (e *SysDept) DeleteSysDept(c *gin.Context) { log := e.GetLogger(c) control := new(dto.SysDeptById) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -226,10 +221,9 @@ func (e *SysDept) DeleteSysDept(c *gin.Context) { func (e *SysDept) GetDeptTree(c *gin.Context) { log := e.GetLogger(c) d := new(dto.SysDeptSearch) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } diff --git a/app/admin/apis/system/sys_login_log/sys_login_log.go b/app/admin/apis/system/sys_login_log/sys_login_log.go index 831a8cde..a60eda48 100644 --- a/app/admin/apis/system/sys_login_log/sys_login_log.go +++ b/app/admin/apis/system/sys_login_log/sys_login_log.go @@ -19,10 +19,9 @@ type SysLoginLog struct { func (e *SysLoginLog) GetSysLoginLogList(c *gin.Context) { log := e.GetLogger(c) d := new(dto.SysLoginLogSearch) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -50,10 +49,9 @@ func (e *SysLoginLog) GetSysLoginLogList(c *gin.Context) { func (e *SysLoginLog) GetSysLoginLog(c *gin.Context) { log := e.GetLogger(c) control := new(dto.SysLoginLogById) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -80,10 +78,9 @@ func (e *SysLoginLog) GetSysLoginLog(c *gin.Context) { func (e *SysLoginLog) InsertSysLoginLog(c *gin.Context) { log := e.GetLogger(c) control := new(dto.SysLoginLogControl) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -117,10 +114,9 @@ func (e *SysLoginLog) InsertSysLoginLog(c *gin.Context) { func (e *SysLoginLog) UpdateSysLoginLog(c *gin.Context) { log := e.GetLogger(c) control := new(dto.SysLoginLogControl) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -152,10 +148,9 @@ func (e *SysLoginLog) UpdateSysLoginLog(c *gin.Context) { func (e *SysLoginLog) DeleteSysLoginLog(c *gin.Context) { log := e.GetLogger(c) control := new(dto.SysLoginLogById) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } diff --git a/app/admin/apis/system/sys_menu/sys_menu.go b/app/admin/apis/system/sys_menu/sys_menu.go index 5d615730..d62c5d18 100644 --- a/app/admin/apis/system/sys_menu/sys_menu.go +++ b/app/admin/apis/system/sys_menu/sys_menu.go @@ -28,10 +28,9 @@ type SysMenu struct { func (e *SysMenu) GetSysMenuList(c *gin.Context) { log := e.GetLogger(c) d := new(dto.SysMenuSearch) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -68,10 +67,9 @@ func (e *SysMenu) GetSysMenu(c *gin.Context) { log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -115,10 +113,9 @@ func (e *SysMenu) InsertSysMenu(c *gin.Context) { log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -165,10 +162,9 @@ func (e *SysMenu) UpdateSysMenu(c *gin.Context) { log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -208,10 +204,9 @@ func (e *SysMenu) DeleteSysMenu(c *gin.Context) { log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -245,10 +240,9 @@ func (e *SysMenu) DeleteSysMenu(c *gin.Context) { // @Security Bearer func (e *SysMenu) GetMenuRole(c *gin.Context) { log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -275,10 +269,9 @@ func (e *SysMenu) GetMenuRole(c *gin.Context) { // @Security Bearer func (e *SysMenu) GetMenuIDS(c *gin.Context) { log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } var data models.RoleMenu @@ -331,10 +324,9 @@ func (e *SysMenu) GetMenuIDS(c *gin.Context) { // @Security Bearer func (e *SysMenu) GetMenuTreeSelect(c *gin.Context) { log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } diff --git a/app/admin/apis/system/sys_opera_log/sys_opera_log.go b/app/admin/apis/system/sys_opera_log/sys_opera_log.go index f9114cb7..fbf075a9 100644 --- a/app/admin/apis/system/sys_opera_log/sys_opera_log.go +++ b/app/admin/apis/system/sys_opera_log/sys_opera_log.go @@ -19,10 +19,9 @@ type SysOperaLog struct { func (e *SysOperaLog) GetSysOperaLogList(c *gin.Context) { log := e.GetLogger(c) d := new(dto.SysOperaLogSearch) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -50,10 +49,9 @@ func (e *SysOperaLog) GetSysOperaLogList(c *gin.Context) { func (e *SysOperaLog) GetSysOperaLog(c *gin.Context) { log := e.GetLogger(c) control := new(dto.SysOperaLogById) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -80,10 +78,9 @@ func (e *SysOperaLog) GetSysOperaLog(c *gin.Context) { func (e *SysOperaLog) InsertSysOperaLog(c *gin.Context) { log := e.GetLogger(c) control := new(dto.SysOperaLogControl) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -117,10 +114,9 @@ func (e *SysOperaLog) InsertSysOperaLog(c *gin.Context) { func (e *SysOperaLog) UpdateSysOperaLog(c *gin.Context) { log := e.GetLogger(c) control := new(dto.SysOperaLogControl) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -151,10 +147,9 @@ func (e *SysOperaLog) UpdateSysOperaLog(c *gin.Context) { func (e *SysOperaLog) DeleteSysOperaLog(c *gin.Context) { log := e.GetLogger(c) control := new(dto.SysOperaLogById) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } diff --git a/app/admin/apis/system/sys_post/sys_post.go b/app/admin/apis/system/sys_post/sys_post.go index 22a9fded..3fbb8f1a 100644 --- a/app/admin/apis/system/sys_post/sys_post.go +++ b/app/admin/apis/system/sys_post/sys_post.go @@ -29,10 +29,9 @@ type SysPost struct { func (e *SysPost) GetSysPostList(c *gin.Context) { log := e.GetLogger(c) d := new(dto.SysPostSearch) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -67,10 +66,9 @@ func (e *SysPost) GetSysPostList(c *gin.Context) { func (e *SysPost) GetSysPost(c *gin.Context) { log := e.GetLogger(c) control := new(dto.SysPostById) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -107,10 +105,9 @@ func (e *SysPost) GetSysPost(c *gin.Context) { func (e *SysPost) InsertSysPost(c *gin.Context) { log := e.GetLogger(c) control := new(dto.SysPostControl) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -154,10 +151,9 @@ func (e *SysPost) InsertSysPost(c *gin.Context) { func (e *SysPost) UpdateSysPost(c *gin.Context) { log := e.GetLogger(c) control := new(dto.SysPostControl) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -195,10 +191,9 @@ func (e *SysPost) UpdateSysPost(c *gin.Context) { func (e *SysPost) DeleteSysPost(c *gin.Context) { log := e.GetLogger(c) control := new(dto.SysPostById) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } diff --git a/app/admin/apis/system/sys_role/sys_role.go b/app/admin/apis/system/sys_role/sys_role.go index dd87fb54..3c614a3a 100644 --- a/app/admin/apis/system/sys_role/sys_role.go +++ b/app/admin/apis/system/sys_role/sys_role.go @@ -31,10 +31,9 @@ type SysRole struct { func (e *SysRole) GetSysRoleList(c *gin.Context) { log := e.GetLogger(c) d := new(dto.SysRoleSearch) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -70,10 +69,9 @@ func (e *SysRole) GetSysRoleList(c *gin.Context) { func (e *SysRole) GetSysRole(c *gin.Context) { log := e.GetLogger(c) control := new(dto.SysRoleById) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -110,10 +108,9 @@ func (e *SysRole) GetSysRole(c *gin.Context) { func (e *SysRole) InsertSysRole(c *gin.Context) { log := e.GetLogger(c) control := new(dto.SysRoleControl) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -164,10 +161,9 @@ func (e *SysRole) InsertSysRole(c *gin.Context) { func (e *SysRole) UpdateSysRole(c *gin.Context) { log := e.GetLogger(c) control := new(dto.SysRoleControl) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -211,10 +207,9 @@ func (e *SysRole) UpdateSysRole(c *gin.Context) { func (e *SysRole) DeleteSysRole(c *gin.Context) { log := e.GetLogger(c) control := new(dto.SysRoleById) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -246,10 +241,9 @@ func (e *SysRole) DeleteSysRole(c *gin.Context) { func (e *SysRole) UpdateRoleDataScope(c *gin.Context) { log := e.GetLogger(c) control := new(dto.RoleDataScopeReq) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } diff --git a/app/admin/middleware/permission.go b/app/admin/middleware/permission.go index ab16e0ae..d21b9865 100644 --- a/app/admin/middleware/permission.go +++ b/app/admin/middleware/permission.go @@ -17,7 +17,7 @@ func AuthCheckRole() gin.HandlerFunc { log := logger.GetRequestLogger(c) data, _ := c.Get(jwtauth.JwtPayloadKey) v := data.(jwtauth.MapClaims) - e := global.Cfg.GetCasbinKey(c.Request.Host) + e := global.Runtime.GetCasbinKey(c.Request.Host) var res bool var err error //检查权限 diff --git a/app/admin/router/init_router.go b/app/admin/router/init_router.go index 80924d0b..212ee778 100644 --- a/app/admin/router/init_router.go +++ b/app/admin/router/init_router.go @@ -18,10 +18,10 @@ import ( // InitRouter 路由初始化,不要怀疑,这里用到了 func InitRouter() { var r *gin.Engine - h := global.Cfg.GetEngine() + h := global.Runtime.GetEngine() if h == nil { h = gin.New() - global.Cfg.SetEngine(h) + global.Runtime.SetEngine(h) } switch h.(type) { case *gin.Engine: diff --git a/app/admin/router/monitor.go b/app/admin/router/monitor.go index 01b66b79..d37fbf3a 100644 --- a/app/admin/router/monitor.go +++ b/app/admin/router/monitor.go @@ -13,10 +13,10 @@ import ( func Monitor() { var r *gin.Engine - h := global.Cfg.GetEngine() + h := global.Runtime.GetEngine() if h == nil { h = gin.New() - global.Cfg.SetEngine(h) + global.Runtime.SetEngine(h) } switch h.(type) { case *gin.Engine: diff --git a/app/jobs/jobbase.go b/app/jobs/jobbase.go index 50d03be7..a5a85404 100644 --- a/app/jobs/jobbase.go +++ b/app/jobs/jobbase.go @@ -101,13 +101,13 @@ func Setup(dbs map[string]*gorm.DB) { fmt.Println(time.Now().Format(timeFormat), " [INFO] JobCore Starting...") for k, db := range dbs { - global.Cfg.SetCrontab(k, cronjob.NewWithSeconds()) + global.Runtime.SetCrontab(k, cronjob.NewWithSeconds()) setup(k, db) } } func setup(key string, db *gorm.DB) { - crontab := global.Cfg.GetCrontabKey(key) + crontab := global.Runtime.GetCrontabKey(key) sysJob := models.SysJob{} jobList := make([]models.SysJob, 0) err := sysJob.GetList(db, &jobList) diff --git a/cmd/api/server.go b/cmd/api/server.go index 8f0129d0..323231e4 100644 --- a/cmd/api/server.go +++ b/cmd/api/server.go @@ -53,7 +53,7 @@ func setup() { config.Setup(file.NewSource, file.WithPath(configYml)) go config.Watch() //2. 设置日志 - global.Cfg.SetLogger( + global.Runtime.SetLogger( logger.SetupLogger( config.LoggerConfig.Type, config.LoggerConfig.Path, @@ -72,7 +72,7 @@ func run() error { if config.ApplicationConfig.Mode == tools.ModeProd.String() { gin.SetMode(gin.ReleaseMode) } - engine := global.Cfg.GetEngine() + engine := global.Runtime.GetEngine() if engine == nil { engine = gin.New() } @@ -88,11 +88,11 @@ func run() error { srv := &http.Server{ Addr: fmt.Sprintf("%s:%d", config.ApplicationConfig.Host, config.ApplicationConfig.Port), - Handler: global.Cfg.GetEngine(), + Handler: global.Runtime.GetEngine(), } go func() { jobs.InitJob() - jobs.Setup(global.Cfg.GetDb()) + jobs.Setup(global.Runtime.GetDb()) }() diff --git a/cmd/migrate/migration/version/1599190683659_tables.go b/cmd/migrate/migration/version/1599190683659_tables.go index a453d3c1..4ee92d37 100644 --- a/cmd/migrate/migration/version/1599190683659_tables.go +++ b/cmd/migrate/migration/version/1599190683659_tables.go @@ -1,3 +1,5 @@ +// +build ignore + package version import ( diff --git a/cmd/migrate/migration/version/1599190683670_migrate.go b/cmd/migrate/migration/version/1599190683670_migrate.go index 0d7444d9..18394e80 100644 --- a/cmd/migrate/migration/version/1599190683670_migrate.go +++ b/cmd/migrate/migration/version/1599190683670_migrate.go @@ -1,3 +1,5 @@ +// +build ignore + package version import ( @@ -181,4 +183,4 @@ func _1599190683670Test(db *gorm.DB, version string) error { Version: version, }).Error }) -} \ No newline at end of file +} diff --git a/cmd/migrate/migration/version/1599190683680_migrate.go b/cmd/migrate/migration/version/1599190683680_migrate.go index 8a5c5a37..99480c71 100644 --- a/cmd/migrate/migration/version/1599190683680_migrate.go +++ b/cmd/migrate/migration/version/1599190683680_migrate.go @@ -1,3 +1,5 @@ +// +build ignore + package version import ( diff --git a/cmd/migrate/migration/version/1600089797118_migrate.go b/cmd/migrate/migration/version/1600089797118_migrate.go index 12b603ba..774af0ee 100644 --- a/cmd/migrate/migration/version/1600089797118_migrate.go +++ b/cmd/migrate/migration/version/1600089797118_migrate.go @@ -1,3 +1,5 @@ +// +build ignore + package version import ( diff --git a/cmd/migrate/migration/version/1602644950000_migrate.go b/cmd/migrate/migration/version/1602644950000_migrate.go index 8a7ca0b9..e9984401 100644 --- a/cmd/migrate/migration/version/1602644950000_migrate.go +++ b/cmd/migrate/migration/version/1602644950000_migrate.go @@ -1,3 +1,5 @@ +// +build ignore + package version import ( diff --git a/cmd/migrate/migration/version/1603465014697_migrate.go b/cmd/migrate/migration/version/1603465014697_migrate.go index 63aed144..82236fe1 100644 --- a/cmd/migrate/migration/version/1603465014697_migrate.go +++ b/cmd/migrate/migration/version/1603465014697_migrate.go @@ -1,3 +1,5 @@ +// +build ignore + package version import ( diff --git a/cmd/migrate/migration/version/1603516925109_migrate.go b/cmd/migrate/migration/version/1603516925109_migrate.go index f2539cfb..043abf07 100644 --- a/cmd/migrate/migration/version/1603516925109_migrate.go +++ b/cmd/migrate/migration/version/1603516925109_migrate.go @@ -1,3 +1,5 @@ +// +build ignore + package version import ( diff --git a/cmd/migrate/migration/version/1606579402398_migrate.go b/cmd/migrate/migration/version/1606579402398_migrate.go index 0e5c5226..2dfee83a 100644 --- a/cmd/migrate/migration/version/1606579402398_migrate.go +++ b/cmd/migrate/migration/version/1606579402398_migrate.go @@ -1,3 +1,5 @@ +// +build ignore + package version import ( diff --git a/cmd/migrate/migration/version/1606582844753_migrate.go b/cmd/migrate/migration/version/1606582844753_migrate.go index 9245a9d3..ed444a54 100644 --- a/cmd/migrate/migration/version/1606582844753_migrate.go +++ b/cmd/migrate/migration/version/1606582844753_migrate.go @@ -1,3 +1,5 @@ +// +build ignore + package version import ( diff --git a/cmd/migrate/migration/version/1610427732413_migrate.go b/cmd/migrate/migration/version/1610427732413_migrate.go index 83fc1c60..c98142ad 100644 --- a/cmd/migrate/migration/version/1610427732413_migrate.go +++ b/cmd/migrate/migration/version/1610427732413_migrate.go @@ -1,3 +1,5 @@ +// +build ignore + package version import ( diff --git a/cmd/migrate/migration/version/1610804233204_migrate.go b/cmd/migrate/migration/version/1610804233204_migrate.go index 390515bd..a8884f2f 100644 --- a/cmd/migrate/migration/version/1610804233204_migrate.go +++ b/cmd/migrate/migration/version/1610804233204_migrate.go @@ -1,3 +1,5 @@ +// +build ignore + package version import ( diff --git a/cmd/migrate/migration/version/1613638159444_migrate.go b/cmd/migrate/migration/version/1613638159444_migrate.go index 9a0c4faf..26aa8190 100644 --- a/cmd/migrate/migration/version/1613638159444_migrate.go +++ b/cmd/migrate/migration/version/1613638159444_migrate.go @@ -1,3 +1,5 @@ +// +build ignore + package version import ( diff --git a/cmd/migrate/migration/version/1613697961697_migrate.go b/cmd/migrate/migration/version/1613697961697_migrate.go index 9e52af8c..24a88ca3 100644 --- a/cmd/migrate/migration/version/1613697961697_migrate.go +++ b/cmd/migrate/migration/version/1613697961697_migrate.go @@ -1,3 +1,5 @@ +// +build ignore + package version import ( diff --git a/cmd/migrate/migration/version/1613720892819_migrate.go b/cmd/migrate/migration/version/1613720892819_migrate.go index dc7ef431..13b436bb 100644 --- a/cmd/migrate/migration/version/1613720892819_migrate.go +++ b/cmd/migrate/migration/version/1613720892819_migrate.go @@ -1,3 +1,5 @@ +// +build ignore + package version import ( diff --git a/cmd/migrate/migration/version/1613783303115_migrate.go b/cmd/migrate/migration/version/1613783303115_migrate.go index 02f88c0e..735cfed7 100644 --- a/cmd/migrate/migration/version/1613783303115_migrate.go +++ b/cmd/migrate/migration/version/1613783303115_migrate.go @@ -1,3 +1,5 @@ +// +build ignore + package version import ( diff --git a/cmd/migrate/migration/version/1613978564961_migrate.go b/cmd/migrate/migration/version/1613978564961_migrate.go index 79e1c988..c0b8c29b 100644 --- a/cmd/migrate/migration/version/1613978564961_migrate.go +++ b/cmd/migrate/migration/version/1613978564961_migrate.go @@ -1,3 +1,5 @@ +// +build ignore + package version import ( @@ -18,7 +20,7 @@ func init() { func _1613978564961Test(db *gorm.DB, version string) error { return db.Transaction(func(tx *gorm.DB) error { - // TODO: 这里开始写入要变更的内容 + // TODO: 这里开始写入要变更的内容 menu := models.Menu{MenuId: 110, Path: "/api/v1/config"} err := tx.Model(&menu).Where("menu_id = ?", 110).Update("Path", "/api/v1/dict/data-all").Error if err != nil { diff --git a/cmd/migrate/migration/version/1613998164781_migrate.go b/cmd/migrate/migration/version/1613998164781_migrate.go index 4e201cd8..7af1d2a5 100644 --- a/cmd/migrate/migration/version/1613998164781_migrate.go +++ b/cmd/migrate/migration/version/1613998164781_migrate.go @@ -1,3 +1,5 @@ +// +build ignore + package version import ( diff --git a/cmd/migrate/migration/version/1614073723691_migrate.go b/cmd/migrate/migration/version/1614073723691_migrate.go index 08a6534b..32064263 100644 --- a/cmd/migrate/migration/version/1614073723691_migrate.go +++ b/cmd/migrate/migration/version/1614073723691_migrate.go @@ -1,3 +1,5 @@ +// +build ignore + package version import ( @@ -18,7 +20,7 @@ func init() { func _1614073723691Test(db *gorm.DB, version string) error { return db.Transaction(func(tx *gorm.DB) error { - // TODO: 这里开始写入要变更的内容 + // TODO: 这里开始写入要变更的内容 err := tx.Model(&models.Menu{}).Where("path = ?", "/api/v1/syscontentList").Update("path", "/api/v1/syscontent").Error if err != nil { diff --git a/cmd/migrate/migration/version/1614159531111_migrate.go b/cmd/migrate/migration/version/1614159531111_migrate.go index e9e191d9..bb2eb526 100644 --- a/cmd/migrate/migration/version/1614159531111_migrate.go +++ b/cmd/migrate/migration/version/1614159531111_migrate.go @@ -1,3 +1,5 @@ +// +build ignore + package version import ( diff --git a/cmd/migrate/migration/version/1614604763713_migrate.go b/cmd/migrate/migration/version/1614604763713_migrate.go index 631851ce..cc70ae3a 100644 --- a/cmd/migrate/migration/version/1614604763713_migrate.go +++ b/cmd/migrate/migration/version/1614604763713_migrate.go @@ -1,3 +1,5 @@ +// +build ignore + package version import ( diff --git a/cmd/migrate/server.go b/cmd/migrate/server.go index adc8f780..738bf94d 100644 --- a/cmd/migrate/server.go +++ b/cmd/migrate/server.go @@ -36,6 +36,7 @@ var ( } ) +// fixme 在您看不见代码的时候运行迁移,我觉得是不安全的,所以编译后将不包含所有迁移文件 func init() { StartCmd.PersistentFlags().StringVarP(&configYml, "config", "c", "config/settings.yml", "Start server with provided configuration file") StartCmd.PersistentFlags().BoolVarP(&generate, "generate", "g", false, "generate migration file") @@ -50,7 +51,7 @@ func run() { //1. 读取配置 config.Setup(file.NewSource, file.WithPath(configYml)) //2. 设置日志 - global.Cfg.SetLogger( + global.Runtime.SetLogger( logger.SetupLogger( config.LoggerConfig.Type, config.LoggerConfig.Path, @@ -67,7 +68,7 @@ func migrateModel() error { if host == "" { host = "*" } - db := global.Cfg.GetDbByKey(host) + db := global.Runtime.GetDbByKey(host) if config.DatabasesConfig[host].Driver == "mysql" { //初始化数据库时候用 db.Set("gorm:table_options", "ENGINE=InnoDB CHARSET=utf8mb4") diff --git a/common/apis/api.go b/common/apis/api.go index ffb6406b..6e43b5c8 100644 --- a/common/apis/api.go +++ b/common/apis/api.go @@ -22,7 +22,12 @@ func (e *Api) GetLogger(c *gin.Context) logger.Logger { // GetOrm 获取Orm DB func (e *Api) GetOrm(c *gin.Context) (*gorm.DB, error) { - return tools.GetOrm(c) + db, err := tools.GetOrm(c) + if err != nil { + e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + return nil, err + } + return db, nil } // Error 通常错误数据处理 diff --git a/common/config/config.go b/common/config/config.go deleted file mode 100644 index a5af0c93..00000000 --- a/common/config/config.go +++ /dev/null @@ -1,94 +0,0 @@ -package config - -import ( - "net/http" - - "github.com/casbin/casbin/v2" - "github.com/go-admin-team/go-admin-core/logger" - "github.com/robfig/cron/v3" - "gorm.io/gorm" -) - -type Config struct { - dbs map[string]*gorm.DB - casbins map[string]*casbin.SyncedEnforcer - engine http.Handler - crontab map[string]*cron.Cron -} - -// SetDb 设置对应key的db -func (c *Config) SetDb(key string, db *gorm.DB) { - c.dbs[key] = db -} - -// GetDb 获取所有map里的db数据 -func (c *Config) GetDb() map[string]*gorm.DB { - return c.dbs -} - -// GetDbByKey 根据key获取db -func (c *Config) GetDbByKey(key string) *gorm.DB { - if db, ok := c.dbs["*"]; ok { - return db - } - return c.dbs[key] -} - -func (c *Config) SetCasbin(key string, enforcer *casbin.SyncedEnforcer) { - c.casbins[key] = enforcer -} - -// GetCasbinKey 根据key获取casbin -func (c *Config) GetCasbinKey(key string) *casbin.SyncedEnforcer { - if e, ok := c.casbins["*"]; ok { - return e - } - return c.casbins[key] -} - -// SetEngine 设置路由引擎 -func (c *Config) SetEngine(engine http.Handler) { - c.engine = engine -} - -// GetEngine 获取路由引擎 -func (c *Config) GetEngine() http.Handler { - return c.engine -} - -// SetLogger 设置日志组件 -func (c *Config) SetLogger(l logger.Logger) { - logger.DefaultLogger = l -} - -// GetLogger 获取日志组件 -func (c *Config) GetLogger() logger.Logger { - return logger.DefaultLogger -} - -// NewConfig 默认值 -func NewConfig() *Config { - return &Config{ - dbs: make(map[string]*gorm.DB), - casbins: make(map[string]*casbin.SyncedEnforcer), - crontab: make(map[string]*cron.Cron), - } -} - -// SetCrontab 设置对应key的crontab -func (c *Config) SetCrontab(key string, crontab *cron.Cron) { - c.crontab[key] = crontab -} - -// GetCrontab 获取所有map里的crontab数据 -func (c *Config) GetCrontab() map[string]*cron.Cron { - return c.crontab -} - -// GetCrontabKey 根据key获取crontab -func (c *Config) GetCrontabKey(key string) *cron.Cron { - if e, ok := c.crontab["*"]; ok { - return e - } - return c.crontab[key] -} diff --git a/common/config/type.go b/common/config/type.go deleted file mode 100644 index 726c7f5b..00000000 --- a/common/config/type.go +++ /dev/null @@ -1,33 +0,0 @@ -package config - -import ( - "github.com/casbin/casbin/v2" - "github.com/robfig/cron/v3" - "net/http" - - "github.com/go-admin-team/go-admin-core/logger" - "gorm.io/gorm" -) - -type Conf interface { - //多db设置,⚠️SetDbs不允许并发,可以根据自己的业务,例如app分库、host分库 - SetDb(key string, db *gorm.DB) - GetDb() map[string]*gorm.DB - GetDbByKey(key string) *gorm.DB - - SetCasbin(key string, enforcer *casbin.SyncedEnforcer) - GetCasbinKey(key string) *casbin.SyncedEnforcer - - //使用的路由 - SetEngine(engine http.Handler) - GetEngine() http.Handler - - //使用go-admin定义的logger,参考来源go-micro - SetLogger(logger logger.Logger) - GetLogger() logger.Logger - - //crontab - SetCrontab(key string, crontab *cron.Cron) - GetCrontab() map[string]*cron.Cron - GetCrontabKey(key string) *cron.Cron -} diff --git a/common/database/initialize.go b/common/database/initialize.go index 0164abb4..fc5ad94d 100644 --- a/common/database/initialize.go +++ b/common/database/initialize.go @@ -65,6 +65,6 @@ func setupSimpleDatabase(host string, c *toolsConfig.Database) { // global.Eloquent = db //} - global.Cfg.SetDb(host, db) - global.Cfg.SetCasbin(host, e) + global.Runtime.SetDb(host, db) + global.Runtime.SetCasbin(host, e) } diff --git a/common/global/adm.go b/common/global/adm.go index e5ef2b3a..caf2222c 100644 --- a/common/global/adm.go +++ b/common/global/adm.go @@ -1,7 +1,7 @@ package global import ( - "go-admin/common/config" + "github.com/go-admin-team/go-admin-core/tools/runtime" ) const ( @@ -9,7 +9,7 @@ const ( Version = "1.2.3" ) -var Cfg config.Conf = config.NewConfig() +var Runtime runtime.Runtime = runtime.NewConfig() var ( Source string diff --git a/common/global/casbin.go b/common/global/casbin.go index f10d9df5..71ff513c 100644 --- a/common/global/casbin.go +++ b/common/global/casbin.go @@ -2,18 +2,16 @@ package global import ( "github.com/casbin/casbin/v2" - "github.com/casbin/casbin/v2/log" "github.com/gin-gonic/gin" - - "go-admin/tools" + "go-admin/pkg/logger" ) func LoadPolicy(c *gin.Context) (*casbin.SyncedEnforcer, error) { - if err := Cfg.GetCasbinKey(c.Request.Host).LoadPolicy(); err == nil { - return Cfg.GetCasbinKey(c.Request.Host), err + log := logger.GetRequestLogger(c) + if err := Runtime.GetCasbinKey(c.Request.Host).LoadPolicy(); err == nil { + return Runtime.GetCasbinKey(c.Request.Host), err } else { - msgID := tools.GenerateMsgIDFromContext(c) - log.LogPrintf("msgID[%s] casbin rbac_model or policy init error, message: %v \r\n", msgID, err.Error()) + log.Errorf("casbin rbac_model or policy init error, %s ", err.Error()) return nil, err } } diff --git a/common/middleware/db.go b/common/middleware/db.go index f2d3f895..db7625cc 100644 --- a/common/middleware/db.go +++ b/common/middleware/db.go @@ -7,6 +7,6 @@ import ( ) func WithContextDb(c *gin.Context) { - c.Set("db", global.Cfg.GetDbByKey(c.Request.Host)) + c.Set("db", global.Runtime.GetDbByKey(c.Request.Host)) c.Next() } diff --git a/examples/run.go b/examples/run.go index 39330c41..858435ad 100644 --- a/examples/run.go +++ b/examples/run.go @@ -19,10 +19,10 @@ func main() { panic(err) } syncEnforce := myCasbin.Setup(db, "sys_") - global.Cfg.SetDb("*", db) - global.Cfg.SetCasbin("*", syncEnforce) + global.Runtime.SetDb("*", db) + global.Runtime.SetCasbin("*", syncEnforce) e := gin.Default() - global.Cfg.SetEngine(e) + global.Runtime.SetEngine(e) log.Fatal(e.Run(":8000")) } diff --git a/go.mod b/go.mod index 3b2d3db3..3d9a5deb 100644 --- a/go.mod +++ b/go.mod @@ -6,11 +6,11 @@ require ( github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 github.com/alibaba/sentinel-golang v0.6.1 github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5 - github.com/casbin/casbin/v2 v2.11.2 + github.com/casbin/casbin/v2 v2.24.0 github.com/casbin/gorm-adapter/v3 v3.0.2 github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/gin-gonic/gin v1.6.3 - github.com/go-admin-team/go-admin-core v1.2.3-0.20210304081332-24763d77c51b + github.com/go-admin-team/go-admin-core v1.2.3-0.20210305034835-b289a9f0f173 github.com/go-admin-team/go-admin-core/plugins/logger/zap v0.0.0-20210304081332-24763d77c51b github.com/go-redis/redis/v7 v7.4.0 github.com/google/uuid v1.1.2 diff --git a/go.sum b/go.sum index d17539f1..f0605d4d 100644 --- a/go.sum +++ b/go.sum @@ -87,8 +87,8 @@ github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7 github.com/bwmarrin/discordgo v0.20.2/go.mod h1:O9S4p+ofTFwB02em7jkpkV8M3R0/PUVOwN61zSZ0r4Q= github.com/caddyserver/certmagic v0.10.6/go.mod h1:Y8jcUBctgk/IhpAzlHKfimZNyXCkfGgRTC0orl8gROQ= github.com/casbin/casbin/v2 v2.2.2/go.mod h1:XXtYGrs/0zlOsJMeRteEdVi/FsB0ph7KgNfjoCoJUD8= -github.com/casbin/casbin/v2 v2.11.2 h1:kdJ3ZMfPtz6uzKwAaW4G4NIld0U2KeHrgFcEhi40evc= -github.com/casbin/casbin/v2 v2.11.2/go.mod h1:XXtYGrs/0zlOsJMeRteEdVi/FsB0ph7KgNfjoCoJUD8= +github.com/casbin/casbin/v2 v2.24.0 h1:peiFTw+PNpAMSz7hDDz768nEwzUsBMMZNV4yFGCayI8= +github.com/casbin/casbin/v2 v2.24.0/go.mod h1:wUgota0cQbTXE6Vd+KWpg41726jFRi7upxio0sR+Xd0= github.com/casbin/gorm-adapter/v3 v3.0.2 h1:4F2VFElwPyFzvHfgwizD2JQxk2OFLwvRFZct1np0yBg= github.com/casbin/gorm-adapter/v3 v3.0.2/go.mod h1:mQI09sqvXfy5p6kZB5HBzZrgKWwxaJ4xMWpd5OGfHRY= github.com/cenkalti/backoff/v4 v4.0.0/go.mod h1:eEew/i+1Q6OrCDZh3WiXYv3+nJwBASZ8Bog/87DQnVg= @@ -179,8 +179,8 @@ github.com/git-chglog/git-chglog v0.0.0-20190611050339-63a4e637021f/go.mod h1:Dc github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= github.com/go-acme/lego/v3 v3.4.0/go.mod h1:xYbLDuxq3Hy4bMUT1t9JIuz6GWIWb3m5X+TeTHYaT7M= github.com/go-admin-team/go-admin-core v1.2.3-0.20210225031955-e373f5bcdf3f/go.mod h1:hNfmIFc75XLFdfWGeGV1ted94FGnozbKfXXVLTDJKMM= -github.com/go-admin-team/go-admin-core v1.2.3-0.20210304081332-24763d77c51b h1:b7aUd7Hztcl/yLCWoxGT5lvmJZmU7ntdTFWzbeJcSGY= -github.com/go-admin-team/go-admin-core v1.2.3-0.20210304081332-24763d77c51b/go.mod h1:hNfmIFc75XLFdfWGeGV1ted94FGnozbKfXXVLTDJKMM= +github.com/go-admin-team/go-admin-core v1.2.3-0.20210305034835-b289a9f0f173 h1:7N87rJTMylXxO+hI1khNTlwRFcuUbO2R+OXanyZ+2rY= +github.com/go-admin-team/go-admin-core v1.2.3-0.20210305034835-b289a9f0f173/go.mod h1:ovPTQZXwSsq8Hd/brQsPPD/vwL7/altQa+l+78AJjhE= github.com/go-admin-team/go-admin-core/plugins/logger/zap v0.0.0-20210304081332-24763d77c51b h1:weBy1iEvCNnowYIRvy66eFNaroZv8jB9G4bCNHWqklc= github.com/go-admin-team/go-admin-core/plugins/logger/zap v0.0.0-20210304081332-24763d77c51b/go.mod h1:U4GEXHDPRUv6Z5OQWzdkwrIZUZ8JIpWPPfyYsUICXWo= github.com/go-cmd/cmd v1.0.5/go.mod h1:y8q8qlK5wQibcw63djSl/ntiHUHXHGdCkPk0j4QeW4s= @@ -252,6 +252,8 @@ github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4er github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= +github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc= +github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.0/go.mod h1:Qd/q+1AKNOZr9uGQzbzCmRO6sUih6GTPZv6a1/R87v0= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -656,8 +658,9 @@ github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/swaggo/files v0.0.0-20190704085106-630677cd5c14/go.mod h1:gxQT6pBGRuIGunNf/+tSOB5OHvguWi8Tbt82WOkf35E= github.com/swaggo/gin-swagger v1.2.0 h1:YskZXEiv51fjOMTsXrOetAjrMDfFaXD79PEoQBOe2W0= github.com/swaggo/gin-swagger v1.2.0/go.mod h1:qlH2+W7zXGZkczuL+r2nEBR2JTT+/lX05Nn6vPhc7OI= @@ -1002,6 +1005,8 @@ gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/mysql v0.3.0/go.mod h1:A7H1JD9dKdcjeUTpTuWKEC+E1a74qzW7/zaXqKaTbfM= gorm.io/driver/mysql v1.0.3/go.mod h1:twGxftLBlFgNVNakL7F+P/x9oYqoymG3YYT8cAfI9oI= gorm.io/driver/mysql v1.0.4-0.20201206014609-ae5fd10184f6 h1:GTZ4w9Fx9LTCtaUq7RDX6a1PSmo7BEwD3H1A8n365YI= diff --git a/pkg/casbin/log.go b/pkg/casbin/log.go index f536ecbf..6498c24d 100644 --- a/pkg/casbin/log.go +++ b/pkg/casbin/log.go @@ -11,6 +11,7 @@ type Logger struct { enable int32 } +// EnableLog controls whether print the message. func (l *Logger) EnableLog(enable bool) { i := 0 if enable { @@ -19,18 +20,57 @@ func (l *Logger) EnableLog(enable bool) { atomic.StoreInt32(&(l.enable), int32(i)) } +// IsEnabled returns if logger is enabled. func (l *Logger) IsEnabled() bool { return atomic.LoadInt32(&(l.enable)) != 0 } -func (l *Logger) Print(v ...interface{}) { - if l.IsEnabled() { - logger.DefaultLogger.Log(logger.InfoLevel, v...) +// LogModel log info related to model. +func (l *Logger) LogModel(model [][]string) { + var str string + for i := range model { + for j := range model[i] { + str += " " + model[i][j] + } + str += "\n" } + logger.DefaultLogger.Log(logger.InfoLevel, str) } -func (l *Logger) Printf(format string, v ...interface{}) { - if l.IsEnabled() { - logger.DefaultLogger.Logf(logger.InfoLevel, format, v...) - } +// LogEnforce log info related to enforce. +func (l *Logger) LogEnforce(matcher string, request []interface{}, result bool, explains [][]string) { + logger.DefaultLogger.Fields(map[string]interface{}{ + "matcher": matcher, + "request": request, + "result": result, + "explains": explains, + }).Log(logger.InfoLevel, nil) } + +// LogRole log info related to role. +func (l *Logger) LogRole(roles []string) { + logger.DefaultLogger.Fields(map[string]interface{}{ + "roles": roles, + }) +} + +// LogPolicy log info related to policy. +func (l *Logger) LogPolicy(policy map[string][][]string) { + data := make(map[string]interface{}, len(policy)) + for k := range policy { + data[k] = policy[k] + } + logger.DefaultLogger.Fields(data).Log(logger.InfoLevel, nil) +} + +//func (l *Logger) Print(v ...interface{}) { +// if l.IsEnabled() { +// logger.DefaultLogger.Log(logger.InfoLevel, v...) +// } +//} +// +//func (l *Logger) Printf(format string, v ...interface{}) { +// if l.IsEnabled() { +// logger.DefaultLogger.Logf(logger.InfoLevel, format, v...) +// } +//} diff --git a/template/migrate.template b/template/migrate.template index f30de78a..eb453b8a 100644 --- a/template/migrate.template +++ b/template/migrate.template @@ -1,3 +1,5 @@ +// +build ignore + package {{.Package}} import ( diff --git a/template/v4/no_actions/apis.go.template b/template/v4/no_actions/apis.go.template index 7f1853f6..f689c926 100644 --- a/template/v4/no_actions/apis.go.template +++ b/template/v4/no_actions/apis.go.template @@ -18,10 +18,9 @@ type {{.ClassName}} struct { func (e *{{.ClassName}}) Get{{.ClassName}}List(c *gin.Context) { log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -54,10 +53,9 @@ func (e *{{.ClassName}}) Get{{.ClassName}}List(c *gin.Context) { func (e *{{.ClassName}}) Get{{.ClassName}}(c *gin.Context) { log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -90,10 +88,9 @@ func (e *{{.ClassName}}) Get{{.ClassName}}(c *gin.Context) { func (e *{{.ClassName}}) Insert{{.ClassName}}(c *gin.Context) { log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -130,10 +127,9 @@ func (e *{{.ClassName}}) Insert{{.ClassName}}(c *gin.Context) { func (e *{{.ClassName}}) Update{{.ClassName}}(c *gin.Context) { log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } @@ -171,10 +167,9 @@ func (e *{{.ClassName}}) Update{{.ClassName}}(c *gin.Context) { func (e *{{.ClassName}}) Delete{{.ClassName}}(c *gin.Context) { log := e.GetLogger(c) - db, err := tools.GetOrm(c) + db, err := e.GetOrm(c) if err != nil { - log.Errorf("get db connection error, %s", err.Error()) - e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败") + log.Error(err) return } diff --git a/tools/utils.go b/tools/utils.go index 01b735e6..439cb2c9 100644 --- a/tools/utils.go +++ b/tools/utils.go @@ -2,7 +2,6 @@ package tools import ( "errors" - "fmt" "log" "runtime" "strconv" @@ -70,16 +69,15 @@ func GenerateMsgIDFromContext(c *gin.Context) string { // GetOrm 获取orm连接 func GetOrm(c *gin.Context) (*gorm.DB, error) { - msgID := GenerateMsgIDFromContext(c) idb, exist := c.Get("db") if !exist { - return nil, errors.New(fmt.Sprintf("msgID[%s], db connect not exist", msgID)) + return nil, errors.New("db connect not exist") } switch idb.(type) { case *gorm.DB: //新增操作 return idb.(*gorm.DB), nil default: - return nil, errors.New(fmt.Sprintf("msgID[%s], db connect not exist", msgID)) + return nil, errors.New("db connect not exist") } }