diff --git a/README.md b/README.md index 0194654..adc81f2 100644 --- a/README.md +++ b/README.md @@ -142,7 +142,7 @@ env GOOS=linux GOARCH=amd64 go build main.go ``` -## 🔗 在线体验 +## 🎬 在线体验 > admin / 123456 演示地址:[http://www.zhangwj.com](http://www.zhangwj.com/#/login) @@ -184,13 +184,13 @@ env GOOS=linux GOARCH=amd64 go build main.go 微信 - QQ群号:74520518(已满) - QQ群号:521386980 + go-admin技术交流甲号已满 + go-admin技术交流乙号 -go-admin技术交流甲号已满 -go-admin技术交流乙号 + + ## 🤝 特别感谢 [chengxiao](https://github.com/chengxiao) @@ -203,12 +203,12 @@ env GOOS=linux GOARCH=amd64 go build main.go [vue-element-admin](https://github.com/PanJiaChen/vue-element-admin) [ruoyi-vue](https://gitee.com/y_project/RuoYi-Vue) -## License +## 🔑 License [MIT](https://github.com/wenjianzhang/go-admin/blob/master/LICENSE.md) Copyright (c) 2020 wenjianzhang -## 赞助者 +## ❤️ 赞助者 zhuqiyun \ No newline at end of file diff --git a/apis/apis.go b/apis/apis.go deleted file mode 100644 index 7b272ed..0000000 --- a/apis/apis.go +++ /dev/null @@ -1 +0,0 @@ -package apis diff --git a/apis/captcha.go b/apis/captcha.go deleted file mode 100644 index 8978b1c..0000000 --- a/apis/captcha.go +++ /dev/null @@ -1,41 +0,0 @@ -package apis - -import ( - "github.com/gin-gonic/gin" - "github.com/google/uuid" - "github.com/mojocn/base64Captcha" - "net/http" -) - -//configJsonBody json request body. -type configJsonBody struct { - Id string - CaptchaType string - VerifyValue string - DriverAudio *base64Captcha.DriverAudio - DriverString *base64Captcha.DriverString - DriverChinese *base64Captcha.DriverChinese - DriverMath *base64Captcha.DriverMath - DriverDigit *base64Captcha.DriverDigit -} - -var store = base64Captcha.DefaultMemStore - -func GenerateCaptchaHandler(c *gin.Context) { - - var param configJsonBody - param.Id = uuid.New().String() - //param.CaptchaType = "string" - param.DriverDigit = base64Captcha.DefaultDriverDigit - driver := param.DriverDigit - //param.DriverString = base64Captcha.NewDriverString(46, 140, 2, 2, 4, "234567890abcdefghjkmnpqrstuvwxyz", &color.RGBA{240, 240, 246, 246}, []string{"wqy-microhei.ttc"}) - //driver := param.DriverString.ConvertFonts() - - cap := base64Captcha.NewCaptcha(driver, store) - id, b64s, err := cap.Generate() - body := map[string]interface{}{"code": 200, "data": b64s, "id": id, "msg": "success"} - if err != nil { - body = map[string]interface{}{"code": 0, "msg": err.Error()} - } - c.JSON(http.StatusOK, body) -} diff --git a/apis/loginLog.go b/apis/log/loginLog.go similarity index 85% rename from apis/loginLog.go rename to apis/log/loginLog.go index 9cb047d..a8d4446 100644 --- a/apis/loginLog.go +++ b/apis/log/loginLog.go @@ -1,13 +1,13 @@ -package apis +package log import ( "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" "go-admin/models" "go-admin/pkg" - "go-admin/utils" + "go-admin/pkg/app" + "go-admin/pkg/utils" "net/http" - "strconv" ) // @Summary 登录日志列表 @@ -37,11 +37,11 @@ func GetLoginLogList(c *gin.Context) { pageIndex = pkg.StrToInt(err, index) } - data.UserName = c.Request.FormValue("userName") + data.Username = c.Request.FormValue("username") data.Status = c.Request.FormValue("status") data.Ipaddr = c.Request.FormValue("ipaddr") result, count, err := data.GetPage(pageSize, pageIndex) - pkg.AssertErr(err, "", -1) + pkg.HasError(err, "", -1) var mp = make(map[string]interface{}, 3) mp["list"] = result @@ -49,7 +49,7 @@ func GetLoginLogList(c *gin.Context) { mp["pageIndex"] = pageIndex mp["pageSize"] = pageSize - var res models.Response + var res app.Response res.Data = mp c.JSON(http.StatusOK, res.ReturnOK()) } @@ -63,11 +63,11 @@ func GetLoginLogList(c *gin.Context) { // @Security func GetLoginLog(c *gin.Context) { var LoginLog models.LoginLog - LoginLog.InfoId, _ = strconv.ParseInt(c.Param("infoId"), 10, 64) + LoginLog.InfoId, _ = utils.StringToInt(c.Param("infoId")) result, err := LoginLog.Get() - pkg.AssertErr(err, "抱歉未找到相关信息", -1) + pkg.HasError(err, "抱歉未找到相关信息", -1) - var res models.Response + var res app.Response res.Data = result c.JSON(http.StatusOK, res.ReturnOK()) } @@ -85,10 +85,10 @@ func GetLoginLog(c *gin.Context) { func InsertLoginLog(c *gin.Context) { var data models.LoginLog err := c.BindWith(&data, binding.JSON) - pkg.AssertErr(err, "", 500) + pkg.HasError(err, "", 500) result, err := data.Create() - pkg.AssertErr(err, "", -1) - var res models.Response + pkg.HasError(err, "", -1) + var res app.Response res.Data = result c.JSON(http.StatusOK, res.ReturnOK()) } @@ -106,10 +106,10 @@ func InsertLoginLog(c *gin.Context) { func UpdateLoginLog(c *gin.Context) { var data models.LoginLog err := c.BindWith(&data, binding.JSON) - pkg.AssertErr(err, "", -1) + pkg.HasError(err, "", -1) result, err := data.Update(data.InfoId) - pkg.AssertErr(err, "", -1) - var res models.Response + pkg.HasError(err, "", -1) + var res app.Response res.Data = result c.JSON(http.StatusOK, res.ReturnOK()) } @@ -124,10 +124,10 @@ func UpdateLoginLog(c *gin.Context) { func DeleteLoginLog(c *gin.Context) { var data models.LoginLog data.UpdateBy = utils.GetUserIdStr(c) - IDS := utils.IdsStrToIdsInt64Group("infoId", c) + IDS := utils.IdsStrToIdsIntGroup("infoId", c) _, err := data.BatchDelete(IDS) - pkg.AssertErr(err, "修改失败", 500) - var res models.Response + pkg.HasError(err, "修改失败", 500) + var res app.Response res.Msg = "删除成功" c.JSON(http.StatusOK, res.ReturnOK()) } diff --git a/apis/operlog.go b/apis/log/operlog.go similarity index 86% rename from apis/operlog.go rename to apis/log/operlog.go index f3c8065..052df5e 100644 --- a/apis/operlog.go +++ b/apis/log/operlog.go @@ -1,13 +1,13 @@ -package apis +package log import ( "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" "go-admin/models" "go-admin/pkg" - "go-admin/utils" + "go-admin/pkg/app" + "go-admin/pkg/utils" "net/http" - "strconv" ) // @Summary 登录日志列表 @@ -41,7 +41,7 @@ func GetOperLogList(c *gin.Context) { data.Status = c.Request.FormValue("status") data.OperIp = c.Request.FormValue("operIp") result, count, err := data.GetPage(pageSize, pageIndex) - pkg.AssertErr(err, "", -1) + pkg.HasError(err, "", -1) var mp = make(map[string]interface{}, 3) mp["list"] = result @@ -49,7 +49,7 @@ func GetOperLogList(c *gin.Context) { mp["pageIndex"] = pageIndex mp["pageSize"] = pageSize - var res models.Response + var res app.Response res.Data = mp c.JSON(http.StatusOK, res.ReturnOK()) @@ -64,10 +64,10 @@ func GetOperLogList(c *gin.Context) { // @Security func GetOperLog(c *gin.Context) { var OperLog models.SysOperLog - OperLog.OperId, _ = strconv.ParseInt(c.Param("operId"), 10, 64) + OperLog.OperId, _ = utils.StringToInt(c.Param("operId")) result, err := OperLog.Get() - pkg.AssertErr(err, "抱歉未找到相关信息", -1) - var res models.Response + pkg.HasError(err, "抱歉未找到相关信息", -1) + var res app.Response res.Data = result c.JSON(http.StatusOK, res.ReturnOK()) } @@ -85,10 +85,10 @@ func GetOperLog(c *gin.Context) { func InsertOperLog(c *gin.Context) { var data models.SysOperLog err := c.BindWith(&data, binding.JSON) - pkg.AssertErr(err, "", 500) + pkg.HasError(err, "", 500) result, err := data.Create() - pkg.AssertErr(err, "", -1) - var res models.Response + pkg.HasError(err, "", -1) + var res app.Response res.Data = result c.JSON(http.StatusOK, res.ReturnOK()) } @@ -103,10 +103,10 @@ func InsertOperLog(c *gin.Context) { func DeleteOperLog(c *gin.Context) { var data models.SysOperLog data.UpdateBy = utils.GetUserIdStr(c) - IDS := utils.IdsStrToIdsInt64Group("operId", c) + IDS := utils.IdsStrToIdsIntGroup("operId", c) _, err := data.BatchDelete(IDS) - pkg.AssertErr(err, "删除失败", 500) - var res models.Response + pkg.HasError(err, "删除失败", 500) + var res app.Response res.Msg = "删除成功" c.JSON(http.StatusOK, res.ReturnOK()) } diff --git a/apis/system/captcha.go b/apis/system/captcha.go new file mode 100644 index 0000000..dc5364b --- /dev/null +++ b/apis/system/captcha.go @@ -0,0 +1,19 @@ +package system + +import ( + "github.com/gin-gonic/gin" + "go-admin/pkg" + "go-admin/pkg/app" + "go-admin/pkg/captcha" +) + +func GenerateCaptchaHandler(c *gin.Context) { + id, b64s, err := captcha.DriverDigitFunc() + pkg.HasError(err, "验证码获取失败", 500) + app.Custum(c, gin.H{ + "code": 200, + "data": b64s, + "id": id, + "msg": "success", + }) +} diff --git a/apis/config.go b/apis/system/config.go similarity index 75% rename from apis/config.go rename to apis/system/config.go index 283331d..f7e69cb 100644 --- a/apis/config.go +++ b/apis/system/config.go @@ -1,11 +1,13 @@ -package apis +package system import ( "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" "go-admin/models" "go-admin/pkg" - "go-admin/utils" + "go-admin/pkg/app" + "go-admin/pkg/app/msg" + "go-admin/pkg/utils" "net/http" ) @@ -21,7 +23,7 @@ import ( // @Router /api/v1/configList [get] // @Security func GetConfigList(c *gin.Context) { - var data models.Config + var data models.SysConfig var err error var pageSize = 10 var pageIndex = 1 @@ -39,7 +41,7 @@ func GetConfigList(c *gin.Context) { data.ConfigType = c.Request.FormValue("configType") data.DataScope = utils.GetUserIdStr(c) result, count, err := data.GetPage(pageSize, pageIndex) - pkg.AssertErr(err, "", -1) + pkg.HasError(err, "", -1) var mp = make(map[string]interface{}, 3) mp["list"] = result @@ -47,7 +49,7 @@ func GetConfigList(c *gin.Context) { mp["pageIndex"] = pageIndex mp["pageSize"] = pageSize - var res models.Response + var res app.Response res.Data = mp c.JSON(http.StatusOK, res.ReturnOK()) @@ -61,12 +63,12 @@ func GetConfigList(c *gin.Context) { // @Router /api/v1/config/{configId} [get] // @Security func GetConfig(c *gin.Context) { - var Config models.Config - Config.ConfigId, _ = utils.StringToInt64(c.Param("configId")) + var Config models.SysConfig + Config.ConfigId, _ = utils.StringToInt(c.Param("configId")) result, err := Config.Get() - pkg.AssertErr(err, "抱歉未找到相关信息", -1) + pkg.HasError(err, "抱歉未找到相关信息", -1) - var res models.Response + var res app.Response res.Data = result c.JSON(http.StatusOK, res.ReturnOK()) @@ -80,15 +82,12 @@ func GetConfig(c *gin.Context) { // @Router /api/v1/configKey/{configKey} [get] // @Security func GetConfigByConfigKey(c *gin.Context) { - var Config models.Config + var Config models.SysConfig Config.ConfigKey = c.Param("configKey") result, err := Config.Get() - pkg.AssertErr(err, "抱歉未找到相关信息", -1) + pkg.HasError(err, "抱歉未找到相关信息", -1) - var res models.Response - res.Data = result - res.Msg = result.ConfigValue - c.JSON(http.StatusOK, res.ReturnOK()) + app.OK(c, result,result.ConfigValue) } // @Summary 添加配置 @@ -96,23 +95,20 @@ func GetConfigByConfigKey(c *gin.Context) { // @Tags 配置 // @Accept application/json // @Product application/json -// @Param data body models.Config true "data" +// @Param data body models.SysConfig true "data" // @Success 200 {string} string "{"code": 200, "message": "添加成功"}" // @Success 200 {string} string "{"code": -1, "message": "添加失败"}" // @Router /api/v1/dict/data [post] // @Security Bearer func InsertConfig(c *gin.Context) { - var data models.Config + var data models.SysConfig err := c.BindWith(&data, binding.JSON) data.CreateBy = utils.GetUserIdStr(c) - pkg.AssertErr(err, "", 500) + pkg.HasError(err, "", 500) result, err := data.Create() - pkg.AssertErr(err, "", -1) - - var res models.Response - res.Data = result - c.JSON(http.StatusOK, res.ReturnOK()) + pkg.HasError(err, "", -1) + app.OK(c, result,"") } // @Summary 修改配置 @@ -126,16 +122,13 @@ func InsertConfig(c *gin.Context) { // @Router /api/v1/config [put] // @Security Bearer func UpdateConfig(c *gin.Context) { - var data models.Config + var data models.SysConfig err := c.BindWith(&data, binding.JSON) - pkg.AssertErr(err, "数据解析失败", -1) + pkg.HasError(err, "数据解析失败", -1) data.UpdateBy = utils.GetUserIdStr(c) result, err := data.Update(data.ConfigId) - pkg.AssertErr(err, "", -1) - - var res models.Response - res.Data = result - c.JSON(http.StatusOK, res.ReturnOK()) + pkg.HasError(err, "", -1) + app.OK(c, result,"") } // @Summary 删除配置 @@ -146,13 +139,11 @@ func UpdateConfig(c *gin.Context) { // @Success 200 {string} string "{"code": -1, "message": "删除失败"}" // @Router /api/v1/config/{configId} [delete] func DeleteConfig(c *gin.Context) { - var data models.Config - id, err := utils.StringToInt64(c.Param("configId")) + var data models.SysConfig + id, err := utils.StringToInt(c.Param("configId")) data.UpdateBy = utils.GetUserIdStr(c) - _, err = data.Delete(id) - pkg.AssertErr(err, "修改失败", 500) - - var res models.Response - res.Msg = "删除成功" - c.JSON(http.StatusOK, res.ReturnOK()) + data.ConfigId = id + _, err = data.Delete() + pkg.HasError(err, "修改失败", 500) + app.OK(c, nil,msg.DeletedSuccess) } diff --git a/apis/dept.go b/apis/system/dept.go similarity index 64% rename from apis/dept.go rename to apis/system/dept.go index 873f839..a123f5c 100644 --- a/apis/dept.go +++ b/apis/system/dept.go @@ -1,13 +1,13 @@ -package apis +package system import ( "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" "go-admin/models" "go-admin/pkg" - "go-admin/utils" - "net/http" - "strconv" + "go-admin/pkg/app" + "go-admin/pkg/app/msg" + "go-admin/pkg/utils" ) // @Summary 分页部门列表数据 @@ -21,29 +21,23 @@ import ( // @Security func GetDeptList(c *gin.Context) { var Dept models.Dept - Dept.Deptname = c.Request.FormValue("deptName") + Dept.DeptName = c.Request.FormValue("deptName") Dept.Status = c.Request.FormValue("status") - Dept.Deptid, _ = utils.StringToInt64(c.Request.FormValue("deptId")) + Dept.DeptId, _ = utils.StringToInt(c.Request.FormValue("deptId")) Dept.DataScope = utils.GetUserIdStr(c) result, err := Dept.SetDept(true) - pkg.AssertErr(err, "抱歉未找到相关信息", -1) - - var res models.Response - res.Data = result - c.JSON(http.StatusOK, res.ReturnOK()) + pkg.HasError(err, "抱歉未找到相关信息", -1) + app.OK(c,result,"") } func GetDeptTree(c *gin.Context) { var Dept models.Dept - Dept.Deptname = c.Request.FormValue("deptName") - Dept.Status = c.Request.FormValue("status") - Dept.Deptid, _ = utils.StringToInt64(c.Request.FormValue("deptId")) + Dept.DeptName = c.Request.FormValue("deptName") + Dept.Status= c.Request.FormValue("status") + Dept.DeptId, _ = utils.StringToInt(c.Request.FormValue("deptId")) result, err := Dept.SetDept(false) - pkg.AssertErr(err, "抱歉未找到相关信息", -1) - - var res models.Response - res.Data = result - c.JSON(http.StatusOK, res.ReturnOK()) + pkg.HasError(err, "抱歉未找到相关信息", -1) + app.OK(c,result,"") } // @Summary 部门列表数据 @@ -56,14 +50,11 @@ func GetDeptTree(c *gin.Context) { // @Security func GetDept(c *gin.Context) { var Dept models.Dept - Dept.Deptid, _ = strconv.ParseInt(c.Param("deptId"), 10, 64) + Dept.DeptId, _ = utils.StringToInt(c.Param("deptId")) Dept.DataScope = utils.GetUserIdStr(c) result, err := Dept.Get() - pkg.AssertErr(err, "抱歉未找到相关信息", -1) - - var res models.Response - res.Data = result - c.JSON(http.StatusOK, res.ReturnOK()) + pkg.HasError(err, msg.NotFound, 404) + app.OK(c,result,msg.GetSuccess) } // @Summary 添加部门 @@ -79,13 +70,11 @@ func GetDept(c *gin.Context) { func InsertDept(c *gin.Context) { var data models.Dept err := c.BindWith(&data, binding.JSON) - pkg.AssertErr(err, "", 500) + pkg.HasError(err, "", 500) data.CreateBy = utils.GetUserIdStr(c) result, err := data.Create() - pkg.AssertErr(err, "", -1) - var res models.Response - res.Data = result - c.JSON(http.StatusOK, res.ReturnOK()) + pkg.HasError(err, "", -1) + app.OK(c,result,msg.CreatedSuccess) } // @Summary 修改部门 @@ -102,13 +91,11 @@ func InsertDept(c *gin.Context) { func UpdateDept(c *gin.Context) { var data models.Dept err := c.BindWith(&data, binding.JSON) - pkg.AssertErr(err, "", -1) + pkg.HasError(err, "", -1) data.UpdateBy = utils.GetUserIdStr(c) - result, err := data.Update(data.Deptid) - pkg.AssertErr(err, "", -1) - var res models.Response - res.Data = result - c.JSON(http.StatusOK, res.ReturnOK()) + result, err := data.Update(data.DeptId) + pkg.HasError(err, "", -1) + app.OK(c,result,msg.UpdatedSuccess) } // @Summary 删除部门 @@ -120,28 +107,25 @@ func UpdateDept(c *gin.Context) { // @Router /api/v1/dept/{id} [delete] func DeleteDept(c *gin.Context) { var data models.Dept - id, err := strconv.ParseInt(c.Param("id"), 10, 64) + id, err := utils.StringToInt(c.Param("id")) _, err = data.Delete(id) - pkg.AssertErr(err, "删除失败", 500) - - var res models.Response - res.Msg = "删除成功" - c.JSON(http.StatusOK, res.ReturnOK()) + pkg.HasError(err, "删除失败", 500) + app.OK(c,"",msg.DeletedSuccess) } func GetDeptTreeRoleselect(c *gin.Context) { var Dept models.Dept var SysRole models.SysRole - id, err := strconv.ParseInt(c.Param("roleId"), 10, 64) - SysRole.Id = id + id, err := utils.StringToInt(c.Param("roleId")) + SysRole.RoleId = id result, err := Dept.SetDeptLable() - pkg.AssertErr(err, "抱歉未找到相关信息", -1) - menuIds := make([]int64, 0) + pkg.HasError(err, msg.NotFound, -1) + menuIds := make([]int, 0) if id != 0 { menuIds, err = SysRole.GetRoleDeptId() - pkg.AssertErr(err, "抱歉未找到相关信息", -1) + pkg.HasError(err, "抱歉未找到相关信息", -1) } - c.JSON(http.StatusOK, gin.H{ + app.Custum(c,gin.H{ "code": 200, "depts": result, "checkedKeys": menuIds, diff --git a/apis/dictData.go b/apis/system/dict/dictData.go similarity index 85% rename from apis/dictData.go rename to apis/system/dict/dictData.go index 834ab5c..f5d94b3 100644 --- a/apis/dictData.go +++ b/apis/system/dict/dictData.go @@ -1,11 +1,12 @@ -package apis +package dict import ( "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" "go-admin/models" "go-admin/pkg" - "go-admin/utils" + "go-admin/pkg/app" + "go-admin/pkg/utils" "net/http" ) @@ -38,11 +39,10 @@ func GetDictDataList(c *gin.Context) { data.Status = c.Request.FormValue("status") data.DictType = c.Request.FormValue("dictType") id := c.Request.FormValue("dictCode") - data.DictCode, _ = utils.StringToInt64(id) - data.Status = c.Request.FormValue("status") + data.DictCode, _ = utils.StringToInt(id) data.DataScope = utils.GetUserIdStr(c) result, count, err := data.GetPage(pageSize, pageIndex) - pkg.AssertErr(err, "", -1) + pkg.HasError(err, "", -1) var mp = make(map[string]interface{}, 3) mp["list"] = result @@ -50,7 +50,7 @@ func GetDictDataList(c *gin.Context) { mp["pageIndex"] = pageIndex mp["pageSize"] = pageSize - var res models.Response + var res app.Response res.Data = mp c.JSON(http.StatusOK, res.ReturnOK()) @@ -66,10 +66,10 @@ func GetDictDataList(c *gin.Context) { func GetDictData(c *gin.Context) { var DictData models.DictData DictData.DictLabel = c.Request.FormValue("dictLabel") - DictData.DictCode, _ = utils.StringToInt64(c.Param("dictCode")) + DictData.DictCode, _ = utils.StringToInt(c.Param("dictCode")) result, err := DictData.GetByCode() - pkg.AssertErr(err, "抱歉未找到相关信息", -1) - var res models.Response + pkg.HasError(err, "抱歉未找到相关信息", -1) + var res app.Response res.Data = result c.JSON(http.StatusOK, res.ReturnOK()) } @@ -85,9 +85,9 @@ func GetDictDataByDictType(c *gin.Context) { var DictData models.DictData DictData.DictType = c.Param("dictType") result, err := DictData.Get() - pkg.AssertErr(err, "抱歉未找到相关信息", -1) + pkg.HasError(err, "抱歉未找到相关信息", -1) - var res models.Response + var res app.Response res.Data = result c.JSON(http.StatusOK, res.ReturnOK()) } @@ -106,10 +106,10 @@ func InsertDictData(c *gin.Context) { var data models.DictData err := c.BindWith(&data, binding.JSON) data.CreateBy = utils.GetUserIdStr(c) - pkg.AssertErr(err, "", 500) + pkg.HasError(err, "", 500) result, err := data.Create() - pkg.AssertErr(err, "", -1) - var res models.Response + pkg.HasError(err, "", -1) + var res app.Response res.Data = result c.JSON(http.StatusOK, res.ReturnOK()) } @@ -128,10 +128,10 @@ func UpdateDictData(c *gin.Context) { var data models.DictData err := c.BindWith(&data, binding.JSON) data.UpdateBy = utils.GetUserIdStr(c) - pkg.AssertErr(err, "", -1) + pkg.HasError(err, "", -1) result, err := data.Update(data.DictCode) - pkg.AssertErr(err, "", -1) - var res models.Response + pkg.HasError(err, "", -1) + var res app.Response res.Data = result c.JSON(http.StatusOK, res.ReturnOK()) } @@ -145,12 +145,12 @@ func UpdateDictData(c *gin.Context) { // @Router /api/v1/dict/data/{dictCode} [delete] func DeleteDictData(c *gin.Context) { var data models.DictData - id, err := utils.StringToInt64(c.Param("dictCode")) + id, err := utils.StringToInt(c.Param("dictCode")) data.UpdateBy = utils.GetUserIdStr(c) _, err = data.Delete(id) - pkg.AssertErr(err, "修改失败", 500) + pkg.HasError(err, "修改失败", 500) - var res models.Response + var res app.Response res.Msg = "删除成功" c.JSON(http.StatusOK, res.ReturnOK()) } diff --git a/apis/dictType.go b/apis/system/dict/dictType.go similarity index 84% rename from apis/dictType.go rename to apis/system/dict/dictType.go index 8a7f642..9e7744b 100644 --- a/apis/dictType.go +++ b/apis/system/dict/dictType.go @@ -1,13 +1,13 @@ -package apis +package dict import ( "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" "go-admin/models" "go-admin/pkg" - "go-admin/utils" + "go-admin/pkg/app" + "go-admin/pkg/utils" "net/http" - "strconv" ) // @Summary 字典类型列表数据 @@ -37,11 +37,11 @@ func GetDictTypeList(c *gin.Context) { data.DictName = c.Request.FormValue("dictName") id := c.Request.FormValue("dictId") - data.DictId, _ = utils.StringToInt64(id) + data.DictId, _ = utils.StringToInt(id) data.DictType = c.Request.FormValue("dictType") data.DataScope = utils.GetUserIdStr(c) result, count, err := data.GetPage(pageSize, pageIndex) - pkg.AssertErr(err, "", -1) + pkg.HasError(err, "", -1) var mp = make(map[string]interface{}, 3) mp["list"] = result @@ -49,7 +49,7 @@ func GetDictTypeList(c *gin.Context) { mp["pageIndex"] = pageIndex mp["pageSize"] = pageSize - var res models.Response + var res app.Response res.Data = mp c.JSON(http.StatusOK, res.ReturnOK()) } @@ -64,10 +64,10 @@ func GetDictTypeList(c *gin.Context) { func GetDictType(c *gin.Context) { var DictType models.DictType DictType.DictName = c.Request.FormValue("dictName") - DictType.DictId, _ = strconv.ParseInt(c.Param("dictId"), 10, 64) + DictType.DictId, _ = utils.StringToInt(c.Param("dictId")) result, err := DictType.Get() - pkg.AssertErr(err, "抱歉未找到相关信息", -1) - var res models.Response + pkg.HasError(err, "抱歉未找到相关信息", -1) + var res app.Response res.Data = result c.JSON(http.StatusOK, res.ReturnOK()) } @@ -76,10 +76,10 @@ func GetDictType(c *gin.Context) { func GetDictTypeOptionSelect(c *gin.Context) { var DictType models.DictType DictType.DictName = c.Request.FormValue("dictName") - DictType.DictId, _ = strconv.ParseInt(c.Param("dictId"), 10, 64) + DictType.DictId, _ = utils.StringToInt(c.Param("dictId")) result, err := DictType.GetList() - pkg.AssertErr(err, "抱歉未找到相关信息", -1) - var res models.Response + pkg.HasError(err, "抱歉未找到相关信息", -1) + var res app.Response res.Data = result c.JSON(http.StatusOK, res.ReturnOK()) } @@ -98,10 +98,10 @@ func InsertDictType(c *gin.Context) { var data models.DictType err := c.BindWith(&data, binding.JSON) data.CreateBy = utils.GetUserIdStr(c) - pkg.AssertErr(err, "", 500) + pkg.HasError(err, "", 500) result, err := data.Create() - pkg.AssertErr(err, "", -1) - var res models.Response + pkg.HasError(err, "", -1) + var res app.Response res.Data = result c.JSON(http.StatusOK, res.ReturnOK()) } @@ -120,10 +120,10 @@ func UpdateDictType(c *gin.Context) { var data models.DictType err := c.BindWith(&data, binding.JSON) data.UpdateBy = utils.GetUserIdStr(c) - pkg.AssertErr(err, "", -1) + pkg.HasError(err, "", -1) result, err := data.Update(data.DictId) - pkg.AssertErr(err, "", -1) - var res models.Response + pkg.HasError(err, "", -1) + var res app.Response res.Data = result c.JSON(http.StatusOK, res.ReturnOK()) } @@ -137,10 +137,10 @@ func UpdateDictType(c *gin.Context) { // @Router /api/v1/dict/type/{dictId} [delete] func DeleteDictType(c *gin.Context) { var data models.DictType - id, err := utils.StringToInt64(c.Param("dictId")) + id, err := utils.StringToInt(c.Param("dictId")) data.UpdateBy = utils.GetUserIdStr(c) _, err = data.Delete(id) - pkg.AssertErr(err, "修改失败", 500) + pkg.HasError(err, "修改失败", 500) c.JSON(http.StatusOK, gin.H{ "code": 200, diff --git a/apis/info.go b/apis/system/info.go similarity index 82% rename from apis/info.go rename to apis/system/info.go index dc22a5c..51377a8 100644 --- a/apis/info.go +++ b/apis/system/info.go @@ -1,11 +1,11 @@ -package apis +package system import ( "github.com/gin-gonic/gin" "go-admin/models" "go-admin/pkg" - "go-admin/utils" - "net/http" + "go-admin/pkg/app" + "go-admin/pkg/utils" ) func GetInfo(c *gin.Context) { @@ -28,9 +28,9 @@ func GetInfo(c *gin.Context) { } sysuser := models.SysUser{} - sysuser.Id = utils.GetUserId(c) + sysuser.UserId = utils.GetUserId(c) user, err := sysuser.Get() - pkg.AssertErr(err, "", 500) + pkg.HasError(err, "", 500) mp["introduction"] = " am a super administrator" @@ -40,7 +40,5 @@ func GetInfo(c *gin.Context) { } mp["name"] = user.NickName - var res models.Response - res.Data = mp - c.JSON(http.StatusOK, res.ReturnOK()) + app.OK(c,mp,"") } diff --git a/apis/menu.go b/apis/system/menu.go similarity index 74% rename from apis/menu.go rename to apis/system/menu.go index f434d67..ea2f193 100644 --- a/apis/menu.go +++ b/apis/system/menu.go @@ -1,13 +1,12 @@ -package apis +package system import ( "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" "go-admin/models" "go-admin/pkg" - "go-admin/utils" - "net/http" - "strconv" + "go-admin/pkg/app" + "go-admin/pkg/utils" ) // @Summary Menu列表数据 @@ -21,14 +20,11 @@ import ( func GetMenuList(c *gin.Context) { var Menu models.Menu Menu.MenuName = c.Request.FormValue("menuName") - Menu.Visible = c.Request.FormValue("visible") Menu.DataScope = utils.GetUserIdStr(c) result, err := Menu.SetMenu() - pkg.AssertErr(err, "抱歉未找到相关信息", -1) + pkg.HasError(err, "抱歉未找到相关信息", -1) - var res models.Response - res.Data = result - c.JSON(http.StatusOK, res.ReturnOK()) + app.OK(c,result,"") } // @Summary Menu列表数据 @@ -41,28 +37,26 @@ func GetMenuList(c *gin.Context) { // @Security Bearer func GetMenu(c *gin.Context) { var data models.Menu - id, err := strconv.ParseInt(c.Param("id"), 10, 64) + id, err := utils.StringToInt(c.Param("id")) data.MenuId = id result, err := data.GetByMenuId() - pkg.AssertErr(err, "抱歉未找到相关信息", -1) - var res models.Response - res.Data = result - c.JSON(http.StatusOK, res.ReturnOK()) + pkg.HasError(err, "抱歉未找到相关信息", -1) + app.OK(c,result,"") } func GetMenuTreeRoleselect(c *gin.Context) { var Menu models.Menu var SysRole models.SysRole - id, err := strconv.ParseInt(c.Param("roleId"), 10, 64) - SysRole.Id = id + id, err := utils.StringToInt(c.Param("roleId")) + SysRole.RoleId = id result, err := Menu.SetMenuLable() - pkg.AssertErr(err, "抱歉未找到相关信息", -1) - menuIds := make([]int64, 0) + pkg.HasError(err, "抱歉未找到相关信息", -1) + menuIds := make([]int, 0) if id != 0 { menuIds, err = SysRole.GetRoleMeunId() - pkg.AssertErr(err, "抱歉未找到相关信息", -1) + pkg.HasError(err, "抱歉未找到相关信息", -1) } - c.JSON(http.StatusOK, gin.H{ + app.Custum(c,gin.H{ "code": 200, "menus": result, "checkedKeys": menuIds, @@ -81,10 +75,8 @@ func GetMenuTreeRoleselect(c *gin.Context) { func GetMenuTreeelect(c *gin.Context) { var data models.Menu result, err := data.SetMenuLable() - pkg.AssertErr(err, "抱歉未找到相关信息", -1) - var res models.Response - res.Data = result - c.JSON(http.StatusOK, res.ReturnOK()) + pkg.HasError(err, "抱歉未找到相关信息", -1) + app.OK(c,result,"") } // @Summary 创建菜单 @@ -105,14 +97,11 @@ func GetMenuTreeelect(c *gin.Context) { func InsertMenu(c *gin.Context) { var data models.Menu err := c.BindWith(&data, binding.JSON) - pkg.AssertErr(err, "抱歉未找到相关信息", -1) + pkg.HasError(err, "抱歉未找到相关信息", -1) data.CreateBy = utils.GetUserIdStr(c) result, err := data.Create() - pkg.AssertErr(err, "抱歉未找到相关信息", -1) - - var res models.Response - res.Data = result - c.JSON(http.StatusOK, res.ReturnOK()) + pkg.HasError(err, "抱歉未找到相关信息", -1) + app.OK(c,result,"") } // @Summary 修改菜单 @@ -130,13 +119,11 @@ func UpdateMenu(c *gin.Context) { var data models.Menu err2 := c.BindWith(&data, binding.JSON) data.UpdateBy = utils.GetUserIdStr(c) - pkg.AssertErr(err2, "修改失败", -1) + pkg.HasError(err2, "修改失败", -1) _, err := data.Update(data.MenuId) - pkg.AssertErr(err, "", 501) + pkg.HasError(err, "", 501) + app.OK(c,"","修改成功") - var res models.Response - res.Msg = "修改成功" - c.JSON(http.StatusOK, res.ReturnOK()) } // @Summary 删除菜单 @@ -148,14 +135,11 @@ func UpdateMenu(c *gin.Context) { // @Router /api/v1/menu/{id} [delete] func DeleteMenu(c *gin.Context) { var data models.Menu - id, err := utils.StringToInt64(c.Param("id")) + id, err := utils.StringToInt(c.Param("id")) data.UpdateBy = utils.GetUserIdStr(c) _, err = data.Delete(id) - pkg.AssertErr(err, "删除失败", 500) - - var res models.Response - res.Msg = "删除成功" - c.JSON(http.StatusOK, res.ReturnOK()) + pkg.HasError(err, "删除失败", 500) + app.OK(c,"","删除成功") } // @Summary 根据角色名称获取菜单列表数据(左菜单使用) @@ -169,10 +153,8 @@ func DeleteMenu(c *gin.Context) { func GetMenuRole(c *gin.Context) { var Menu models.Menu result, err := Menu.SetMenuRole(utils.GetRoleName(c)) - pkg.AssertErr(err, "获取失败", 500) - var res models.Response - res.Data = result - c.JSON(http.StatusOK, res.ReturnOK()) + pkg.HasError(err, "获取失败", 500) + app.OK(c,result,"") } // @Summary 获取角色对应的菜单id数组 @@ -188,8 +170,6 @@ func GetMenuIDS(c *gin.Context) { data.RoleName = c.GetString("role") data.UpdateBy = utils.GetUserIdStr(c) result, err := data.GetIDS() - pkg.AssertErr(err, "获取失败", 500) - var res models.Response - res.Data = result - c.JSON(http.StatusOK, res.ReturnOK()) + pkg.HasError(err, "获取失败", 500) + app.OK(c,result,"") } diff --git a/apis/post.go b/apis/system/post.go similarity index 73% rename from apis/post.go rename to apis/system/post.go index 31b2bba..cf08466 100644 --- a/apis/post.go +++ b/apis/system/post.go @@ -1,12 +1,11 @@ -package apis +package system import ( "github.com/gin-gonic/gin" "go-admin/models" "go-admin/pkg" - "go-admin/utils" - "net/http" - "strconv" + "go-admin/pkg/app" + "go-admin/pkg/utils" ) // @Summary 职位列表数据 @@ -34,23 +33,13 @@ func GetPostList(c *gin.Context) { data.PostName = c.Request.FormValue("postName") id := c.Request.FormValue("postId") - data.PostId, _ = utils.StringToInt64(id) + data.PostId, _ = utils.StringToInt(id) data.PostName = c.Request.FormValue("postName") data.DataScope = utils.GetUserIdStr(c) result, count, err := data.GetPage(pageSize, pageIndex) - pkg.AssertErr(err, "", -1) - - var mp = make(map[string]interface{}, 3) - mp["list"] = result - mp["count"] = count - mp["pageIndex"] = pageIndex - mp["pageSize"] = pageSize - - var res models.Response - res.Data = mp - - c.JSON(http.StatusOK, res.ReturnOK()) + pkg.HasError(err, "", -1) + app.PageOK(c, result, count, pageIndex, pageSize, "") } // @Summary 获取字典数据 @@ -62,12 +51,10 @@ func GetPostList(c *gin.Context) { // @Security func GetPost(c *gin.Context) { var Post models.Post - Post.PostId, _ = strconv.ParseInt(c.Param("postId"), 10, 64) + Post.PostId, _ = utils.StringToInt(c.Param("postId")) result, err := Post.Get() - pkg.AssertErr(err, "抱歉未找到相关信息", -1) - var res models.Response - res.Data = result - c.JSON(http.StatusOK, res.ReturnOK()) + pkg.HasError(err, "抱歉未找到相关信息", -1) + app.OK(c,result,"") } // @Summary 添加职位 @@ -84,12 +71,10 @@ func InsertPost(c *gin.Context) { var data models.Post err := c.Bind(&data) data.CreateBy = utils.GetUserIdStr(c) - pkg.AssertErr(err, "", 500) + pkg.HasError(err, "", 500) result, err := data.Create() - pkg.AssertErr(err, "", -1) - var res models.Response - res.Data = result - c.JSON(http.StatusOK, res.ReturnOK()) + pkg.HasError(err, "", -1) + app.OK(c,result,"") } // @Summary 修改职位 @@ -107,12 +92,10 @@ func UpdatePost(c *gin.Context) { err := c.Bind(&data) data.UpdateBy = utils.GetUserIdStr(c) - pkg.AssertErr(err, "", -1) + pkg.HasError(err, "", -1) result, err := data.Update(data.PostId) - pkg.AssertErr(err, "", -1) - var res models.Response - res.Data = result - c.JSON(http.StatusOK, res.ReturnOK()) + pkg.HasError(err, "", -1) + app.OK(c,result,"修改成功") } // @Summary 删除职位 @@ -124,11 +107,9 @@ func UpdatePost(c *gin.Context) { // @Router /api/v1/post/{postId} [delete] func DeletePost(c *gin.Context) { var data models.Post - id, err := utils.StringToInt64(c.Param("postId")) + id, err := utils.StringToInt(c.Param("postId")) data.UpdateBy = utils.GetUserIdStr(c) _, err = data.Delete(id) - pkg.AssertErr(err, "删除失败", 500) - var res models.Response - res.Msg = "删除成功" - c.JSON(http.StatusOK, res.ReturnOK()) + pkg.HasError(err, "删除失败", 500) + app.OK(c,"","删除成功") } diff --git a/apis/role.go b/apis/system/role.go similarity index 64% rename from apis/role.go rename to apis/system/role.go index 5e729b3..5e9fe37 100644 --- a/apis/role.go +++ b/apis/system/role.go @@ -1,13 +1,12 @@ -package apis +package system import ( "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" "go-admin/models" "go-admin/pkg" - "go-admin/utils" - "net/http" - "strconv" + "go-admin/pkg/app" + "go-admin/pkg/utils" ) // @Summary 角色列表数据 @@ -36,22 +35,13 @@ func GetRoleList(c *gin.Context) { } data.RoleKey = c.Request.FormValue("roleKey") - data.Name = c.Request.FormValue("roleName") + data.RoleName = c.Request.FormValue("roleName") data.Status = c.Request.FormValue("status") data.DataScope = utils.GetUserIdStr(c) result, count, err := data.GetPage(pageSize, pageIndex) - pkg.AssertErr(err, "", -1) + pkg.HasError(err, "", -1) - var mp = make(map[string]interface{}, 3) - mp["list"] = result - mp["count"] = count - mp["pageIndex"] = pageIndex - mp["pageSize"] = pageSize - - var res models.Response - res.Data = mp - - c.JSON(http.StatusOK, res.ReturnOK()) + app.PageOK(c, result, count, pageIndex, pageSize, "") } // @Summary 获取Role数据 @@ -64,25 +54,14 @@ func GetRoleList(c *gin.Context) { // @Security Bearer func GetRole(c *gin.Context) { var Role models.SysRole - Role.Id, _ = strconv.ParseInt(c.Param("roleId"), 10, 64) + Role.RoleId, _ = utils.StringToInt(c.Param("roleId")) result, err := Role.Get() - - menuIds := make([]int64, 0) - + menuIds := make([]int, 0) menuIds, err = Role.GetRoleMeunId() - pkg.AssertErr(err, "抱歉未找到相关信息", -1) - + pkg.HasError(err, "抱歉未找到相关信息", -1) result.MenuIds = menuIds - if err != nil { - c.JSON(http.StatusOK, gin.H{ - "code": -1, - "msg": "抱歉未找到相关信息", - }) - return - } - var res models.Response - res.Data = result - c.JSON(http.StatusOK, res.ReturnOK()) + app.OK(c, result, "") + } // @Summary 创建角色 @@ -98,17 +77,14 @@ func InsertRole(c *gin.Context) { var data models.SysRole data.CreateBy = utils.GetUserIdStr(c) err := c.BindWith(&data, binding.JSON) - pkg.AssertErr(err, "", 500) + pkg.HasError(err, "", 500) id, err := data.Insert() - data.Id = id - pkg.AssertErr(err, "", -1) + data.RoleId = id + pkg.HasError(err, "", -1) var t models.RoleMenu _, err = t.Insert(id, data.MenuIds) - pkg.AssertErr(err, "", -1) - var res models.Response - res.Data = data - res.Msg = "添加成功" - c.JSON(http.StatusOK, res.ReturnOK()) + pkg.HasError(err, "", -1) + app.OK(c, data, "添加成功") } // @Summary 修改用户角色 @@ -124,40 +100,32 @@ func UpdateRole(c *gin.Context) { var data models.SysRole data.UpdateBy = utils.GetUserIdStr(c) err := c.Bind(&data) - pkg.AssertErr(err, "数据解析失败", -1) - result, err := data.Update(data.Id) - + pkg.HasError(err, "数据解析失败", -1) + result, err := data.Update(data.RoleId) var t models.RoleMenu - _, err = t.DeleteRoleMenu(data.Id) - pkg.AssertErr(err, "添加失败1", -1) + _, err = t.DeleteRoleMenu(data.RoleId) + pkg.HasError(err, "添加失败1", -1) + _, err2 := t.Insert(data.RoleId, data.MenuIds) + pkg.HasError(err2, "添加失败2", -1) - _, err2 := t.Insert(data.Id, data.MenuIds) - pkg.AssertErr(err2, "添加失败2", -1) - - var res models.Response - res.Data = result - res.Msg = "修改成功" - c.JSON(http.StatusOK, res.ReturnOK()) + app.OK(c, result, "修改成功") } func UpdateRoleDataScope(c *gin.Context) { var data models.SysRole data.UpdateBy = utils.GetUserIdStr(c) err := c.Bind(&data) - pkg.AssertErr(err, "数据解析失败", -1) - result, err := data.Update(data.Id) + pkg.HasError(err, "数据解析失败", -1) + result, err := data.Update(data.RoleId) var t models.SysRoleDept - _, err = t.DeleteRoleDept(data.Id) - pkg.AssertErr(err, "添加失败1", -1) + _, err = t.DeleteRoleDept(data.RoleId) + pkg.HasError(err, "添加失败1", -1) if data.DataScope == "2" { - _, err2 := t.Insert(data.Id, data.DeptIds) - pkg.AssertErr(err2, "添加失败2", -1) + _, err2 := t.Insert(data.RoleId, data.DeptIds) + pkg.HasError(err2, "添加失败2", -1) } - var res models.Response - res.Data = result - res.Msg = "修改成功" - c.JSON(http.StatusOK, res.ReturnOK()) + app.OK(c, result, "修改成功") } // @Summary 删除用户角色 @@ -171,14 +139,11 @@ func DeleteRole(c *gin.Context) { var Role models.SysRole Role.UpdateBy = utils.GetUserIdStr(c) - IDS := utils.IdsStrToIdsInt64Group("roleId", c) + IDS := utils.IdsStrToIdsIntGroup("roleId", c) _, err := Role.BatchDelete(IDS) - pkg.AssertErr(err, "删除失败1", -1) + pkg.HasError(err, "删除失败1", -1) var t models.RoleMenu _, err = t.BatchDeleteRoleMenu(IDS) - pkg.AssertErr(err, "删除失败1", -1) - - var res models.Response - res.Msg = "删除成功" - c.JSON(http.StatusOK, res.ReturnOK()) + pkg.HasError(err, "删除失败1", -1) + app.OK(c, "", "删除成功") } diff --git a/apis/rolemenu.go b/apis/system/rolemenu.go similarity index 72% rename from apis/rolemenu.go rename to apis/system/rolemenu.go index 04fba51..1a4e06f 100644 --- a/apis/rolemenu.go +++ b/apis/system/rolemenu.go @@ -1,9 +1,10 @@ -package apis +package system import ( "fmt" "github.com/gin-gonic/gin" "go-admin/models" + "go-admin/pkg/app" "net/http" ) @@ -19,7 +20,7 @@ func GetRoleMenu(c *gin.Context) { var Rm models.RoleMenu err := c.ShouldBind(&Rm) result, err := Rm.Get() - var res models.Response + var res app.Response if err != nil { res.Msg = "抱歉未找到相关信息" c.JSON(http.StatusOK, res.ReturnError(200)) @@ -35,28 +36,8 @@ type RoleMenuPost struct { } func InsertRoleMenu(c *gin.Context) { - //roleId := c.Request.FormValue("role_id") - //menuId := c.Request.FormValue("menu_id") - //menus := strings.Split(menuId, ",") - //fmt.Println(menus) - //var t models.RoleMenu - //_,err := t.DeleteRoleMenu(roleId) - //if err != nil { - // c.JSON(http.StatusOK, gin.H{ - // "code": -1, - // "message": "添加失败1", - // }) - // return - //} - //_, err2 := t.Insert(roleId, menus) - //if err2 != nil { - // c.JSON(http.StatusOK, gin.H{ - // "code": -1, - // "message": "添加失败2", - // }) - // return - //} - var res models.Response + + var res app.Response res.Msg = "添加成功" c.JSON(http.StatusOK, res.ReturnOK()) return @@ -78,12 +59,12 @@ func DeleteRoleMenu(c *gin.Context) { fmt.Println(menuId) _, err := t.Delete(id, menuId) if err != nil { - var res models.Response + var res app.Response res.Msg = "删除失败" c.JSON(http.StatusOK, res.ReturnError(200)) return } - var res models.Response + var res app.Response res.Msg = "删除成功" c.JSON(http.StatusOK, res.ReturnOK()) return diff --git a/apis/sysuser.go b/apis/system/sysuser.go similarity index 70% rename from apis/sysuser.go rename to apis/system/sysuser.go index 36af24d..d18590a 100644 --- a/apis/sysuser.go +++ b/apis/system/sysuser.go @@ -1,4 +1,4 @@ -package apis +package system import ( "github.com/gin-gonic/gin" @@ -6,10 +6,9 @@ import ( "github.com/google/uuid" "go-admin/models" "go-admin/pkg" - "go-admin/utils" + "go-admin/pkg/app" + "go-admin/pkg/utils" "log" - "net/http" - "strconv" ) // @Summary 列表数据 @@ -39,25 +38,16 @@ func GetSysUserList(c *gin.Context) { data.Username = c.Request.FormValue("userName") postId := c.Request.FormValue("postId") - data.PostId, _ = strconv.ParseInt(postId, 10, 64) + data.PostId, _ = utils.StringToInt(postId) deptId := c.Request.FormValue("deptId") - data.DeptId, _ = strconv.ParseInt(deptId, 10, 64) + data.DeptId, _ = utils.StringToInt(deptId) data.DataScope = utils.GetUserIdStr(c) result, count, err := data.GetPage(pageSize, pageIndex) - pkg.AssertErr(err, "", -1) + pkg.HasError(err, "", -1) - var mp = make(map[string]interface{}, 3) - mp["list"] = result - mp["count"] = count - mp["pageIndex"] = pageIndex - mp["pageSize"] = pageSize - - var res models.Response - res.Data = mp - - c.JSON(http.StatusOK, res.ReturnOK()) + app.PageOK(c, result, count, pageIndex, pageSize, "") } // @Summary 获取用户 @@ -69,21 +59,20 @@ func GetSysUserList(c *gin.Context) { // @Security func GetSysUser(c *gin.Context) { var SysUser models.SysUser - SysUser.Id, _ = strconv.ParseInt(c.Param("userId"), 10, 64) + SysUser.UserId, _ = utils.StringToInt(c.Param("userId")) result, err := SysUser.Get() - pkg.AssertErr(err, "抱歉未找到相关信息", -1) + pkg.HasError(err, "抱歉未找到相关信息", -1) var SysRole models.SysRole var Post models.Post roles, err := SysRole.GetList() posts, err := Post.GetList() - postIds := make([]int64, 0) + postIds := make([]int, 0) postIds = append(postIds, result.PostId) - roleIds := make([]int64, 0) + roleIds := make([]int, 0) roleIds = append(roleIds, result.RoleId) - - c.JSON(http.StatusOK, gin.H{ + app.Custum(c, gin.H{ "code": 200, "data": result, "postIds": postIds, @@ -102,9 +91,9 @@ func GetSysUser(c *gin.Context) { func GetSysUserProfile(c *gin.Context) { var SysUser models.SysUser userId := utils.GetUserIdStr(c) - SysUser.Id, _ = strconv.ParseInt(userId, 10, 64) + SysUser.UserId, _ = utils.StringToInt(userId) result, err := SysUser.Get() - pkg.AssertErr(err, "抱歉未找到相关信息", -1) + pkg.HasError(err, "抱歉未找到相关信息", -1) var SysRole models.SysRole var Post models.Post var Dept models.Dept @@ -113,16 +102,16 @@ func GetSysUserProfile(c *gin.Context) { //获取职位列表 posts, err := Post.GetList() //获取部门列表 - Dept.Deptid = result.DeptId + Dept.DeptId = result.DeptId dept, err := Dept.Get() - postIds := make([]int64, 0) + postIds := make([]int, 0) postIds = append(postIds, result.PostId) - roleIds := make([]int64, 0) + roleIds := make([]int, 0) roleIds = append(roleIds, result.RoleId) - c.JSON(http.StatusOK, gin.H{ + app.Custum(c, gin.H{ "code": 200, "data": result, "postIds": postIds, @@ -144,13 +133,11 @@ func GetSysUserInit(c *gin.Context) { var Post models.Post roles, err := SysRole.GetList() posts, err := Post.GetList() - pkg.AssertErr(err, "抱歉未找到相关信息", -1) + pkg.HasError(err, "抱歉未找到相关信息", -1) mp := make(map[string]interface{}, 2) mp["roles"] = roles mp["posts"] = posts - var res models.Response - res.Data = mp - c.JSON(http.StatusOK, res.ReturnOK()) + app.OK(c, mp, "") } // @Summary 创建用户 @@ -165,22 +152,12 @@ func GetSysUserInit(c *gin.Context) { func InsertSysUser(c *gin.Context) { var sysuser models.SysUser err := c.BindWith(&sysuser, binding.JSON) - pkg.AssertErr(err, "非法数据格式", 500) + pkg.HasError(err, "非法数据格式", 500) - sysuser.CreateTime = utils.GetCurrntTime() - sysuser.UpdateTime = utils.GetCurrntTime() sysuser.CreateBy = utils.GetUserIdStr(c) - sysuser.IsDel = 0 id, err := sysuser.Insert() - var res models.Response - if err != nil { - res.Msg = "添加失败" - c.JSON(http.StatusOK, res.ReturnError(200)) - return - } - res.Data = id - res.Msg = "添加成功" - c.JSON(http.StatusOK, res.ReturnOK()) + pkg.HasError(err, "添加失败", 500) + app.OK(c, id, "添加成功") } // @Summary 修改用户数据 @@ -195,17 +172,11 @@ func InsertSysUser(c *gin.Context) { func UpdateSysUser(c *gin.Context) { var data models.SysUser err := c.BindWith(&data, binding.JSON) - pkg.AssertErr(err, "数据解析失败", -1) + pkg.HasError(err, "数据解析失败", -1) data.UpdateBy = utils.GetUserIdStr(c) - result, err := data.Update(data.Id) - var res models.Response - if err != nil || result.Id == 0 { - res.Msg = "修改失败" - c.JSON(http.StatusOK, res.ReturnError(200)) - return - } - res.Msg = "修改成功" - c.JSON(http.StatusOK, res.ReturnOK()) + result, err := data.Update(data.UserId) + pkg.HasError(err, "修改失败", 500) + app.OK(c, result, "修改成功") } // @Summary 删除用户数据 @@ -218,17 +189,10 @@ func UpdateSysUser(c *gin.Context) { func DeleteSysUser(c *gin.Context) { var data models.SysUser data.UpdateBy = utils.GetUserIdStr(c) - IDS := utils.IdsStrToIdsInt64Group("userId", c) + IDS := utils.IdsStrToIdsIntGroup("userId", c) result, err := data.BatchDelete(IDS) - if err != nil || !result { - var res models.Response - res.Msg = "删除失败" - c.JSON(http.StatusOK, res.ReturnError(501)) - return - } - var res models.Response - res.Msg = "删除成功" - c.JSON(http.StatusOK, res.ReturnOK()) + pkg.HasError(err, "删除失败", 500) + app.OK(c, result, "删除成功") } // @Summary 修改头像 @@ -250,28 +214,19 @@ func InsetSysUserAvatar(c *gin.Context) { _ = c.SaveUploadedFile(file, filPath) } sysuser := models.SysUser{} - sysuser.Id = utils.GetUserId(c) + sysuser.UserId = utils.GetUserId(c) sysuser.Avatar = "/" + filPath sysuser.UpdateBy = utils.GetUserIdStr(c) - sysuser.Update(sysuser.Id) - - c.JSON(http.StatusCreated, gin.H{ - "code": 200, - "data": filPath, - }) - + sysuser.Update(sysuser.UserId) + app.OK(c, filPath, "修改成功") } func SysUserUpdatePwd(c *gin.Context) { var pwd models.SysUserPwd err := c.Bind(&pwd) - pkg.AssertErr(err, "数据解析失败", 500) + pkg.HasError(err, "数据解析失败", 500) sysuser := models.SysUser{} - sysuser.Id = utils.GetUserId(c) + sysuser.UserId = utils.GetUserId(c) sysuser.SetPwd(pwd) - c.JSON(http.StatusCreated, gin.H{ - "code": 200, - "data": "密码修改成功", - }) - + app.OK(c, "", "密码修改成功") } diff --git a/apis/tools/dbcolumns.go b/apis/tools/dbcolumns.go index e7bcff8..05d1cc7 100644 --- a/apis/tools/dbcolumns.go +++ b/apis/tools/dbcolumns.go @@ -2,9 +2,9 @@ package tools import ( "github.com/gin-gonic/gin" - "go-admin/models" "go-admin/models/tools" "go-admin/pkg" + "go-admin/pkg/app" "net/http" ) @@ -33,7 +33,7 @@ func GetDBColumnList(c *gin.Context) { data.TableName = c.Request.FormValue("tableName") pkg.Assert(data.TableName=="","table name cannot be empty!",500) result, count, err := data.GetPage(pageSize, pageIndex) - pkg.AssertErr(err, "", -1) + pkg.HasError(err, "", -1) var mp = make(map[string]interface{}, 3) mp["list"] = result @@ -41,7 +41,7 @@ func GetDBColumnList(c *gin.Context) { mp["pageIndex"] = pageIndex mp["pageSize"] = pageSize - var res models.Response + var res app.Response res.Data = mp c.JSON(http.StatusOK, res.ReturnOK()) diff --git a/apis/tools/dbtables.go b/apis/tools/dbtables.go index dd0bcd4..a1688b5 100644 --- a/apis/tools/dbtables.go +++ b/apis/tools/dbtables.go @@ -3,9 +3,9 @@ package tools import ( "github.com/gin-gonic/gin" "go-admin/config" - "go-admin/models" "go-admin/models/tools" "go-admin/pkg" + "go-admin/pkg/app" "net/http" ) @@ -18,7 +18,7 @@ import ( // @Success 200 {object} models.Response "{"code": 200, "data": [...]}" // @Router /api/v1/db/tables/page [get] func GetDBTableList(c *gin.Context) { - var res models.Response + var res app.Response var data tools.DBTables var err error var pageSize = 10 @@ -39,7 +39,7 @@ func GetDBTableList(c *gin.Context) { data.TableName = c.Request.FormValue("tableName") result, count, err := data.GetPage(pageSize, pageIndex) - pkg.AssertErr(err, "", -1) + pkg.HasError(err, "", -1) var mp = make(map[string]interface{}, 3) mp["list"] = result diff --git a/apis/tools/gen.go b/apis/tools/gen.go index c2cd7e6..7adc57d 100644 --- a/apis/tools/gen.go +++ b/apis/tools/gen.go @@ -3,23 +3,23 @@ package tools import ( "bytes" "github.com/gin-gonic/gin" - "go-admin/models" "go-admin/models/tools" "go-admin/pkg" - "go-admin/utils" + "go-admin/pkg/app" + "go-admin/pkg/utils" "net/http" "text/template" ) func Preview(c *gin.Context) { table := tools.SysTables{} - id, err := utils.StringToInt64(c.Param("tableId")) - pkg.AssertErr(err, "", -1) + id, err := utils.StringToInt(c.Param("tableId")) + pkg.HasError(err, "", -1) table.TableId = id t1, err := template.ParseFiles("template/model.go.template") - pkg.AssertErr(err, "", -1) + pkg.HasError(err, "", -1) t2, err := template.ParseFiles("template/api.go.template") - pkg.AssertErr(err, "", -1) + pkg.HasError(err, "", -1) tab, _ := table.Get() var b1 bytes.Buffer err = t1.Execute(&b1, tab) @@ -29,7 +29,7 @@ func Preview(c *gin.Context) { mp := make(map[string]interface{}) mp["template/model.go.template"] = b1.String() mp["template/api.go.template"] = b2.String() - var res models.Response + var res app.Response res.Data = mp c.JSON(http.StatusOK, res.ReturnOK()) diff --git a/apis/tools/systables.go b/apis/tools/systables.go index d167a8d..0cef225 100644 --- a/apis/tools/systables.go +++ b/apis/tools/systables.go @@ -2,10 +2,10 @@ package tools import ( "github.com/gin-gonic/gin" - "go-admin/models" "go-admin/models/tools" "go-admin/pkg" - "go-admin/utils" + "go-admin/pkg/app" + "go-admin/pkg/utils" "net/http" "strings" ) @@ -34,7 +34,7 @@ func GetSysTableList(c *gin.Context) { data.TableName = c.Request.FormValue("tableName") result, count, err := data.GetPage(pageSize, pageIndex) - pkg.AssertErr(err, "", -1) + pkg.HasError(err, "", -1) var mp = make(map[string]interface{}, 3) mp["list"] = result @@ -42,7 +42,7 @@ func GetSysTableList(c *gin.Context) { mp["pageIndex"] = pageIndex mp["pageSize"] = pageSize - var res models.Response + var res app.Response res.Data = mp c.JSON(http.StatusOK, res.ReturnOK()) @@ -57,11 +57,11 @@ func GetSysTableList(c *gin.Context) { // @Security func GetSysTables(c *gin.Context) { var data tools.SysTables - data.TableId, _ = utils.StringToInt64(c.Param("tableId")) + data.TableId, _ = utils.StringToInt(c.Param("tableId")) result, err := data.Get() - pkg.AssertErr(err, "抱歉未找到相关信息", -1) + pkg.HasError(err, "抱歉未找到相关信息", -1) - var res models.Response + var res app.Response res.Data = result mp := make(map[string]interface{}) mp["rows"] = result.Columns @@ -103,7 +103,6 @@ func InsertSysTable(c *gin.Context) { data.Crud = true dbcolumn, err := dbColumn.GetList() - data.CreateTime = utils.GetCurrntTime() data.CreateBy = utils.GetUserIdStr(c) data.TableComment = dbtable.TableComment if dbtable.TableComment == "" { @@ -153,7 +152,7 @@ func InsertSysTable(c *gin.Context) { } if strings.Contains(dbcolumn[i].ColumnType, "int") { - column.GoType = "int64" + column.GoType = "int" column.HtmlType = "input" } else { column.GoType = "string" @@ -164,9 +163,9 @@ func InsertSysTable(c *gin.Context) { } result, err := data.Create() - pkg.AssertErr(err, "", -1) + pkg.HasError(err, "", -1) - var res models.Response + var res app.Response res.Data = result res.Msg = "添加成功!" c.JSON(http.StatusOK, res.ReturnOK()) @@ -186,12 +185,12 @@ func InsertSysTable(c *gin.Context) { func UpdateSysTable(c *gin.Context) { var data tools.SysTables err := c.Bind(&data) - pkg.AssertErr(err, "数据解析失败", -1) + pkg.HasError(err, "数据解析失败", -1) data.UpdateBy = utils.GetUserIdStr(c) result, err := data.Update() - pkg.AssertErr(err, "", -1) + pkg.HasError(err, "", -1) - var res models.Response + var res app.Response res.Data = result res.Msg = "修改成功" c.JSON(http.StatusOK, res.ReturnOK()) @@ -206,11 +205,11 @@ func UpdateSysTable(c *gin.Context) { // @Router /api/v1/sys/tables/info/{tableId} [delete] func DeleteSysTables(c *gin.Context) { var data tools.SysTables - id, err := utils.StringToInt64(c.Param("tableId")) + id, err := utils.StringToInt(c.Param("tableId")) data.TableId = id _, err = data.Delete() - pkg.AssertErr(err, "删除失败", 500) - var res models.Response + pkg.HasError(err, "删除失败", 500) + var res app.Response res.Msg = "删除成功" c.JSON(http.StatusOK, res.ReturnOK()) } diff --git a/config/sqlite.sql b/config/sqlite.sql index b517fd8..30827f4 100755 --- a/config/sqlite.sql +++ b/config/sqlite.sql @@ -46,22 +46,22 @@ CREATE TABLE `sys_columns` ( , `remark` varchar(255) DEFAULT NULL ); CREATE TABLE `sys_config` ( - `configId` integer NOT NULL PRIMARY KEY AUTOINCREMENT -, `configName` varchar(128) DEFAULT NULL -, `configKey` varchar(128) DEFAULT NULL -, `configValue` varchar(255) DEFAULT NULL -, `configType` varchar(64) DEFAULT NULL + `config_id` integer NOT NULL PRIMARY KEY AUTOINCREMENT +, `config_name` varchar(128) DEFAULT NULL +, `config_key` varchar(128) DEFAULT NULL +, `config_value` varchar(255) DEFAULT NULL +, `config_type` varchar(64) DEFAULT NULL , `create_by` varchar(64) DEFAULT NULL , `create_time` datetime DEFAULT NULL , `update_by` varchar(64) DEFAULT NULL , `update_time` datetime DEFAULT NULL , `remark` varchar(255) DEFAULT NULL -, `dataScope` varchar(255) DEFAULT NULL +, `data_scope` varchar(255) DEFAULT NULL , `params` varchar(255) DEFAULT NULL , `is_del` varchar(255) DEFAULT NULL ); CREATE TABLE `sys_dept` ( - `deptId` integer NOT NULL PRIMARY KEY AUTOINCREMENT + `dept_id` integer NOT NULL PRIMARY KEY AUTOINCREMENT , `parent_id` integer DEFAULT NULL , `dept_path` varchar(255) DEFAULT NULL , `dept_name` varchar(255) DEFAULT NULL @@ -77,14 +77,14 @@ CREATE TABLE `sys_dept` ( , `update_by` varchar(64) DEFAULT NULL ); CREATE TABLE `sys_dict_data` ( - `dictCode` integer NOT NULL PRIMARY KEY AUTOINCREMENT -, `dictSort` integer DEFAULT NULL -, `dictLabel` varchar(128) DEFAULT NULL -, `dictValue` varchar(255) DEFAULT NULL -, `dictType` varchar(64) DEFAULT NULL -, `cssClass` varchar(255) DEFAULT NULL -, `listClass` varchar(255) DEFAULT NULL -, `isDefault` varchar(8) DEFAULT NULL + `dict_code` integer NOT NULL PRIMARY KEY AUTOINCREMENT +, `dict_sort` integer DEFAULT NULL +, `dict_label` varchar(128) DEFAULT NULL +, `dict_value` varchar(255) DEFAULT NULL +, `dict_type` varchar(64) DEFAULT NULL +, `css_class` varchar(255) DEFAULT NULL +, `list_class` varchar(255) DEFAULT NULL +, `is_default` varchar(8) DEFAULT NULL , `status` varchar(8) DEFAULT NULL , `default` varchar(8) DEFAULT NULL , `create_by` varchar(64) DEFAULT NULL @@ -93,15 +93,15 @@ CREATE TABLE `sys_dict_data` ( , `update_time` datetime DEFAULT NULL , `remark` varchar(255) DEFAULT NULL , `params` varchar(255) DEFAULT NULL -, `dataScope` varchar(255) DEFAULT NULL +, `data_scope` varchar(255) DEFAULT NULL , `is_del` varchar(255) DEFAULT NULL ); CREATE TABLE `sys_dict_type` ( - `dictId` integer NOT NULL PRIMARY KEY AUTOINCREMENT -, `dictName` varchar(128) DEFAULT NULL -, `dictType` varchar(128) DEFAULT NULL + `dict_id` integer NOT NULL PRIMARY KEY AUTOINCREMENT +, `dict_name` varchar(128) DEFAULT NULL +, `dict_type` varchar(128) DEFAULT NULL , `status` varchar(8) DEFAULT NULL -, `dataScope` varchar(255) DEFAULT NULL +, `data_scope` varchar(255) DEFAULT NULL , `params` varchar(255) DEFAULT NULL , `create_by` varchar(64) DEFAULT NULL , `create_time` datetime DEFAULT NULL @@ -131,18 +131,18 @@ CREATE TABLE `sys_loginlog` ( , `msg` varchar(255) DEFAULT NULL ); CREATE TABLE `sys_menu` ( - `menuId` integer NOT NULL PRIMARY KEY AUTOINCREMENT + `menu_id` integer NOT NULL PRIMARY KEY AUTOINCREMENT , `title` varchar(64) DEFAULT NULL , `path` varchar(128) DEFAULT NULL , `paths` varchar(128) DEFAULT NULL , `menu_type_path` varchar(255) DEFAULT NULL , `action` varchar(16) DEFAULT '无' , `permission` varchar(32) DEFAULT NULL -, `menuType` varchar(1) DEFAULT NULL -, `parentId` integer DEFAULT NULL -, `noCache` varchar(255) DEFAULT NULL +, `menu_type` varchar(1) DEFAULT NULL +, `parent_id` integer DEFAULT NULL +, `no_cache` varchar(255) DEFAULT NULL , `breadcrumb` varchar(255) DEFAULT NULL -, `menuName` varchar(255) DEFAULT NULL +, `menu_name` varchar(255) DEFAULT NULL , `icon` varchar(255) DEFAULT NULL , `component` varchar(255) DEFAULT NULL , `create_time` datetime DEFAULT NULL @@ -182,9 +182,9 @@ CREATE TABLE `sys_operlog` ( , `user_agent` varchar(255) DEFAULT NULL ); CREATE TABLE `sys_post` ( - `postId` integer NOT NULL PRIMARY KEY AUTOINCREMENT -, `postName` varchar(255) DEFAULT NULL -, `postCode` varchar(255) DEFAULT NULL + `post_id` integer NOT NULL PRIMARY KEY AUTOINCREMENT +, `post_name` varchar(255) DEFAULT NULL +, `post_code` varchar(255) DEFAULT NULL , `sort` integer DEFAULT '0' , `status` varchar(255) DEFAULT NULL , `remark` varchar(255) DEFAULT NULL @@ -197,8 +197,8 @@ CREATE TABLE `sys_post` ( , `params` varchar(255) DEFAULT NULL ); CREATE TABLE `sys_role` ( - `id` integer NOT NULL PRIMARY KEY AUTOINCREMENT -, `name` varchar(64) DEFAULT NULL + `role_id` integer NOT NULL PRIMARY KEY AUTOINCREMENT +, `role_name` varchar(64) DEFAULT NULL , `status` varchar(255) DEFAULT NULL , `role_key` varchar(255) DEFAULT NULL , `role_sort` integer DEFAULT NULL diff --git a/database/mysql.go b/database/mysql.go index 3309b5d..24394d4 100644 --- a/database/mysql.go +++ b/database/mysql.go @@ -38,13 +38,14 @@ func init() { conn.WriteString(")") conn.WriteString("/") conn.WriteString(database) - //conn.WriteString("?charset=utf8&parseTime=True&loc=Local&timeout=1000ms") + conn.WriteString("?charset=utf8&parseTime=True&loc=Local&timeout=1000ms") log.Println(conn.String()) var db Database if dbType == "mysql" { db = new(Mysql) + Eloquent, err = db.Open(dbType, conn.String()) } else if dbType == "sqlite3" { diff --git a/handler/auth.go b/handler/auth.go index b662feb..b5804ca 100644 --- a/handler/auth.go +++ b/handler/auth.go @@ -4,9 +4,9 @@ import ( "github.com/gin-gonic/gin" "github.com/mojocn/base64Captcha" "github.com/mssola/user_agent" - . "go-admin/models" + "go-admin/models" jwt "go-admin/pkg/jwtauth" - "go-admin/utils" + "go-admin/pkg/utils" "log" "net/http" ) @@ -15,15 +15,15 @@ var store = base64Captcha.DefaultMemStore func PayloadFunc(data interface{}) jwt.MapClaims { if v, ok := data.(map[string]interface{}); ok { - u, _ := v["user"].(SysUser) - r, _ := v["role"].(SysRole) + u, _ := v["user"].(models.SysUser) + r, _ := v["role"].(models.SysRole) return jwt.MapClaims{ - jwt.IdentityKey: u.Id, - jwt.RoleIdKey: r.Id, + jwt.IdentityKey: u.UserId, + jwt.RoleIdKey: r.RoleId, jwt.RoleKey: r.RoleKey, jwt.NiceKey: u.Username, jwt.DataScopeKey: r.DataScope, - jwt.RoleNameKey: r.Name, + jwt.RoleNameKey: r.RoleName, } } return jwt.MapClaims{} @@ -52,17 +52,15 @@ func IdentityHandler(c *gin.Context) interface{} { // @Success 200 {string} string "{"code": 200, "expire": "2019-08-07T12:45:48+08:00", "token": ".eyJleHAiOjE1NjUxNTMxNDgsImlkIjoiYWRtaW4iLCJvcmlnX2lhdCI6MTU2NTE0OTU0OH0.-zvzHvbg0A" }" // @Router /login [post] func Authenticator(c *gin.Context) (interface{}, error) { - var loginVals Login - var loginlog LoginLog + var loginVals models.Login + var loginlog models.LoginLog ua := user_agent.New(c.Request.UserAgent()) loginlog.Ipaddr = c.ClientIP() location := utils.GetLocation(c.ClientIP()) loginlog.LoginLocation = location loginlog.LoginTime = utils.GetCurrntTime() - loginlog.CreateTime = utils.GetCurrntTime() loginlog.Status = "0" - loginlog.IsDel = "0" loginlog.Remark = c.Request.UserAgent() browserName, browserVersion := ua.Browser() loginlog.Browser = browserName + " " + browserVersion @@ -73,11 +71,11 @@ func Authenticator(c *gin.Context) (interface{}, error) { if err := c.ShouldBind(&loginVals); err != nil { loginlog.Status = "1" loginlog.Msg = "数据解析失败" - loginlog.UserName = loginVals.Username + loginlog.Username = loginVals.Username loginlog.Create() return nil, jwt.ErrMissingLoginValues } - loginlog.UserName = loginVals.Username + loginlog.Username = loginVals.Username if !store.Verify(loginVals.UUID, loginVals.Code, true) { loginlog.Status = "1" loginlog.Msg = "验证码错误" @@ -109,21 +107,19 @@ func Authenticator(c *gin.Context) (interface{}, error) { // @Router /logout [post] // @Security func LogOut(c *gin.Context) { - var loginlog LoginLog + var loginlog models.LoginLog ua := user_agent.New(c.Request.UserAgent()) loginlog.Ipaddr = c.ClientIP() location := utils.GetLocation(c.ClientIP()) loginlog.LoginLocation = location loginlog.LoginTime = utils.GetCurrntTime() - loginlog.CreateTime = utils.GetCurrntTime() loginlog.Status = "0" - loginlog.IsDel = "0" loginlog.Remark = c.Request.UserAgent() browserName, browserVersion := ua.Browser() loginlog.Browser = browserName + " " + browserVersion loginlog.Os = ua.OS() loginlog.Platform = ua.Platform() - loginlog.UserName = utils.GetUserName(c) + loginlog.Username = utils.GetUserName(c) loginlog.Msg = "退出成功" loginlog.Create() c.JSON(http.StatusOK, gin.H{ @@ -136,11 +132,11 @@ func LogOut(c *gin.Context) { func Authorizator(data interface{}, c *gin.Context) bool { if v, ok := data.(map[string]interface{}); ok { - u, _ := v["user"].(SysUser) - r, _ := v["role"].(SysRole) - c.Set("role", r.Name) - c.Set("roleIds", r.Id) - c.Set("userId", u.Id) + u, _ := v["user"].(models.SysUser) + r, _ := v["role"].(models.SysRole) + c.Set("role", r.RoleName) + c.Set("roleIds", r.RoleId) + c.Set("userId", u.UserId) c.Set("userName", u.UserName) c.Set("dataScope", r.DataScope) diff --git a/handler/nofound.go b/handler/nofound.go index f2a03ae..093cd28 100644 --- a/handler/nofound.go +++ b/handler/nofound.go @@ -4,13 +4,14 @@ import ( "github.com/gin-gonic/gin" jwt "go-admin/pkg/jwtauth" "log" + "net/http" ) func NoFound(c *gin.Context) { claims := jwt.ExtractClaims(c) log.Printf("NoRoute claims: %#v\n", claims) - c.JSON(404, gin.H{ - "code": "NOT_FOUND", + c.JSON(http.StatusOK, gin.H{ + "code": "404", "message": "not found", }) } diff --git a/handler/ping.go b/handler/ping.go new file mode 100644 index 0000000..30a7373 --- /dev/null +++ b/handler/ping.go @@ -0,0 +1,11 @@ +package handler + +import ( + "github.com/gin-gonic/gin" +) + +func Ping(c *gin.Context) { + c.JSON(200, gin.H{ + "message": "ok", + }) +} \ No newline at end of file diff --git a/handler/sd/check.go b/handler/sd/check.go index 6f0eed7..705228f 100644 --- a/handler/sd/check.go +++ b/handler/sd/check.go @@ -7,7 +7,7 @@ import ( "github.com/shirou/gopsutil/disk" "github.com/shirou/gopsutil/load" "github.com/shirou/gopsutil/mem" - "go-admin/utils" + "go-admin/pkg/app" "net/http" "runtime" "time" @@ -29,8 +29,7 @@ const ( // @Router /sd/health [get] // @BasePath func HealthCheck(c *gin.Context) { - message := "OK" - c.String(http.StatusOK, "\n"+message) + app.OK(c, "", "OK") } // @Summary 服务器硬盘使用量 @@ -70,28 +69,27 @@ func DiskCheck(c *gin.Context) { // @Description Os // @Accept text/html // @Produce text/html -// @Success 200 {string} string "OK - Free space: 455MB (0GB) / 8192MB (8GB) | Used: 5%" -// @Failure 500 {string} string "CRITICAL" -// @Failure 429 {string} string "WARNING" +// @Success 200 {string} string "" // @Router /sd/os [get] // @BasePath func OSCheck(c *gin.Context) { - fmt.Println(runtime.GOOS) //取得操作系统版本 - fmt.Println(runtime.Compiler) //取得编译器名称-gc - fmt.Println(runtime.NumCPU()) //取得CPU多核的数目 - fmt.Println(runtime.Version()) - status := http.StatusOK - c.String(status, runtime.GOOS+"/"+runtime.GOARCH+"/"+utils.IntToString(runtime.NumCPU())) + app.Custum(c, gin.H{ + "code": 200, + "status": status, + "goOs": runtime.GOOS, + "compiler": runtime.Compiler, + "numCpu": runtime.NumCPU(), + "version": runtime.Version(), + "numGoroutine": runtime.NumGoroutine(), + }) } // @Summary CPU 使用量 // @Description CPU 使用量 DiskCheck checks the disk usage. // @Accept text/html // @Produce text/html -// @Success 200 {string} string "OK - Load average: 2.39, 2.13, 1.97 | Cores: 2" -// @Failure 500 {string} string "CRITICAL" -// @Failure 429 {string} string "WARNING" +// @Success 200 {string} string "" // @Router /sd/cpu [get] // @BasePath func CPUCheck(c *gin.Context) { @@ -104,8 +102,6 @@ func CPUCheck(c *gin.Context) { } } - fmt.Println(c) - a, _ := load.Avg() l1 := a.Load1 l5 := a.Load5 @@ -121,27 +117,29 @@ func CPUCheck(c *gin.Context) { status = http.StatusTooManyRequests text = "WARNING" } - - message := fmt.Sprintf("%s - Load average: %.2f, %.2f, %.2f | Cores: %d", text, l1, l5, l15, cores) - c.String(status, "\n"+message) + app.Custum(c, gin.H{ + "code": 200, + "msg": text, + "status": status, + "cores": cores, + "load1": l1, + "load5": l5, + "load15": l15, + }) } // @Summary 内存使用量 // @Description 内存使用量 RAMCheck checks the disk usage. // @Accept text/html // @Produce text/html -// @Success 200 {string} string "OK - Free space: 455MB (0GB) / 8192MB (8GB) | Used: 5%" -// @Failure 500 {string} string "CRITICAL" -// @Failure 429 {string} string "WARNING" +// @Success 200 {string} string "" // @Router /sd/ram [get] // @BasePath func RAMCheck(c *gin.Context) { u, _ := mem.VirtualMemory() usedMB := int(u.Used) / MB - usedGB := int(u.Used) / GB totalMB := int(u.Total) / MB - totalGB := int(u.Total) / GB usedPercent := int(u.UsedPercent) status := http.StatusOK @@ -155,6 +153,13 @@ func RAMCheck(c *gin.Context) { text = "WARNING" } - message := fmt.Sprintf("%s - Free space: %dMB (%dGB) / %dMB (%dGB) | Used: %d%%", text, usedMB, usedGB, totalMB, totalGB, usedPercent) - c.String(status, "\n"+message) + + app.Custum(c, gin.H{ + "code": 200, + "msg": text, + "status": status, + "used": usedMB, + "total": totalMB, + "usedPercent": usedPercent, + }) } diff --git a/main.go b/main.go index d1da388..dc6762f 100644 --- a/main.go +++ b/main.go @@ -1,12 +1,18 @@ package main import ( + "context" "github.com/gin-gonic/gin" "go-admin/config" orm "go-admin/database" "go-admin/models" + "go-admin/models/gorm" "go-admin/router" "log" + "net/http" + "os" + "os/signal" + "time" ) // @title go-admin API @@ -23,20 +29,51 @@ import ( func main() { gin.SetMode(gin.DebugMode) - log.Println(config.DatabaseConfig.Port) + + err := gorm.AutoMigrate(orm.Eloquent) + if err != nil { + log.Fatalln("数据库初始化失败 err: %v", err) + } + if config.ApplicationConfig.IsInit { if err := models.InitDb(); err != nil { - log.Fatal("数据库初始化失败!") + log.Fatal("数据库基础数据初始化失败!") } else { config.SetApplicationIsInit() } } + r := router.InitRouter() defer orm.Eloquent.Close() - if err := r.Run(config.ApplicationConfig.Host + ":" + config.ApplicationConfig.Port); err != nil { - log.Fatal(err) + //if err := r.Run(config.ApplicationConfig.Host + ":" + config.ApplicationConfig.Port); err != nil { + // log.Fatal(err) + //} + + srv := &http.Server{ + Addr: config.ApplicationConfig.Host + ":" + config.ApplicationConfig.Port, + Handler: r, } + go func() { + // 服务连接 + if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed { + log.Fatalf("listen: %s\n", err) + } + }() + log.Println("Server Run ", config.ApplicationConfig.Host+":"+config.ApplicationConfig.Port) + log.Println("Enter Control + C Shutdown Server") + // 等待中断信号以优雅地关闭服务器(设置 5 秒的超时时间) + quit := make(chan os.Signal) + signal.Notify(quit, os.Interrupt) + <-quit + log.Println("Shutdown Server ...") + + ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) + defer cancel() + if err := srv.Shutdown(ctx); err != nil { + log.Fatal("Server Shutdown:", err) + } + log.Println("Server exiting") } diff --git a/models/casbinrule.go b/models/casbinrule.go index 28148d6..1ed1e30 100644 --- a/models/casbinrule.go +++ b/models/casbinrule.go @@ -2,11 +2,15 @@ package models //casbin_rule type CasbinRule struct { - PType string `json:"p_type" gorm:"column:p_type"` - V0 string `json:"v0" gorm:"column:v0"` - V1 string `json:"v1" gorm:"column:v1"` - V2 string `json:"v2" gorm:"column:v2"` - V3 string `json:"v3" gorm:"column:v3"` - V4 string `json:"v4" gorm:"column:v4"` - V5 string `json:"v5" gorm:"column:v5"` + PType string `json:"p_type" gorm:"type:varchar(100);"` + V0 string `json:"v0" gorm:"type:varchar(100);"` + V1 string `json:"v1" gorm:"type:varchar(100);"` + V2 string `json:"v2" gorm:"type:varchar(100);"` + V3 string `json:"v3" gorm:"type:varchar(100);"` + V4 string `json:"v4" gorm:"type:varchar(100);"` + V5 string `json:"v5" gorm:"type:varchar(100);"` +} + +func (CasbinRule) TableName() string { + return "casbin_rule" } diff --git a/models/config.go b/models/config.go index 6b98fb3..ae0b53e 100644 --- a/models/config.go +++ b/models/config.go @@ -2,39 +2,30 @@ package models import ( orm "go-admin/database" - "go-admin/utils" + "go-admin/pkg/utils" ) -type Config struct { +type SysConfig struct { + ConfigId int `json:"configId" gorm:"primary_key;auto_increment;"` //编码 + ConfigName string `json:"configName" gorm:"type:varchar(128);"` //参数名称 + ConfigKey string `json:"configKey" gorm:"type:varchar(128);"` //参数键名 + ConfigValue string `json:"configValue" gorm:"type:varchar(255);"` //参数键值 + ConfigType string `json:"configType" gorm:"type:varchar(64);"` //是否系统内置 + Remark string `json:"remark" gorm:"type:varchar(128);"` //备注 + CreateBy string `json:"createBy" gorm:"type:varchar(128);"` + UpdateBy string `json:"updateBy" gorm:"type:varchar(128);"` + DataScope string `json:"dataScope" gorm:"-"` + Params string `json:"params" gorm:"-"` + BaseModel +} - //编码 - ConfigId int64 `json:"configId" gorm:"column:config_id;primary_key"` - //参数名称 - ConfigName string `json:"configName" gorm:"column:config_name"` - //参数键名 - ConfigKey string `json:"configKey" gorm:"column:config_key"` - //参数键值 - ConfigValue string `json:"configValue" gorm:"column:config_value"` - //是否系统内置 - ConfigType string `json:"configType" gorm:"column:config_type"` - //备注 - Remark string `json:"remark" gorm:"column:remark"` - - CreateBy string `json:"createBy" gorm:"column:create_by"` - CreateTime string `json:"createTime" gorm:"column:create_time"` - UpdateBy string `json:"updateBy" gorm:"column:update_by"` - UpdateTime string `json:"updateTime" gorm:"column:update_time"` - DataScope string `json:"dataScope" gorm:"-"` - Params string `json:"params" gorm:"column:params"` - IsDel int `json:"isDel" gorm:"column:is_del"` +func (SysConfig) TableName() string { + return "sys_config" } // Config 创建 -func (e *Config) Create() (Config, error) { - var doc Config - doc.IsDel = 0 - e.CreateTime = utils.GetCurrntTime() - e.UpdateTime = utils.GetCurrntTime() +func (e *SysConfig) Create() (SysConfig, error) { + var doc SysConfig result := orm.Eloquent.Table("sys_config").Create(&e) if result.Error != nil { err := result.Error @@ -45,8 +36,8 @@ func (e *Config) Create() (Config, error) { } // 获取 Config -func (e *Config) Get() (Config, error) { - var doc Config +func (e *SysConfig) Get() (SysConfig, error) { + var doc SysConfig table := orm.Eloquent.Table("sys_config") if e.ConfigId != 0 { @@ -57,14 +48,14 @@ func (e *Config) Get() (Config, error) { table = table.Where("config_key = ?", e.ConfigKey) } - if err := table.Where("is_del = 0").First(&doc).Error; err != nil { + if err := table.First(&doc).Error; err != nil { return doc, err } return doc, nil } -func (e *Config) GetPage(pageSize int, pageIndex int) ([]Config, int32, error) { - var doc []Config +func (e *SysConfig) GetPage(pageSize int, pageIndex int) ([]SysConfig, int, error) { + var doc []SysConfig table := orm.Eloquent.Select("*").Table("sys_config") @@ -80,20 +71,19 @@ func (e *Config) GetPage(pageSize int, pageIndex int) ([]Config, int32, error) { // 数据权限控制 dataPermission := new(DataPermission) - dataPermission.UserId, _ = utils.StringToInt64(e.DataScope) + dataPermission.UserId, _ = utils.StringToInt(e.DataScope) table = dataPermission.GetDataScope("sys_config", table) - var count int32 + var count int - if err := table.Where("is_del = 0").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { + if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { return nil, 0, err } - table.Where("is_del = 0").Count(&count) + table.Count(&count) return doc, count, nil } -func (e *Config) Update(id int64) (update Config, err error) { - e.UpdateTime = utils.GetCurrntTime() +func (e *SysConfig) Update(id int) (update SysConfig, err error) { if err = orm.Eloquent.Table("sys_config").Where("config_id = ?", id).First(&update).Error; err != nil { return } @@ -106,12 +96,8 @@ func (e *Config) Update(id int64) (update Config, err error) { return } -func (e *Config) Delete(id int64) (success bool, err error) { - var mp = map[string]string{} - mp["is_del"] = "1" - mp["update_time"] = utils.GetCurrntTime() - mp["update_by"] = e.UpdateBy - if err = orm.Eloquent.Table("sys_config").Where("config_id = ?", id).Update(mp).Error; err != nil { +func (e *SysConfig) Delete() (success bool, err error) { + if err = orm.Eloquent.Table("sys_config").Where("config_id = ?", e.ConfigId).Delete(&SysConfig{}).Error; err != nil { success = false return } diff --git a/models/datascope.go b/models/datascope.go index f984779..2202e11 100644 --- a/models/datascope.go +++ b/models/datascope.go @@ -2,22 +2,22 @@ package models import ( "github.com/jinzhu/gorm" - "go-admin/utils" + "go-admin/pkg/utils" ) type DataPermission struct { DataScope string - UserId int64 - DeptId int64 - RoleId int64 + UserId int + DeptId int + RoleId int } func (e *DataPermission) GetDataScope(tbname string, table *gorm.DB) *gorm.DB { SysUser := new(SysUser) SysRole := new(SysRole) - SysUser.Id = e.UserId + SysUser.UserId = e.UserId user, _ := SysUser.Get() - SysRole.Id = user.RoleId + SysRole.RoleId = user.RoleId role, _ := SysRole.Get() if role.DataScope == "2" { @@ -27,7 +27,7 @@ func (e *DataPermission) GetDataScope(tbname string, table *gorm.DB) *gorm.DB { table = table.Where(tbname+".create_by in (SELECT user_id from sys_user where dept_id = ? )", user.DeptId) } if role.DataScope == "4" { - table = table.Where(tbname+".create_by in (SELECT user_id from sys_user where sys_user.dept_id in(select dept_id from sys_dept where dept_path like ? ))", "%"+utils.Int64ToString(user.DeptId)+"%") + table = table.Where(tbname+".create_by in (SELECT user_id from sys_user where sys_user.dept_id in(select dept_id from sys_dept where dept_path like ? ))", "%"+utils.IntToString(user.DeptId)+"%") } if role.DataScope == "5" || role.DataScope == "" { table = table.Where(tbname+".create_by = ?", e.UserId) diff --git a/models/dept.go b/models/dept.go index 15c46c7..d9d0237 100644 --- a/models/dept.go +++ b/models/dept.go @@ -2,63 +2,45 @@ package models import ( orm "go-admin/database" - "go-admin/utils" + "go-admin/pkg/utils" ) type Dept struct { - //部门编码 - Deptid int64 `gorm:"column:dept_id;primary_key" json:"deptId" example:"1" extensions:"x-description=标示"` + DeptId int `json:"deptId" gorm:"primary_key;AUTO_INCREMENT"` //部门编码 + ParentId int `json:"parentId" gorm:"type:int(11);"` //上级部门 + DeptPath string `json:"deptPath" gorm:"type:varchar(255);"` // + DeptName string `json:"deptName" gorm:"type:varchar(128);"` //部门名称 + Sort int `json:"sort" gorm:"type:int(4);"` //排序 + Leader string `json:"leader" gorm:"type:varchar(128);"` //负责人 + Phone string `json:"phone" gorm:"type:varchar(11);"` //手机 + Email string `json:"email" gorm:"type:varchar(64);"` //邮箱 + Status string `json:"status" gorm:"type:int(1);"` //状态 + CreateBy string `json:"createBy" gorm:"type:varchar(64);"` + UpdateBy string `json:"updateBy" gorm:"type:varchar(64);"` + DataScope string `json:"dataScope" gorm:"-"` + Params string `json:"params" gorm:"-"` + Children []Dept `json:"children" gorm:"-"` + BaseModel +} - //上级部门 - ParentId int64 `gorm:"column:parent_id" json:"parent_id"` - - DeptPath string `gorm:"column:dept_path" json:"deptath"` - - //部门名称 - Deptname string `gorm:"column:dept_name" json:"deptname"` - - //排序 - Sort int64 `gorm:"column:sort" json:"sort"` - - //负责人 - Leader string `gorm:"column:leader" json:"leader"` - - //手机 - Phone string `gorm:"column:phone" json:"phone"` - - //邮箱 - Email string `gorm:"column:email" json:"email"` - - //状态 - Status string `gorm:"column:status" json:"status"` - - CreateBy string `gorm:"column:create_by" json:"createBy"` - CreateTime string `gorm:"column:create_time" json:"createTime"` - UpdateBy string `gorm:"column:update_by" json:"updateBy"` - UpdateTime string `gorm:"column:update_time" json:"updateTime"` - DataScope string `gorm:"-" json:"dataScope"` - Params string `gorm:"-" json:"params"` - IsDel int `gorm:"column:is_del" json:"isDel"` - Children []Dept `gorm:"-"json:"children"` +func (Dept) TableName() string { + return "sys_dept" } type DeptLable struct { - Id int64 `gorm:"-" json:"id"` + Id int `gorm:"-" json:"id"` Label string `gorm:"-" json:"label"` Children []DeptLable `gorm:"-" json:"children"` } func (e *Dept) Create() (Dept, error) { var doc Dept - e.CreateTime = utils.GetCurrntTime() - e.UpdateTime = utils.GetCurrntTime() - e.IsDel = 0 result := orm.Eloquent.Table("sys_dept").Create(&e) if result.Error != nil { err := result.Error return doc, err } - deptPath := "/" + utils.Int64ToString(e.Deptid) + deptPath := "/" + utils.IntToString(e.DeptId) if int(e.ParentId) != 0 { var deptP Dept orm.Eloquent.Table("sys_dept").Where("dept_id = ?", e.ParentId).First(&deptP) @@ -68,7 +50,7 @@ func (e *Dept) Create() (Dept, error) { } var mp = map[string]string{} mp["deptPath"] = deptPath - if err := orm.Eloquent.Table("sys_dept").Where("dept_id = ?", e.Deptid).Update(mp).Error; err != nil { + if err := orm.Eloquent.Table("sys_dept").Where("dept_id = ?", e.DeptId).Update(mp).Error; err != nil { err := result.Error return doc, err } @@ -81,14 +63,14 @@ func (e *Dept) Get() (Dept, error) { var doc Dept table := orm.Eloquent.Table("sys_dept") - if e.Deptid != 0 { - table = table.Where("dept_id = ?", e.Deptid) + if e.DeptId != 0 { + table = table.Where("dept_id = ?", e.DeptId) } - if e.Deptname != "" { - table = table.Where("dept_name = ?", e.Deptname) + if e.DeptName != "" { + table = table.Where("dept_name = ?", e.DeptName) } - if err := table.Where("is_del = 0").First(&doc).Error; err != nil { + if err := table.First(&doc).Error; err != nil { return doc, err } return doc, nil @@ -98,17 +80,17 @@ func (e *Dept) GetList() ([]Dept, error) { var doc []Dept table := orm.Eloquent.Table("sys_dept") - if e.Deptid != 0 { - table = table.Where("dept_id = ?", e.Deptid) + if e.DeptId != 0 { + table = table.Where("dept_id = ?", e.DeptId) } - if e.Deptname != "" { - table = table.Where("dept_name = ?", e.Deptname) + if e.DeptName != "" { + table = table.Where("dept_name = ?", e.DeptName) } if e.Status != "" { table = table.Where("status = ?", e.Status) } - if err := table.Where("is_del = 0").Order("sort").Find(&doc).Error; err != nil { + if err := table.Order("sort").Find(&doc).Error; err != nil { return doc, err } return doc, nil @@ -118,11 +100,11 @@ func (e *Dept) GetPage(bl bool) ([]Dept, error) { var doc []Dept table := orm.Eloquent.Select("*").Table("sys_dept") - if e.Deptid != 0 { - table = table.Where("dept_id = ?", e.Deptid) + if e.DeptId != 0 { + table = table.Where("dept_id = ?", e.DeptId) } - if e.Deptname != "" { - table = table.Where("dept_name = ?", e.Deptname) + if e.DeptName != "" { + table = table.Where("dept_name = ?", e.DeptName) } if e.Status != "" { table = table.Where("status = ?", e.Status) @@ -133,11 +115,11 @@ func (e *Dept) GetPage(bl bool) ([]Dept, error) { if bl { // 数据权限控制 dataPermission := new(DataPermission) - dataPermission.UserId, _ = utils.StringToInt64(e.DataScope) + dataPermission.UserId, _ = utils.StringToInt(e.DataScope) table = dataPermission.GetDataScope("sys_dept", table) } - if err := table.Where("is_del = 0").Order("sort").Find(&doc).Error; err != nil { + if err := table.Order("sort").Find(&doc).Error; err != nil { return nil, err } return doc, nil @@ -164,22 +146,19 @@ func Digui(deptlist *[]Dept, menu Dept) Dept { min := make([]Dept, 0) for j := 0; j < len(list); j++ { - if menu.Deptid != list[j].ParentId { + if menu.DeptId != list[j].ParentId { continue } mi := Dept{} - mi.Deptid = list[j].Deptid + mi.DeptId = list[j].DeptId mi.ParentId = list[j].ParentId mi.DeptPath = list[j].DeptPath - mi.Deptname = list[j].Deptname + mi.DeptName = list[j].DeptName mi.Sort = list[j].Sort mi.Leader = list[j].Leader mi.Phone = list[j].Phone mi.Email = list[j].Email mi.Status = list[j].Status - mi.CreateTime = list[j].CreateTime - mi.UpdateTime = list[j].UpdateTime - mi.IsDel = list[j].IsDel mi.Children = []Dept{} ms := Digui(deptlist, mi) min = append(min, ms) @@ -189,13 +168,12 @@ func Digui(deptlist *[]Dept, menu Dept) Dept { return menu } -func (e *Dept) Update(id int64) (update Dept, err error) { - e.UpdateTime = utils.GetCurrntTime() +func (e *Dept) Update(id int) (update Dept, err error) { if err = orm.Eloquent.Table("sys_dept").Where("dept_id = ?", id).First(&update).Error; err != nil { return } - deptPath := "/" + utils.Int64ToString(e.Deptid) + deptPath := "/" + utils.IntToString(e.DeptId) if int(e.ParentId) != 0 { var deptP Dept orm.Eloquent.Table("sys_dept").Where("dept_id = ?", e.ParentId).First(&deptP) @@ -213,12 +191,8 @@ func (e *Dept) Update(id int64) (update Dept, err error) { return } -func (e *Dept) Delete(id int64) (success bool, err error) { - var mp = map[string]string{} - mp["is_del"] = "1" - mp["update_time"] = utils.GetCurrntTime() - mp["update_by"] = e.UpdateBy - if err = orm.Eloquent.Table("sys_dept").Where("dept_id = ?", id).Update(mp).Error; err != nil { +func (e *Dept) Delete(id int) (success bool, err error) { + if err = orm.Eloquent.Table("sys_dept").Where("dept_id = ?", e.DeptId).Delete(&Dept{}).Error; err != nil { success = false return } @@ -235,8 +209,8 @@ func (dept *Dept) SetDeptLable() (m []DeptLable, err error) { continue } e := DeptLable{} - e.Id = deptlist[i].Deptid - e.Label = deptlist[i].Deptname + e.Id = deptlist[i].DeptId + e.Label = deptlist[i].DeptName deptsInfo := DiguiDeptLable(&deptlist, e) m = append(m, deptsInfo) @@ -253,7 +227,7 @@ func DiguiDeptLable(deptlist *[]Dept, dept DeptLable) DeptLable { if dept.Id != list[j].ParentId { continue } - mi := DeptLable{list[j].Deptid, list[j].Deptname, []DeptLable{}} + mi := DeptLable{list[j].DeptId, list[j].DeptName, []DeptLable{}} ms := DiguiDeptLable(deptlist, mi) min = append(min, ms) diff --git a/models/dictData.go b/models/dictData.go index 9007bc5..8527981 100644 --- a/models/dictData.go +++ b/models/dictData.go @@ -2,47 +2,34 @@ package models import ( orm "go-admin/database" - "go-admin/utils" + "go-admin/pkg/utils" ) type DictData struct { - //字典编码 - DictCode int64 `gorm:"column:dict_code;primary_key" json:"dictCode" example:"1"` + DictCode int `gorm:"primary_key;AUTO_INCREMENT" json:"dictCode" example:"1"` //字典编码 + DictSort int `gorm:"type:int(4);" json:"dictSort"` //显示顺序 + DictLabel string `gorm:"type:varchar(128);" json:"dictLabel"` //数据标签 + DictValue string `gorm:"type:varchar(255);" json:"dictValue"` //数据键值 + DictType string `gorm:"type:varchar(64);" json:"dictType"` //字典类型 + CssClass string `gorm:"type:varchar(128);" json:"cssClass"` // + ListClass string `gorm:"type:varchar(128);" json:"listClass"` // + IsDefault string `gorm:"type:varchar(8);" json:"isDefault"` // + Status string `gorm:"type:int(1);" json:"status"` //状态 + Default string `gorm:"type:varchar(8);" json:"default"` // + CreateBy string `gorm:"type:varchar(64);" json:"createBy"` // + UpdateBy string `gorm:"type:varchar(64);" json:"updateBy"` // + Remark string `gorm:"type:varchar(255);" json:"remark"` //备注 + Params string `gorm:"-" json:"params"` + DataScope string `gorm:"-" json:"dataScope"` + BaseModel +} - //显示顺序 - DictSort int `gorm:"column:dict_sort" json:"dictSort" example:"1"` - - //数据标签 - DictLabel string `gorm:"column:dict_label" json:"dictLabel"` - - //数据键值 - DictValue string `gorm:"column:dict_value" json:"dictValue"` - - //字典类型 - DictType string `gorm:"column:dict_type" json:"dictType"` - CssClass string `gorm:"column:css_class" json:"cssClass"` - ListClass string `gorm:"column:list_class" json:"listClass"` - IsDefault string `gorm:"column:is_default" json:"isDefault"` - - //状态 - Status string `gorm:"column:status" json:"status"` - Default string `gorm:"column:default" json:"default"` - CreateBy string `gorm:"column:create_by" json:"createBy"` - CreateTime string `gorm:"column:create_time" json:"createTime"` - UpdateBy string `gorm:"column:update_by" json:"updateBy"` - UpdateTime string `gorm:"column:update_time" json:"updateTime"` - - //备注 - Remark string `gorm:"column:remark" json:"remark"` - Params string `gorm:"column:params" json:"params"` - DataScope string `gorm:"column:data_scope" json:"dataScope"` - IsDel int `gorm:"column:is_del" json:"isDel"` +func (DictData) TableName() string { + return "sys_dict_data" } func (e *DictData) Create() (DictData, error) { var doc DictData - e.CreateTime = utils.GetCurrntTime() - e.UpdateTime = utils.GetCurrntTime() result := orm.Eloquent.Table("sys_dict_data").Create(&e) if result.Error != nil { err := result.Error @@ -66,7 +53,7 @@ func (e *DictData) GetByCode() (DictData, error) { table = table.Where("dict_type = ?", e.DictType) } - if err := table.Where("is_del = 0").First(&doc).Error; err != nil { + if err := table.First(&doc).Error; err != nil { return doc, err } return doc, nil @@ -86,13 +73,13 @@ func (e *DictData) Get() ([]DictData, error) { table = table.Where("dict_type = ?", e.DictType) } - if err := table.Where("is_del = 0").Order("dict_sort").Find(&doc).Error; err != nil { + if err := table.Order("dict_sort").Find(&doc).Error; err != nil { return doc, err } return doc, nil } -func (e *DictData) GetPage(pageSize int, pageIndex int) ([]DictData, int32, error) { +func (e *DictData) GetPage(pageSize int, pageIndex int) ([]DictData, int, error) { var doc []DictData table := orm.Eloquent.Select("*").Table("sys_dict_data") @@ -111,20 +98,19 @@ func (e *DictData) GetPage(pageSize int, pageIndex int) ([]DictData, int32, erro // 数据权限控制 dataPermission := new(DataPermission) - dataPermission.UserId, _ = utils.StringToInt64(e.DataScope) + dataPermission.UserId, _ = utils.StringToInt(e.DataScope) table = dataPermission.GetDataScope("sys_dict_data", table) - var count int32 + var count int - if err := table.Where("is_del = 0").Order("dict_sort").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { + if err := table.Order("dict_sort").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { return nil, 0, err } - table.Where("is_del = 0").Count(&count) + table.Count(&count) return doc, count, nil } -func (e *DictData) Update(id int64) (update DictData, err error) { - e.UpdateTime = utils.GetCurrntTime() +func (e *DictData) Update(id int) (update DictData, err error) { if err = orm.Eloquent.Table("sys_dict_data").Where("dict_code = ?", id).First(&update).Error; err != nil { return } @@ -137,12 +123,8 @@ func (e *DictData) Update(id int64) (update DictData, err error) { return } -func (e *DictData) Delete(id int64) (success bool, err error) { - var mp = map[string]string{} - mp["is_del"] = "1" - mp["update_time"] = utils.GetCurrntTime() - mp["update_by"] = e.UpdateBy - if err = orm.Eloquent.Table("sys_dict_data").Where("dict_code = ?", id).Update(mp).Error; err != nil { +func (e *DictData) Delete(id int) (success bool, err error) { + if err = orm.Eloquent.Table("sys_dict_data").Where("dict_code = ?", id).Delete(&DictData{}).Error; err != nil { success = false return } diff --git a/models/dictType.go b/models/dictType.go index 9f27601..cb67184 100644 --- a/models/dictType.go +++ b/models/dictType.go @@ -2,38 +2,28 @@ package models import ( orm "go-admin/database" - "go-admin/utils" + "go-admin/pkg/utils" ) type DictType struct { - DictId int64 `gorm:"column:dict_id;primary_key" json:"dictId" example:"1"` - //字典名称 - DictName string `gorm:"column:dict_name" json:"dictName"` - //字典类型 - DictType string `gorm:"column:dict_type" json:"dictType"` - //状态 - Status string `gorm:"column:status" json:"status"` + DictId int `gorm:"primary_key;AUTO_INCREMENT" json:"dictId"` + DictName string `gorm:"type:varchar(128);" json:"dictName"` //字典名称 + DictType string `gorm:"type:varchar(128);" json:"dictType"` //字典类型 + Status string `gorm:"type:int(1);" json:"status"` //状态 + DataScope string `gorm:"-" json:"dataScope"` // + Params string `gorm:"-" json:"params"` // + CreateBy string `gorm:"type:varchar(11);" json:"createBy"` //创建者 + UpdateBy string `gorm:"type:varchar(11);" json:"updateBy"` //更新者 + Remark string `gorm:"type:varchar(255);" json:"remark"` //备注 + BaseModel +} - DataScope string `gorm:"-" json:"dataScope"` - - Params string `gorm:"-" json:"params"` - //创建者 - CreateBy string `gorm:"column:create_by" json:"createBy"` - //创建时间 - CreateTime string `gorm:"column:create_time" json:"createTime"` - //更新者 - UpdateBy string `gorm:"column:update_by" json:"updateBy"` - //更新时间 - UpdateTime string `gorm:"column:update_time" json:"updateTime"` - //备注 - Remark string `gorm:"column:remark" json:"remark"` - IsDel int `gorm:"column:is_del" json:"isDel"` +func (DictType) TableName() string { + return "sys_dict_type" } func (e *DictType) Create() (DictType, error) { var doc DictType - e.CreateTime = utils.GetCurrntTime() - e.UpdateTime = utils.GetCurrntTime() result := orm.Eloquent.Table("sys_dict_type").Create(&e) if result.Error != nil { err := result.Error @@ -57,7 +47,7 @@ func (e *DictType) Get() (DictType, error) { table = table.Where("dict_type = ?", e.DictType) } - if err := table.Where("is_del = 0").First(&doc).Error; err != nil { + if err := table.First(&doc).Error; err != nil { return doc, err } return doc, nil @@ -77,13 +67,13 @@ func (e *DictType) GetList() ([]DictType, error) { table = table.Where("dict_type = ?", e.DictType) } - if err := table.Where("is_del = 0").Find(&doc).Error; err != nil { + if err := table.Find(&doc).Error; err != nil { return doc, err } return doc, nil } -func (e *DictType) GetPage(pageSize int, pageIndex int) ([]DictType, int32, error) { +func (e *DictType) GetPage(pageSize int, pageIndex int) ([]DictType, int, error) { var doc []DictType table := orm.Eloquent.Select("*").Table("sys_dict_type") @@ -96,20 +86,19 @@ func (e *DictType) GetPage(pageSize int, pageIndex int) ([]DictType, int32, erro // 数据权限控制 dataPermission := new(DataPermission) - dataPermission.UserId, _ = utils.StringToInt64(e.DataScope) + dataPermission.UserId, _ = utils.StringToInt(e.DataScope) table = dataPermission.GetDataScope("sys_dict_type", table) - var count int32 + var count int - if err := table.Where("is_del = 0").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { + if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { return nil, 0, err } - table.Where("is_del = 0").Count(&count) + table.Count(&count) return doc, count, nil } -func (e *DictType) Update(id int64) (update DictType, err error) { - e.UpdateTime = utils.GetCurrntTime() +func (e *DictType) Update(id int) (update DictType, err error) { if err = orm.Eloquent.Table("sys_dict_type").First(&update, id).Error; err != nil { return } @@ -122,12 +111,8 @@ func (e *DictType) Update(id int64) (update DictType, err error) { return } -func (e *DictType) Delete(id int64) (success bool, err error) { - var mp = map[string]string{} - mp["is_del"] = "1" - mp["update_time"] = utils.GetCurrntTime() - mp["update_by"] = e.UpdateBy - if err = orm.Eloquent.Table("sys_dict_type").Where("dict_id = ?", id).Update(mp).Error; err != nil { +func (e *DictType) Delete(id int) (success bool, err error) { + if err = orm.Eloquent.Table("sys_dict_type").Where("dict_id = ?", id).Delete(&DictData{}).Error; err != nil { success = false return } diff --git a/models/gorm/gorm.go b/models/gorm/gorm.go new file mode 100644 index 0000000..c921017 --- /dev/null +++ b/models/gorm/gorm.go @@ -0,0 +1,32 @@ +package gorm + +import ( + "github.com/jinzhu/gorm" + "go-admin/config" + "go-admin/models" + "go-admin/models/tools" +) + +func AutoMigrate(db *gorm.DB) error { + if config.DatabaseConfig.Dbtype == "mysql" { + db = db.Set("gorm:table_options", "ENGINE=InnoDB CHARSET=utf8mb4") + } + db.SingularTable(true) + return db.AutoMigrate( + new(models.CasbinRule), + new(tools.SysTables), + new(tools.SysColumns), + new(models.Dept), + new(models.Menu), + new(models.LoginLog), + new(models.SysOperLog), + new(models.RoleMenu), + new(models.SysRoleDept), + new(models.SysUser), + new(models.SysRole), + new(models.Post), + new(models.DictData), + new(models.SysConfig), + new(models.DictType), + ).Error +} diff --git a/models/initdb.go b/models/initdb.go index ade0277..d144b0e 100644 --- a/models/initdb.go +++ b/models/initdb.go @@ -16,7 +16,7 @@ func InitDb() error { } sql, err := Ioutil(filePath) if err != nil { - fmt.Println("数据库初始化脚本读取失败!原因:", err.Error()) + fmt.Println("数据库基础数据初始化脚本读取失败!原因:", err.Error()) return err } sqlList := strings.Split(sql, ";") diff --git a/models/login.go b/models/login.go index 91306e1..9c207cf 100644 --- a/models/login.go +++ b/models/login.go @@ -19,7 +19,7 @@ func (u *Login) GetUser() (user SysUser, role SysRole, e error) { e = orm.Eloquent.Table("sys_user").Where("username = ? ", u.Username).Find(&user).Error if e != nil { if strings.Contains(e.Error(), "record not found") { - pkg.AssertErr(e, "账号或密码错误(代码204)", 500) + pkg.HasError(e, "账号或密码错误(代码204)", 500) } log.Print(e) return @@ -27,7 +27,7 @@ func (u *Login) GetUser() (user SysUser, role SysRole, e error) { _, e = pkg.CompareHashAndPassword(user.Password, u.Password) if e != nil { if strings.Contains(e.Error(), "hashedPassword is not the hash of the given password") { - pkg.AssertErr(e, "账号或密码错误(代码201)", 500) + pkg.HasError(e, "账号或密码错误(代码201)", 500) } log.Print(e) return diff --git a/models/loginlog.go b/models/loginlog.go index 4d426c5..b5cf563 100644 --- a/models/loginlog.go +++ b/models/loginlog.go @@ -2,45 +2,30 @@ package models import ( orm "go-admin/database" - "go-admin/utils" + "time" ) type LoginLog struct { - //主键 - InfoId int64 `json:"infoId" gorm:"column:infoId;primary_key"` - //用户名 - UserName string `json:"userName" gorm:"column:userName;"` - //状态 - Status string `json:"status" gorm:"column:status;"` - //ip地址 - Ipaddr string `json:"ipaddr" gorm:"column:ipaddr;"` - //归属地 - LoginLocation string `json:"loginLocation" gorm:"column:loginLocation;"` - //浏览器 - Browser string `json:"browser" gorm:"column:browser;"` - //系统 - Os string `json:"os" gorm:"column:os;"` - // 固件 - Platform string `json:"platform" gorm:"column:platform;"` - //登录时间 - LoginTime string `json:"loginTime" gorm:"column:loginTime;"` - //创建人 - CreateBy string `json:"createBy" gorm:"column:create_by;"` - //创建时间 - CreateTime string `json:"createTime" gorm:"column:create_time;"` - //更新者 - UpdateBy string `json:"updateBy" gorm:"column:update_by;"` - //更新时间 - UpdateTime string `json:"updateTime" gorm:"column:update_time;"` - //数据 - DataScope string `json:"dataScope" gorm:"column:dataScope;"` - //参数 - Params string `json:"params" gorm:"column:params;"` - //备注 - Remark string `json:"remark" gorm:"column:remark;"` - //是否删除 - IsDel string `json:"isDel" gorm:"column:is_del;"` - Msg string `json:"msg" gorm:"column:msg;"` + InfoId int `json:"infoId" gorm:"primary_key;AUTO_INCREMENT"` //主键 + Username string `json:"username" gorm:"type:varchar(128);"` //用户名 + Status string `json:"status" gorm:"type:int(1);"` //状态 + Ipaddr string `json:"ipaddr" gorm:"type:varchar(255);"` //ip地址 + LoginLocation string `json:"loginLocation" gorm:"type:varchar(255);"` //归属地 + Browser string `json:"browser" gorm:"type:varchar(255);"` //浏览器 + Os string `json:"os" gorm:"type:varchar(255);"` //系统 + Platform string `json:"platform" gorm:"type:varchar(255);"` // 固件 + LoginTime time.Time `json:"loginTime" gorm:"type:timestamp;"` //登录时间 + CreateBy string `json:"createBy" gorm:"type:varchar(128);"` //创建人 + UpdateBy string `json:"updateBy" gorm:"type:varchar(128);"` //更新者 + DataScope string `json:"dataScope" gorm:"-"` //数据 + Params string `json:"params" gorm:"-"` // + Remark string `json:"remark" gorm:"type:varchar(255);"` //备注 + Msg string `json:"msg" gorm:"type:varchar(255);"` + BaseModel +} + +func (LoginLog) TableName() string { + return "sys_loginlog" } func (e *LoginLog) Get() (LoginLog, error) { @@ -51,16 +36,16 @@ func (e *LoginLog) Get() (LoginLog, error) { table = table.Where("ipaddr = ?", e.Ipaddr) } if e.InfoId != 0 { - table = table.Where("infoId = ?", e.InfoId) + table = table.Where("info_id = ?", e.InfoId) } - if err := table.Where("is_del = 0").First(&doc).Error; err != nil { + if err := table.First(&doc).Error; err != nil { return doc, err } return doc, nil } -func (e *LoginLog) GetPage(pageSize int, pageIndex int) ([]LoginLog, int32, error) { +func (e *LoginLog) GetPage(pageSize int, pageIndex int) ([]LoginLog, int, error) { var doc []LoginLog table := orm.Eloquent.Select("*").Table("sys_loginlog") @@ -70,23 +55,21 @@ func (e *LoginLog) GetPage(pageSize int, pageIndex int) ([]LoginLog, int32, erro if e.Status != "" { table = table.Where("status = ?", e.Status) } - if e.UserName != "" { - table = table.Where("userName = ?", e.UserName) + if e.Username != "" { + table = table.Where("userName = ?", e.Username) } - var count int32 + var count int - if err := table.Where("is_del = 0").Order("infoId desc").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { + if err := table.Order("info_id desc").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { return nil, 0, err } - table.Where("is_del = 0").Count(&count) + table.Count(&count) return doc, count, nil } func (e *LoginLog) Create() (LoginLog, error) { var doc LoginLog - e.CreateTime = utils.GetCurrntTime() - e.UpdateTime = utils.GetCurrntTime() e.CreateBy = "0" e.UpdateBy = "0" result := orm.Eloquent.Table("sys_loginlog").Create(&e) @@ -98,8 +81,7 @@ func (e *LoginLog) Create() (LoginLog, error) { return doc, nil } -func (e *LoginLog) Update(id int64) (update LoginLog, err error) { - e.UpdateTime = utils.GetCurrntTime() +func (e *LoginLog) Update(id int) (update LoginLog, err error) { if err = orm.Eloquent.Table("sys_loginlog").First(&update, id).Error; err != nil { return @@ -113,8 +95,8 @@ func (e *LoginLog) Update(id int64) (update LoginLog, err error) { return } -func (e *LoginLog) BatchDelete(id []int64) (Result bool, err error) { - if err = orm.Eloquent.Table("sys_loginlog").Where("is_del=0 and infoId in (?)", id).Update(map[string]interface{}{"is_del": "1", "update_time": utils.GetCurrntTime(), "update_by": e.UpdateBy}).Error; err != nil { +func (e *LoginLog) BatchDelete(id []int) (Result bool, err error) { + if err = orm.Eloquent.Table("sys_loginlog").Where("info_id in (?)", id).Delete(&LoginLog{}).Error; err != nil { return } Result = true diff --git a/models/menu.go b/models/menu.go index 7d6916a..dd5d9c4 100644 --- a/models/menu.go +++ b/models/menu.go @@ -3,46 +3,48 @@ package models import ( "errors" orm "go-admin/database" - "go-admin/utils" + "go-admin/pkg/utils" ) type Menu struct { - MenuId int64 `json:"menuId" gorm:"column:menu_id;primary_key"` - MenuName string `json:"menuName" gorm:"column:menu_name"` - Title string `json:"title" gorm:"column:title"` - Icon string `json:"icon" gorm:"column:icon"` - Path string `json:"path" gorm:"column:path"` - Paths string `json:"paths" gorm:"column:paths"` - MenuType string `json:"menuType" gorm:"column:menu_type"` - Action string `json:"action" gorm:"column:action"` - Permission string `json:"permission" gorm:"column:permission"` - ParentId int64 `json:"parentId" gorm:"column:parent_id"` - NoCache bool `json:"noCache" gorm:"column:no_cache"` - Breadcrumb string `json:"breadcrumb" gorm:"column:breadcrumb"` - Component string `json:"component" gorm:"column:component"` - Sort int `json:"sort" gorm:"column:sort"` - - Visible string `json:"visible" gorm:"column:visible"` - Children []Menu `json:"children" gorm:"-"` - IsSelect bool `json:"is_select" gorm:"-"` - RoleId int64 `gorm:"-"` - - CreateBy string `json:"createBy" gorm:"column:create_by"` - CreateTime string `json:"createTime" gorm:"column:create_time"` - UpdateBy string `json:"updateBy" gorm:"column:update_by"` - UpdateTime string `json:"updateTime" gorm:"column:update_time"` + MenuId int `json:"menuId" gorm:"primary_key;AUTO_INCREMENT"` + MenuName string `json:"menuName" gorm:"type:varchar(11);"` + Title string `json:"title" gorm:"type:varchar(64);"` + Icon string `json:"icon" gorm:"type:varchar(128);"` + Path string `json:"path" gorm:"type:varchar(128);"` + Paths string `json:"paths" gorm:"type:varchar(128);"` + MenuType string `json:"menuType" gorm:"type:varchar(1);"` + Action string `json:"action" gorm:"type:varchar(16);"` + Permission string `json:"permission" gorm:"type:varchar(32);"` + ParentId int `json:"parentId" gorm:"type:int(11);"` + NoCache bool `json:"noCache" gorm:"type:char(1);"` + Breadcrumb string `json:"breadcrumb" gorm:"type:varchar(255);"` + Component string `json:"component" gorm:"type:varchar(255);"` + Sort int `json:"sort" gorm:"type:int(4);"` + Visible string `json:"visible" gorm:"type:char(1);"` + CreateBy string `json:"createBy" gorm:"type:varchar(128);"` + UpdateBy string `json:"updateBy" gorm:"type:varchar(128);"` + IsFrame string `json:"isFrame" gorm:"type:int(1);DEFAULT:0;"` DataScope string `json:"dataScope" gorm:"-"` Params string `json:"params" gorm:"-"` - IsDel int `json:"isDel" gorm:"column:is_del"` + RoleId int `gorm:"-"` + Children []Menu `json:"children" gorm:"-"` + IsSelect bool `json:"is_select" gorm:"-"` + BaseModel } + +func (Menu) TableName() string { + return "sys_menu" +} + type MenuLable struct { - Id int64 `json:"id" gorm:"-"` + Id int `json:"id" gorm:"-"` Label string `json:"label" gorm:"-"` Children []MenuLable `json:"children" gorm:"-"` } type Menus struct { - MenuId int64 `json:"menuId" gorm:"column:menu_id;primary_key"` + MenuId int `json:"menuId" gorm:"column:menu_id;primary_key"` MenuName string `json:"menuName" gorm:"column:menu_name"` Title string `json:"title" gorm:"column:title"` Icon string `json:"icon" gorm:"column:icon"` @@ -50,7 +52,7 @@ type Menus struct { MenuType string `json:"menuType" gorm:"column:menu_type"` Action string `json:"action" gorm:"column:action"` Permission string `json:"permission" gorm:"column:permission"` - ParentId int64 `json:"parentId" gorm:"column:parent_id"` + ParentId int `json:"parentId" gorm:"column:parent_id"` NoCache bool `json:"noCache" gorm:"column:no_cache"` Breadcrumb string `json:"breadcrumb" gorm:"column:breadcrumb"` Component string `json:"component" gorm:"column:component"` @@ -59,13 +61,11 @@ type Menus struct { Visible string `json:"visible" gorm:"column:visible"` Children []Menu `json:"children" gorm:"-"` - CreateBy string `json:"createBy" gorm:"column:create_by"` - CreateTime string `json:"createTime" gorm:"column:create_time"` - UpdateBy string `json:"updateBy" gorm:"column:update_by"` - UpdateTime string `json:"updateTime" gorm:"column:update_time"` - DataScope string `json:"dataScope" gorm:"-"` - Params string `json:"params" gorm:"-"` - IsDel int `json:"isDel" gorm:"column:is_del"` + CreateBy string `json:"createBy" gorm:"column:create_by"` + UpdateBy string `json:"updateBy" gorm:"column:update_by"` + DataScope string `json:"dataScope" gorm:"-"` + Params string `json:"params" gorm:"-"` + BaseModel } type MenuRole struct { @@ -78,7 +78,6 @@ type MS []Menu func (e *Menu) GetByMenuId() (Menu Menu, err error) { table := orm.Eloquent.Table("sys_menu") - table = table.Where("is_del = ?", 0) table = table.Where("menu_id = ?", e.MenuId) if err = table.Find(&Menu).Error; err != nil { return @@ -124,9 +123,6 @@ func DiguiMenu(menulist *[]Menu, menu Menu) Menu { mi.Breadcrumb = list[j].Breadcrumb mi.Component = list[j].Component mi.Sort = list[j].Sort - mi.CreateTime = list[j].CreateTime - mi.UpdateTime = list[j].UpdateTime - mi.IsDel = list[j].IsDel mi.Visible = list[j].Visible mi.Children = []Menu{} @@ -204,7 +200,6 @@ func (e *Menu) SetMenuRole(rolename string) (m []Menu, err error) { func (menu *MenuRole) Get() (Menus []MenuRole, err error) { table := orm.Eloquent.Table("sys_menu") - table = table.Where("is_del = ?", 0) if menu.MenuName != "" { table = table.Where("menu_name = ?", menu.MenuName) } @@ -216,7 +211,7 @@ func (menu *MenuRole) Get() (Menus []MenuRole, err error) { func (e *Menu) GetByRoleName(rolename string) (Menus []Menu, err error) { table := orm.Eloquent.Table("sys_menu").Select("sys_menu.*").Joins("left join sys_role_menu on sys_role_menu.menu_id=sys_menu.menu_id") - table = table.Where("is_del = ? and sys_role_menu.role_name=? and menu_type in ('M','C')", 0, rolename) + table = table.Where("sys_role_menu.role_name=? and menu_type in ('M','C')", rolename) if err = table.Order("sort").Find(&Menus).Error; err != nil { return } @@ -225,7 +220,6 @@ func (e *Menu) GetByRoleName(rolename string) (Menus []Menu, err error) { func (e *Menu) Get() (Menus []Menu, err error) { table := orm.Eloquent.Table("sys_menu") - table = table.Where("is_del = ?", 0) if e.MenuName != "" { table = table.Where("menu_name = ?", e.MenuName) } @@ -247,20 +241,16 @@ func (e *Menu) Get() (Menus []Menu, err error) { func (e *Menu) GetPage() (Menus []Menu, err error) { table := orm.Eloquent.Table("sys_menu") - table = table.Where("is_del = ?", 0) if e.MenuName != "" { table = table.Where("menu_name = ?", e.MenuName) } if e.MenuType != "" { table = table.Where("menu_type = ?", e.MenuType) } - if e.Visible != "" { - table = table.Where("visible = ?", e.Visible) - } // 数据权限控制 dataPermission := new(DataPermission) - dataPermission.UserId, _ = utils.StringToInt64(e.DataScope) + dataPermission.UserId, _ = utils.StringToInt(e.DataScope) table = dataPermission.GetDataScope("sys_menu", table) if err = table.Order("sort").Find(&Menus).Error; err != nil { @@ -269,10 +259,7 @@ func (e *Menu) GetPage() (Menus []Menu, err error) { return } -func (e *Menu) Create() (id int64, err error) { - e.CreateTime = utils.GetCurrntTime() - e.UpdateTime = utils.GetCurrntTime() - e.IsDel = 0 +func (e *Menu) Create() (id int, err error) { result := orm.Eloquent.Table("sys_menu").Create(&e) if result.Error != nil { err = result.Error @@ -294,16 +281,15 @@ func InitPaths(menu *Menu) (err error) { err = errors.New("父级paths异常,请尝试对当前节点父级菜单进行更新操作!") return } - menu.Paths = parentMenu.Paths + "/" + utils.Int64ToString(menu.MenuId) + menu.Paths = parentMenu.Paths + "/" + utils.IntToString(menu.MenuId) } else { - menu.Paths = "/0/" + utils.Int64ToString(menu.MenuId) + menu.Paths = "/0/" + utils.IntToString(menu.MenuId) } orm.Eloquent.Table("sys_menu").Where("menu_id = ?", menu.MenuId).Update("paths", menu.Paths) return } -func (e *Menu) Update(id int64) (update Menu, err error) { - e.UpdateTime = utils.GetCurrntTime() +func (e *Menu) Update(id int) (update Menu, err error) { if err = orm.Eloquent.Table("sys_menu").First(&update, id).Error; err != nil { return } @@ -320,12 +306,8 @@ func (e *Menu) Update(id int64) (update Menu, err error) { return } -func (e *Menu) Delete(id int64) (success bool, err error) { - var mp = map[string]string{} - mp["is_del"] = "1" - mp["update_time"] = utils.GetCurrntTime() - mp["update_by"] = e.UpdateBy - if err = orm.Eloquent.Table("sys_menu").Where("menu_id = ?", id).Update(mp).Error; err != nil { +func (e *Menu) Delete(id int) (success bool, err error) { + if err = orm.Eloquent.Table("sys_menu").Where("menu_id = ?", id).Delete(&Menu{}).Error; err != nil { success = false return } diff --git a/models/model.go b/models/model.go new file mode 100644 index 0000000..1293241 --- /dev/null +++ b/models/model.go @@ -0,0 +1,11 @@ +package models + +import ( + "time" +) + +type BaseModel struct { + CreatedAt time.Time `json:"createdAt"` + UpdatedAt time.Time `json:"updatedAt"` + DeletedAt *time.Time `sql:"index" json:"deletedAt"` +} diff --git a/models/operlog.go b/models/operlog.go index 4cb3360..cdfc648 100644 --- a/models/operlog.go +++ b/models/operlog.go @@ -2,63 +2,39 @@ package models import ( orm "go-admin/database" - "go-admin/utils" + "time" ) //sys_operlog type SysOperLog struct { + OperId int `json:"operId" gorm:"primary_key;AUTO_INCREMENT"` //日志编码 + Title string `json:"title" gorm:"size(255);"` //操作模块 + BusinessType string `json:"businessType" gorm:"type:varchar(128);"` //操作类型 + BusinessTypes string `json:"businessTypes" gorm:"type:varchar(128);"` + Method string `json:"method" gorm:"type:varchar(128);"` //函数 + RequestMethod string `json:"requestMethod" gorm:"type:varchar(128);"` //请求方式 + OperatorType string `json:"operatorType" gorm:"type:varchar(128);"` //操作类型 + OperName string `json:"operName" gorm:"type:varchar(128);"` //操作者 + DeptName string `json:"deptName" gorm:"type:varchar(128);"` //部门名称 + OperUrl string `json:"operUrl" gorm:"type:varchar(255);"` //访问地址 + OperIp string `json:"operIp" gorm:"type:varchar(128);"` //客户端ip + OperLocation string `json:"operLocation" gorm:"type:varchar(128);"` //访问位置 + OperParam string `json:"operParam" gorm:"type:varchar(255);"` //请求参数 + Status string `json:"status" gorm:"type:int(1);"` //操作状态 + OperTime time.Time `json:"operTime" gorm:"type:timestamp;"` //操作时间 + JsonResult string `json:"jsonResult" gorm:"type:varchar(255);"` //返回数据 + CreateBy string `json:"createBy" gorm:"type:varchar(128);"` //创建人 + UpdateBy string `json:"updateBy" gorm:"type:varchar(128);"` //更新者 + DataScope string `json:"dataScope" gorm:"-"` //数据 + Params string `json:"params" gorm:"-"` //参数 + Remark string `json:"remark" gorm:"type:varchar(255);"` //备注 + LatencyTime string `json:"latencyime" gorm:"type:varchar(128);"` //耗时 + UserAgent string `json:"userAgent" gorm:"type:varchar(255);"` //ua + BaseModel +} - //日志编码 - OperId int64 `json:"operId" gorm:"column:operId;primary_key"` - //操作模块 - Title string `json:"title" gorm:"column:title;"` - //操作类型 - BusinessType string `json:"businessType" gorm:"column:businessType;"` - BusinessTypes string `json:"businessTypes" gorm:"column:businessTypes;"` - //函数 - Method string `json:"method" gorm:"column:method;"` - //请求方式 - RequestMethod string `json:"requestMethod" gorm:"column:requestMethod;"` - //操作类型 - OperatorType string `json:"operatorType" gorm:"column:operatorType;"` - //操作者 - OperName string `json:"operName" gorm:"column:operName;"` - //部门名称 - DeptName string `json:"deptName" gorm:"column:deptName;"` - //访问地址 - OperUrl string `json:"operUrl" gorm:"column:operUrl;"` - //客户端ip - OperIp string `json:"operIp" gorm:"column:operIp;"` - //访问位置 - OperLocation string `json:"operLocation" gorm:"column:operLocation;"` - //请求参数 - OperParam string `json:"operParam" gorm:"column:operParam;"` - //操作状态 - Status string `json:"status" gorm:"column:status;"` - //操作时间 - OperTime string `json:"operTime" gorm:"column:operTime;"` - //返回数据 - JsonResult string `json:"jsonResult" gorm:"column:jsonResult;"` - //创建人 - CreateBy string `json:"createBy" gorm:"column:create_by;"` - //创建时间 - CreateTime string `json:"createTime" gorm:"column:create_time;"` - //更新者 - UpdateBy string `json:"updateBy" gorm:"column:update_by;"` - //更新时间 - UpdateTime string `json:"updateTime" gorm:"column:update_time;"` - //数据 - DataScope string `json:"dataScope" gorm:"column:data_scope;"` - //参数 - Params string `json:"params" gorm:"column:params;"` - //备注 - Remark string `json:"remark" gorm:"column:remark;"` - //是否删除 - IsDel string `json:"isDel" gorm:"column:is_del;"` - //耗时 - LatencyTime string `json:"latencyime" gorm:"column:latency_time;"` - //us - UserAgent string `json:"userAgent" gorm:"column:user_agent;"` +func (SysOperLog) TableName() string { + return "sys_operlog" } func (e *SysOperLog) Get() (SysOperLog, error) { @@ -66,48 +42,46 @@ func (e *SysOperLog) Get() (SysOperLog, error) { table := orm.Eloquent.Table("sys_operlog") if e.OperIp != "" { - table = table.Where("operIp = ?", e.OperIp) + table = table.Where("oper_ip = ?", e.OperIp) } if e.OperId != 0 { - table = table.Where("operId = ?", e.OperId) + table = table.Where("oper_id = ?", e.OperId) } - if err := table.Where("is_del = 0").First(&doc).Error; err != nil { + if err := table.First(&doc).Error; err != nil { return doc, err } return doc, nil } -func (e *SysOperLog) GetPage(pageSize int, pageIndex int) ([]SysOperLog, int32, error) { +func (e *SysOperLog) GetPage(pageSize int, pageIndex int) ([]SysOperLog, int, error) { var doc []SysOperLog table := orm.Eloquent.Select("*").Table("sys_operlog") if e.OperIp != "" { - table = table.Where("operIp = ?", e.OperIp) + table = table.Where("oper_ip = ?", e.OperIp) } if e.Status != "" { table = table.Where("status = ?", e.Status) } if e.OperName != "" { - table = table.Where("operName = ?", e.OperName) + table = table.Where("oper_name = ?", e.OperName) } if e.BusinessType != "" { - table = table.Where("businessType = ?", e.BusinessType) + table = table.Where("business_type = ?", e.BusinessType) } - var count int32 + var count int - if err := table.Where("is_del = 0").Order("operId desc").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { + if err := table.Order("oper_id desc").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { return nil, 0, err } - table.Where("is_del = 0").Count(&count) + table.Count(&count) return doc, count, nil } func (e *SysOperLog) Create() (SysOperLog, error) { var doc SysOperLog - e.CreateTime = utils.GetCurrntTime() - e.UpdateTime = utils.GetCurrntTime() e.CreateBy = "0" e.UpdateBy = "0" result := orm.Eloquent.Table("sys_operlog").Create(&e) @@ -119,9 +93,7 @@ func (e *SysOperLog) Create() (SysOperLog, error) { return doc, nil } -func (e *SysOperLog) Update(id int64) (update SysOperLog, err error) { - e.UpdateTime = utils.GetCurrntTime() - +func (e *SysOperLog) Update(id int) (update SysOperLog, err error) { if err = orm.Eloquent.Table("sys_operlog").First(&update, id).Error; err != nil { return } @@ -134,8 +106,8 @@ func (e *SysOperLog) Update(id int64) (update SysOperLog, err error) { return } -func (e *SysOperLog) BatchDelete(id []int64) (Result bool, err error) { - if err = orm.Eloquent.Table("sys_operlog").Where("is_del=0 and operId in (?)", id).Update(map[string]interface{}{"is_del": "1", "update_time": utils.GetCurrntTime(), "update_by": e.UpdateBy}).Error; err != nil { +func (e *SysOperLog) BatchDelete(id []int) (Result bool, err error) { + if err = orm.Eloquent.Table("sys_operlog").Where(" oper_id in (?)", id).Delete(&SysOperLog{}).Error; err != nil { return } Result = true diff --git a/models/post.go b/models/post.go index 2e2733b..052985d 100644 --- a/models/post.go +++ b/models/post.go @@ -2,50 +2,29 @@ package models import ( orm "go-admin/database" - "go-admin/utils" + "go-admin/pkg/utils" ) type Post struct { - //岗位编号 - PostId int64 `gorm:"column:post_id;primary_key" json:"postId" example:"1" extensions:"x-description=标示"` - - //岗位名称 - PostName string `gorm:"column:post_name" json:"postName"` - - //岗位代码 - PostCode string `gorm:"column:post_code" json:"postCode"` - - //岗位排序 - Sort int `gorm:"column:sort" json:"sort"` - - //状态 - Status string `gorm:"column:status" json:"status"` - - //描述 - Remark string `gorm:"column:remark" json:"remark"` - - //创建时间 - CreateTime string `gorm:"column:create_time" json:"createTime"` - - //最后修改时间 - UpdateTime string `gorm:"column:update_time" json:"updateTime"` - - //是否删除 - IsDel int `gorm:"column:is_del" json:"isDel"` - - CreateBy string `gorm:"column:create_by" json:"createBy"` - - UpdateBy string `gorm:"column:update_by" json:"updateBy"` - + PostId int `gorm:"primary_key;AUTO_INCREMENT" json:"postId"` //岗位编号 + PostName string `gorm:"type:varchar(128);" json:"postName"` //岗位名称 + PostCode string `gorm:"type:varchar(128);" json:"postCode"` //岗位代码 + Sort int `gorm:"type:int(4);" json:"sort"` //岗位排序 + Status string `gorm:"type:int(1);" json:"status"` //状态 + Remark string `gorm:"type:varchar(255);" json:"remark"` //描述 + CreateBy string `gorm:"type:varchar(128);" json:"createBy"` + UpdateBy string `gorm:"type:varchar(128);" json:"updateBy"` DataScope string `gorm:"-" json:"dataScope"` + Params string `gorm:"-" json:"params"` + BaseModel +} - Params string `gorm:"-" json:"params"` +func (Post) TableName() string { + return "sys_post" } func (e *Post) Create() (Post, error) { var doc Post - e.CreateTime = utils.GetCurrntTime() - e.UpdateTime = utils.GetCurrntTime() result := orm.Eloquent.Table("sys_post").Create(&e) if result.Error != nil { err := result.Error @@ -72,7 +51,7 @@ func (e *Post) Get() (Post, error) { table = table.Where("status = ?", e.Status) } - if err := table.Where("is_del = 0").First(&doc).Error; err != nil { + if err := table.First(&doc).Error; err != nil { return doc, err } return doc, nil @@ -95,13 +74,13 @@ func (e *Post) GetList() ([]Post, error) { table = table.Where("status = ?", e.Status) } - if err := table.Where("is_del = 0").Find(&doc).Error; err != nil { + if err := table.Find(&doc).Error; err != nil { return doc, err } return doc, nil } -func (e *Post) GetPage(pageSize int, pageIndex int) ([]Post, int32, error) { +func (e *Post) GetPage(pageSize int, pageIndex int) ([]Post, int, error) { var doc []Post table := orm.Eloquent.Select("*").Table("sys_post") @@ -117,20 +96,19 @@ func (e *Post) GetPage(pageSize int, pageIndex int) ([]Post, int32, error) { // 数据权限控制 dataPermission := new(DataPermission) - dataPermission.UserId, _ = utils.StringToInt64(e.DataScope) + dataPermission.UserId, _ = utils.StringToInt(e.DataScope) table = dataPermission.GetDataScope("sys_post", table) - var count int32 + var count int - if err := table.Where("is_del = 0").Order("sort").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { + if err := table.Order("sort").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { return nil, 0, err } - table.Where("is_del = 0").Count(&count) + table.Count(&count) return doc, count, nil } -func (e *Post) Update(id int64) (update Post, err error) { - e.UpdateTime = utils.GetCurrntTime() +func (e *Post) Update(id int) (update Post, err error) { if err = orm.Eloquent.Table("sys_post").First(&update, id).Error; err != nil { return } @@ -143,12 +121,8 @@ func (e *Post) Update(id int64) (update Post, err error) { return } -func (e *Post) Delete(id int64) (success bool, err error) { - var mp = map[string]string{} - mp["is_del"] = "1" - mp["update_time"] = utils.GetCurrntTime() - mp["update_by"] = e.UpdateBy - if err = orm.Eloquent.Table("sys_post").Where("post_id = ?", id).Update(mp).Error; err != nil { +func (e *Post) Delete(id int) (success bool, err error) { + if err = orm.Eloquent.Table("sys_post").Where("post_id = ?", id).Delete(&Post{}).Error; err != nil { success = false return } diff --git a/models/response.go b/models/response.go deleted file mode 100644 index e7e3592..0000000 --- a/models/response.go +++ /dev/null @@ -1,20 +0,0 @@ -package models - -type Response struct { - // 代码 - Code int `json:"code" example:"200"` - // 数据集 - Data interface{} `json:"data"` - // 错误消息 - Msg string `json:"msg"` -} - -func (res *Response) ReturnOK() *Response { - res.Code = 200 - return res -} - -func (res *Response) ReturnError(code int) *Response { - res.Code = code - return res -} diff --git a/models/role.go b/models/role.go index fa79735..2c5b232 100644 --- a/models/role.go +++ b/models/role.go @@ -2,54 +2,44 @@ package models import ( orm "go-admin/database" - "go-admin/utils" + "go-admin/pkg/utils" ) type SysRole struct { - // 角色编码 - Id int64 `json:"roleId" gorm:"column:role_id;primary_key"` - // 角色名称 - Name string `json:"roleName" gorm:"column:role_name"` + RoleId int `json:"roleId" gorm:"primary_key;AUTO_INCREMENT"` // 角色编码 + RoleName string `json:"roleName" gorm:"type:varchar(128);"` // 角色名称 + Status string `json:"status" gorm:"type:int(1);"` // + RoleKey string `json:"roleKey" gorm:"type:varchar(128);"` //角色代码 + RoleSort int `json:"roleSort" gorm:"type:int(4);"` //角色排序 + Flag string `json:"flag" gorm:"type:varchar(128);"` // + CreateBy string `json:"createBy" gorm:"type:varchar(128);"` // + UpdateBy string `json:"updateBy" gorm:"type:varchar(128);"` // + Remark string `json:"remark" gorm:"type:varchar(255);"` //备注 + Admin bool `json:"admin" gorm:"type:char(1);"` + DataScope string `json:"dataScope" gorm:"-"` + Params string `json:"params" gorm:"-"` + MenuIds []int `json:"menuIds" gorm:"-"` + DeptIds []int `json:"deptIds" gorm:"-"` + BaseModel +} - Status string `json:"status" gorm:"column:status"` - - //角色代码 - RoleKey string `json:"roleKey" gorm:"column:role_key"` - //角色排序 - RoleSort int64 `json:"roleSort" gorm:"column:role_sort"` - - Flag string `json:"flag" gorm:"column:flag"` - - CreateBy string `gorm:"column:create_by" json:"createBy"` - CreateTime string `gorm:"column:create_time" json:"createTime"` - UpdateBy string `gorm:"column:update_by" json:"updateBy"` - UpdateTime string `gorm:"column:update_time" json:"updateTime"` - - //备注 - Remark string `gorm:"column:remark" json:"remark"` - Params string `gorm:"column:params" json:"params"` - DataScope string `gorm:"-" json:"dataScope"` - IsDel int `gorm:"column:is_del" json:"isDel"` - - Admin bool `gorm:"column:admin" json:"admin"` - - MenuIds []int64 `gorm:"-" json:"menuIds"` - DeptIds []int64 `gorm:"-" json:"deptIds"` +func (SysRole) TableName() string { + return "sys_role" } type MenuIdList struct { - MenuId int64 `json:"menuId"` + MenuId int `json:"menuId"` } -func (e *SysRole) GetPage(pageSize int, pageIndex int) ([]SysRole, int32, error) { +func (e *SysRole) GetPage(pageSize int, pageIndex int) ([]SysRole, int, error) { var doc []SysRole table := orm.Eloquent.Select("*").Table("sys_role") - if e.Id != 0 { - table = table.Where("role_id = ?", e.Id) + if e.RoleId != 0 { + table = table.Where("role_id = ?", e.RoleId) } - if e.Name != "" { - table = table.Where("role_name = ?", e.Name) + if e.RoleName != "" { + table = table.Where("role_name = ?", e.RoleName) } if e.Status != "" { table = table.Where("status = ?", e.Status) @@ -60,25 +50,25 @@ func (e *SysRole) GetPage(pageSize int, pageIndex int) ([]SysRole, int32, error) // 数据权限控制 dataPermission := new(DataPermission) - dataPermission.UserId, _ = utils.StringToInt64(e.DataScope) + dataPermission.UserId, _ = utils.StringToInt(e.DataScope) table = dataPermission.GetDataScope("sys_role", table) - var count int32 + var count int - if err := table.Where("is_del = 0").Order("role_sort").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { + if err := table.Order("role_sort").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { return nil, 0, err } - table.Where("is_del = 0").Count(&count) + table.Count(&count) return doc, count, nil } func (role *SysRole) Get() (SysRole SysRole, err error) { table := orm.Eloquent.Table("sys_role") - if role.Id != 0 { - table = table.Where("role_id = ?", role.Id) + if role.RoleId != 0 { + table = table.Where("role_id = ?", role.RoleId) } - if role.Name != "" { - table = table.Where("role_name = ?", role.Name) + if role.RoleName != "" { + table = table.Where("role_name = ?", role.RoleName) } if err = table.First(&SysRole).Error; err != nil { return @@ -88,12 +78,12 @@ func (role *SysRole) Get() (SysRole SysRole, err error) { } func (role *SysRole) GetList() (SysRole []SysRole, err error) { - table := orm.Eloquent.Table("sys_role").Where("is_del = 0") - if role.Id != 0 { - table = table.Where("role_id = ?", role.Id) + table := orm.Eloquent.Table("sys_role") + if role.RoleId != 0 { + table = table.Where("role_id = ?", role.RoleId) } - if role.Name != "" { - table = table.Where("role_name = ?", role.Name) + if role.RoleName != "" { + table = table.Where("role_name = ?", role.RoleName) } if err = table.Order("role_sort").Find(&SysRole).Error; err != nil { return @@ -102,10 +92,10 @@ func (role *SysRole) GetList() (SysRole []SysRole, err error) { return } -func (role *SysRole) GetRoleMeunId() ([]int64, error) { - menuIds := make([]int64, 0) +func (role *SysRole) GetRoleMeunId() ([]int, error) { + menuIds := make([]int, 0) menuList := make([]MenuIdList, 0) - if err := orm.Eloquent.Table("sys_role_menu").Select("sys_role_menu.menu_id").Joins("LEFT JOIN sys_menu on sys_menu.menu_id=sys_role_menu.menu_id").Where("role_id = ? ", role.Id).Where(" sys_role_menu.menu_id not in(select sys_menu.parent_id from sys_role_menu LEFT JOIN sys_menu on sys_menu.menu_id=sys_role_menu.menu_id where role_id =? )", role.Id).Find(&menuList).Error; err != nil { + if err := orm.Eloquent.Table("sys_role_menu").Select("sys_role_menu.menu_id").Joins("LEFT JOIN sys_menu on sys_menu.menu_id=sys_role_menu.menu_id").Where("role_id = ? ", role.RoleId).Where(" sys_role_menu.menu_id not in(select sys_menu.parent_id from sys_role_menu LEFT JOIN sys_menu on sys_menu.menu_id=sys_role_menu.menu_id where role_id =? )", role.RoleId).Find(&menuList).Error; err != nil { return nil, err } @@ -115,28 +105,25 @@ func (role *SysRole) GetRoleMeunId() ([]int64, error) { return menuIds, nil } -func (role *SysRole) Insert() (id int64, err error) { - role.CreateTime = utils.GetCurrntTime() +func (role *SysRole) Insert() (id int, err error) { role.UpdateBy = "" - role.UpdateTime = utils.GetCurrntTime() - role.IsDel = 0 result := orm.Eloquent.Table("sys_role").Create(&role) if result.Error != nil { err = result.Error return } - id = role.Id + id = role.RoleId return } type DeptIdList struct { - DeptId int64 `json:"DeptId"` + DeptId int `json:"DeptId"` } -func (role *SysRole) GetRoleDeptId() ([]int64, error) { - deptIds := make([]int64, 0) +func (role *SysRole) GetRoleDeptId() ([]int, error) { + deptIds := make([]int, 0) deptList := make([]DeptIdList, 0) - if err := orm.Eloquent.Table("sys_role_dept").Select("sys_role_dept.dept_id").Joins("LEFT JOIN sys_dept on sys_dept.dept_id=sys_role_dept.dept_id").Where("role_id = ? ", role.Id).Where(" sys_role_dept.dept_id not in(select sys_dept.parent_id from sys_role_dept LEFT JOIN sys_dept on sys_dept.dept_id=sys_role_dept.dept_id where role_id =? )", role.Id).Order("role_sort").Find(&deptList).Error; err != nil { + if err := orm.Eloquent.Table("sys_role_dept").Select("sys_role_dept.dept_id").Joins("LEFT JOIN sys_dept on sys_dept.dept_id=sys_role_dept.dept_id").Where("role_id = ? ", role.RoleId).Where(" sys_role_dept.dept_id not in(select sys_dept.parent_id from sys_role_dept LEFT JOIN sys_dept on sys_dept.dept_id=sys_role_dept.dept_id where role_id =? )", role.RoleId).Find(&deptList).Error; err != nil { return nil, err } @@ -148,8 +135,7 @@ func (role *SysRole) GetRoleDeptId() ([]int64, error) { } //修改 -func (role *SysRole) Update(id int64) (update SysRole, err error) { - role.UpdateTime = utils.GetCurrntTime() +func (role *SysRole) Update(id int) (update SysRole, err error) { if err = orm.Eloquent.Table("sys_role").First(&update, id).Error; err != nil { return } @@ -163,12 +149,8 @@ func (role *SysRole) Update(id int64) (update SysRole, err error) { } //批量删除 -func (e *SysRole) BatchDelete(id []int64) (Result bool, err error) { - var mp = map[string]string{} - mp["is_del"] = "1" - mp["update_time"] = utils.GetCurrntTime() - mp["update_by"] = e.UpdateBy - if err = orm.Eloquent.Table("sys_role").Where("is_del=0 and role_id in (?)", id).Update(mp).Error; err != nil { +func (e *SysRole) BatchDelete(id []int) (Result bool, err error) { + if err = orm.Eloquent.Table("sys_role").Where("role_id in (?)", id).Delete(&SysRole{}).Error; err != nil { return } Result = true diff --git a/models/roledept.go b/models/roledept.go index 625d002..cdcc202 100644 --- a/models/roledept.go +++ b/models/roledept.go @@ -7,11 +7,15 @@ import ( //sys_role_dept type SysRoleDept struct { - RoleId int64 - DeptId int64 + RoleId int `gorm:"type:int(11)"` + DeptId int `gorm:"type:int(11)"` } -func (rm *SysRoleDept) Insert(roleId int64, deptIds []int64) (bool, error) { +func (SysRoleDept) TableName() string { + return "sys_role_dept" +} + +func (rm *SysRoleDept) Insert(roleId int, deptIds []int) (bool, error) { //ORM不支持批量插入所以需要拼接 sql 串 sql := "INSERT INTO `sys_role_dept` (`role_id`,`dept_id`) VALUES " @@ -28,7 +32,7 @@ func (rm *SysRoleDept) Insert(roleId int64, deptIds []int64) (bool, error) { return true, nil } -func (rm *SysRoleDept) DeleteRoleDept(roleId int64) (bool, error) { +func (rm *SysRoleDept) DeleteRoleDept(roleId int) (bool, error) { if err := orm.Eloquent.Table("sys_role_dept").Where("role_id = ?", roleId).Delete(&rm).Error; err != nil { return false, err } diff --git a/models/rolemenu.go b/models/rolemenu.go index 599ab16..36bb532 100644 --- a/models/rolemenu.go +++ b/models/rolemenu.go @@ -3,15 +3,19 @@ package models import ( "fmt" orm "go-admin/database" - "strconv" + "go-admin/pkg/utils" ) type RoleMenu struct { - RoleId int64 - MenuId int64 - RoleName string - CreateBy string - UpdateBy string + RoleId int `gorm:"type:int(11)"` + MenuId int `gorm:"type:int(11)"` + RoleName string `gorm:"type:varchar(128)"` + CreateBy string `gorm:"type:varchar(128)"` + UpdateBy string `gorm:"type:varchar(128)"` +} + +func (RoleMenu) TableName() string { + return "sys_role_menu" } type MenuPath struct { @@ -37,7 +41,7 @@ func (rm *RoleMenu) GetPermis() ([]string, error) { table = table.Where("role_id = ?", rm.RoleId) - table = table.Where("sys_menu.menuType in('F','C')") + table = table.Where("sys_menu.menu_type in('F','C')") if err := table.Find(&r).Error; err != nil { return nil, err } @@ -60,7 +64,7 @@ func (rm *RoleMenu) GetIDS() ([]MenuPath, error) { return r, nil } -func (rm *RoleMenu) DeleteRoleMenu(roleId int64) (bool, error) { +func (rm *RoleMenu) DeleteRoleMenu(roleId int) (bool, error) { if err := orm.Eloquent.Table("sys_role_dept").Where("role_id = ?", roleId).Delete(&rm).Error; err != nil { return false, err } @@ -78,7 +82,7 @@ func (rm *RoleMenu) DeleteRoleMenu(roleId int64) (bool, error) { } -func (rm *RoleMenu) BatchDeleteRoleMenu(roleIds []int64) (bool, error) { +func (rm *RoleMenu) BatchDeleteRoleMenu(roleIds []int) (bool, error) { if err := orm.Eloquent.Table("sys_role_menu").Where("role_id in (?)", roleIds).Delete(&rm).Error; err != nil { return false, err } @@ -88,14 +92,14 @@ func (rm *RoleMenu) BatchDeleteRoleMenu(roleIds []int64) (bool, error) { } sql := "" for i := 0; i < len(role); i++ { - sql += "delete from casbin_rule where v0= '" + role[i].Name + "';" + sql += "delete from casbin_rule where v0= '" + role[i].RoleName + "';" } orm.Eloquent.Exec(sql) return true, nil } -func (rm *RoleMenu) Insert(roleId int64, menuId []int64) (bool, error) { +func (rm *RoleMenu) Insert(roleId int, menuId []int) (bool, error) { var role SysRole if err := orm.Eloquent.Table("sys_role").Where("role_id = ?", roleId).First(&role).Error; err != nil { return false, err @@ -111,12 +115,12 @@ func (rm *RoleMenu) Insert(roleId int64, menuId []int64) (bool, error) { for i := 0; i < len(menu); i++ { if len(menu)-1 == i { //最后一条数据 以分号结尾 - sql += fmt.Sprintf("(%d,%d,'%s');", role.Id, menu[i].MenuId, role.RoleKey) + sql += fmt.Sprintf("(%d,%d,'%s');", role.RoleId, menu[i].MenuId, role.RoleKey) if menu[i].MenuType == "A" { sql2 += fmt.Sprintf("('p','%s','%s','%s');", role.RoleKey, menu[i].Path, menu[i].Action) } } else { - sql += fmt.Sprintf("(%d,%d,'%s'),", role.Id, menu[i].MenuId, role.RoleKey) + sql += fmt.Sprintf("(%d,%d,'%s'),", role.RoleId, menu[i].MenuId, role.RoleKey) if menu[i].MenuType == "A" { sql2 += fmt.Sprintf("('p','%s','%s','%s'),", role.RoleKey, menu[i].Path, menu[i].Action) } @@ -130,7 +134,7 @@ func (rm *RoleMenu) Insert(roleId int64, menuId []int64) (bool, error) { } func (rm *RoleMenu) Delete(RoleId string, MenuID string) (bool, error) { - rm.RoleId, _ = strconv.ParseInt(RoleId, 10, 64) + rm.RoleId, _ = utils.StringToInt(RoleId) table := orm.Eloquent.Table("sys_role_menu").Where("role_id = ?", RoleId) if MenuID != "" { table = table.Where("menu_id = ?", MenuID) diff --git a/models/sysuser.go b/models/sysuser.go index 46716e2..54981d7 100644 --- a/models/sysuser.go +++ b/models/sysuser.go @@ -4,7 +4,7 @@ import ( "errors" orm "go-admin/database" "go-admin/pkg" - "go-admin/utils" + "go-admin/pkg/utils" "golang.org/x/crypto/bcrypt" "log" "strings" @@ -23,12 +23,12 @@ type User struct { } type UserName struct { - Username string `gorm:"column:username" json:"username"` + Username string `gorm:"type:varchar(64)" json:"username"` } type PassWord struct { // 密码 - Password string `gorm:"column:password" json:"password"` + Password string `gorm:"type:varchar(128)" json:"password"` } type LoginM struct { @@ -37,45 +37,27 @@ type LoginM struct { } type SysUserId struct { - // 编码 - Id int64 `gorm:"column:user_id;primary_key" json:"userId"` + UserId int `gorm:"primary_key;AUTO_INCREMENT" json:"userId"` // 编码 } type SysUserB struct { - // 昵称 - NickName string `gorm:"column:nick_name" json:"nickName"` - // 手机号 - Phone string `gorm:"column:phone" json:"phone"` - // 角色编码 - RoleId int64 `gorm:"column:role_id" json:"roleId"` - //盐 - Salt string `gorm:"column:salt" json:"salt"` - //头像 - Avatar string `gorm:"column:avatar" json:"avatar"` - //性别 - Sex string `gorm:"column:sex" json:"sex"` - //邮箱 - Email string `gorm:"column:email" json:"email"` - // 创建时间 - CreateTime string `gorm:"column:create_time" json:"createTime"` - // 修改时间 - UpdateTime string `gorm:"column:update_time" json:"updateTime"` - - //部门编码 - DeptId int64 `gorm:"column:dept_id" json:"deptId"` - - //职位编码 - PostId int64 `gorm:"column:post_id" json:"postId"` - - CreateBy string `gorm:"column:create_by" json:"createBy"` - UpdateBy string `gorm:"column:update_by" json:"updateBy"` - - //备注 - Remark string `gorm:"column:remark" json:"remark"` - Params string `gorm:"column:params" json:"params"` - Status string `gorm:"column:status" json:"status"` + NickName string `gorm:"type:varchar(128)" json:"nickName"` // 昵称 + Phone string `gorm:"type:varchar(11)" json:"phone"` // 手机号 + RoleId int `gorm:"type:int(11)" json:"roleId"` // 角色编码 + Salt string `gorm:"type:varchar(255)" json:"salt"` //盐 + Avatar string `gorm:"type:varchar(255)" json:"avatar"` //头像 + Sex string `gorm:"type:varchar(255)" json:"sex"` //性别 + Email string `gorm:"type:varchar(128)" json:"email"` //邮箱 + DeptId int `gorm:"type:int(11)" json:"deptId"` //部门编码 + PostId int `gorm:"type:int(11)" json:"postId"` //职位编码 + CreateBy string `gorm:"type:varchar(128)" json:"createBy"` // + UpdateBy string `gorm:"type:varchar(128)" json:"updateBy"` // + Remark string `gorm:"type:varchar(255)" json:"remark"` //备注 + Status string `gorm:"type:int(1);" json:"status"` DataScope string `gorm:"-" json:"dataScope"` - IsDel int `gorm:"column:is_del" json:"isDel"` + Params string `gorm:"-" json:"params"` + + BaseModel } type SysUser struct { @@ -84,6 +66,10 @@ type SysUser struct { LoginM } +func (SysUser) TableName() string { + return "sys_user" +} + type SysUserPwd struct { OldPassword string `json:"oldPassword"` NewPassword string `json:"newPassword"` @@ -108,8 +94,8 @@ func (e *SysUser) Get() (SysUserView SysUserView, err error) { table := orm.Eloquent.Table("sys_user").Select([]string{"sys_user.*", "sys_role.role_name"}) table = table.Joins("left join sys_role on sys_user.role_id=sys_role.role_id") - if e.Id != 0 { - table = table.Where("user_id = ?", e.Id) + if e.UserId != 0 { + table = table.Where("user_id = ?", e.UserId) } if e.Username != "" { @@ -138,7 +124,7 @@ func (e *SysUser) Get() (SysUserView SysUserView, err error) { return } -func (e *SysUser) GetPage(pageSize int, pageIndex int) ([]SysUserPage, int32, error) { +func (e *SysUser) GetPage(pageSize int, pageIndex int) ([]SysUserPage, int, error) { var doc []SysUserPage table := orm.Eloquent.Select("sys_user.*,sys_dept.dept_name").Table("sys_user") @@ -149,20 +135,20 @@ func (e *SysUser) GetPage(pageSize int, pageIndex int) ([]SysUserPage, int32, er } if e.DeptId != 0 { - table = table.Where("sys_user.dept_id in (select dept_id from sys_dept where dept_path like ? )", "%"+utils.Int64ToString(e.DeptId)+"%") + table = table.Where("sys_user.dept_id in (select dept_id from sys_dept where dept_path like ? )", "%"+utils.IntToString(e.DeptId)+"%") } // 数据权限控制 dataPermission := new(DataPermission) - dataPermission.UserId, _ = utils.StringToInt64(e.DataScope) + dataPermission.UserId, _ = utils.StringToInt(e.DataScope) table = dataPermission.GetDataScope("sys_user", table) - var count int32 + var count int - if err := table.Where("sys_user.is_del = 0").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { + if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { return nil, 0, err } - table.Where("sys_user.is_del = 0").Count(&count) + table.Count(&count) return doc, count, nil } @@ -182,9 +168,7 @@ func (e *SysUser) Encrypt() (err error) { } //添加 -func (e SysUser) Insert() (id int64, err error) { - e.CreateTime = utils.GetCurrntTime() - e.UpdateTime = utils.GetCurrntTime() +func (e SysUser) Insert() (id int, err error) { if err = e.Encrypt(); err != nil { return } @@ -201,13 +185,12 @@ func (e SysUser) Insert() (id int64, err error) { if err = orm.Eloquent.Table("sys_user").Create(&e).Error; err != nil { return } - id = e.Id + id = e.UserId return } //修改 -func (e *SysUser) Update(id int64) (update SysUser, err error) { - e.UpdateTime = utils.GetCurrntTime() +func (e *SysUser) Update(id int) (update SysUser, err error) { if err = e.Encrypt(); err != nil { return } @@ -227,12 +210,8 @@ func (e *SysUser) Update(id int64) (update SysUser, err error) { return } -func (e *SysUser) BatchDelete(id []int64) (Result bool, err error) { - var mp = map[string]string{} - mp["is_del"] = "1" - mp["update_time"] = utils.GetCurrntTime() - mp["update_by"] = e.UpdateBy - if err = orm.Eloquent.Table("sys_user").Where("is_del=0 and user_id in (?)", id).Update(mp).Error; err != nil { +func (e *SysUser) BatchDelete(id []int) (Result bool, err error) { + if err = orm.Eloquent.Table("sys_user").Where("user_id in (?)", id).Delete(&SysUser{}).Error; err != nil { return } Result = true @@ -244,13 +223,13 @@ func (e *SysUser) SetPwd(pwd SysUserPwd) (Result bool, err error) { _, err = pkg.CompareHashAndPassword(user.Password, pwd.OldPassword) if err != nil { if strings.Contains(err.Error(), "hashedPassword is not the hash of the given password") { - pkg.AssertErr(err, "密码错误(代码202)", 500) + pkg.HasError(err, "密码错误(代码202)", 500) } log.Print(err) return } e.Password = pwd.NewPassword - _, err = e.Update(e.Id) - pkg.AssertErr(err, "更新密码失败(代码202)", 500) + _, err = e.Update(e.UserId) + pkg.HasError(err, "更新密码失败(代码202)", 500) return } diff --git a/models/tools/dbcolumns.go b/models/tools/dbcolumns.go index e9f7e4c..e5f8cf2 100644 --- a/models/tools/dbcolumns.go +++ b/models/tools/dbcolumns.go @@ -21,7 +21,7 @@ type DBColumns struct { ColumnComment string `gorm:"column:COLUMN_COMMENT" json:"columnComment"` } -func (e *DBColumns) GetPage(pageSize int, pageIndex int) ([]DBColumns, int32, error) { +func (e *DBColumns) GetPage(pageSize int, pageIndex int) ([]DBColumns, int, error) { var doc []DBColumns table := orm.Eloquent.Select("*").Table("information_schema.`COLUMNS`") @@ -33,7 +33,7 @@ func (e *DBColumns) GetPage(pageSize int, pageIndex int) ([]DBColumns, int32, er table = table.Where("TABLE_NAME = ?", e.TableName) - var count int32 + var count int if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { return nil, 0, err diff --git a/models/tools/dbtables.go b/models/tools/dbtables.go index a762ee8..46df867 100644 --- a/models/tools/dbtables.go +++ b/models/tools/dbtables.go @@ -16,7 +16,7 @@ type DBTables struct { TableComment string `gorm:"column:TABLE_COMMENT" json:"tableComment"` } -func (e *DBTables) GetPage(pageSize int, pageIndex int) ([]DBTables, int32, error) { +func (e *DBTables) GetPage(pageSize int, pageIndex int) ([]DBTables, int, error) { var doc []DBTables table := orm.Eloquent.Select("*").Table("information_schema.tables") @@ -26,7 +26,7 @@ func (e *DBTables) GetPage(pageSize int, pageIndex int) ([]DBTables, int32, erro table = table.Where("TABLE_NAME = ?", e.TableName) } - var count int32 + var count int if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { return nil, 0, err diff --git a/models/tools/syscolumns.go b/models/tools/syscolumns.go index 545dada..1109c8a 100644 --- a/models/tools/syscolumns.go +++ b/models/tools/syscolumns.go @@ -2,43 +2,47 @@ package tools import ( orm "go-admin/database" - "go-admin/utils" + "go-admin/models" ) type SysColumns struct { - ColumnId int64 `gorm:"column:column_id;primary_key" json:"columnId"` - TableId int64 `gorm:"column:table_id" json:"tableId"` - ColumnName string `gorm:"column:column_name" json:"columnName"` - ColumnComment string `gorm:"column:column_comment" json:"columnComment"` - ColumnType string `gorm:"column:column_type" json:"columnType"` - GoType string `gorm:"column:go_type" json:"goType"` - GoField string `gorm:"column:go_field" json:"goField"` - JsonField string `gorm:"column:json_field" json:"jsonField"` - IsPk string `gorm:"column:is_pk" json:"isPk"` - IsIncrement string `gorm:"column:is_increment" json:"isIncrement"` - IsRequired string `gorm:"column:is_required" json:"isRequired"` - IsInsert string `gorm:"column:is_insert" json:"isInsert"` - IsEdit string `gorm:"column:is_edit" json:"isEdit"` - IsList string `gorm:"column:is_list" json:"isList"` - IsQuery string `gorm:"column:is_query" json:"isQuery"` - QueryType string `gorm:"column:query_type" json:"queryType"` - HtmlType string `gorm:"column:html_type" json:"htmlType"` - DictType string `gorm:"column:dict_type" json:"dictType"` - Sort int `gorm:"column:sort" json:"sort"` - List string `gorm:"column:list" json:"list"` - Pk bool `gorm:"column:pk" json:"pk"` - Required bool `gorm:"column:required" json:"required"` - SuperColumn bool `gorm:"column:super_column" json:"superColumn"` - UsableColumn bool `gorm:"column:usable_column" json:"usableColumn"` - Increment bool `gorm:"column:increment" json:"increment"` - Insert bool `gorm:"column:insert" json:"insert"` - Edit bool `gorm:"column:edit" json:"edit"` - Query bool `gorm:"column:query" json:"query"` - Remark string `gorm:"column:remark" json:"remark"` - CreateBy string `gorm:"column:create_by" json:"createBy"` - CreateTime string `gorm:"column:create_time" json:"createTime"` - UpdateBy string `gorm:"column:update_By" json:"updateBy"` - UpdateTime string `gorm:"column:update_time" json:"updateTime"` + ColumnId int `gorm:"primary_key;AUTO_INCREMENT" json:"columnId"` + TableId int `gorm:"type:int(11);" json:"tableId"` + ColumnName string `gorm:"type:varchar(128);" json:"columnName"` + ColumnComment string `gorm:"column:column_comment;type:varchar(128);" json:"columnComment"` + ColumnType string `gorm:"column:column_type;type:varchar(128);" json:"columnType"` + GoType string `gorm:"column:go_type;type:varchar(128);" json:"goType"` + GoField string `gorm:"column:go_field;type:varchar(128);" json:"goField"` + JsonField string `gorm:"column:json_field;type:varchar(128);" json:"jsonField"` + IsPk string `gorm:"column:is_pk;type:char(4);" json:"isPk"` + IsIncrement string `gorm:"column:is_increment;type:char(4);" json:"isIncrement"` + IsRequired string `gorm:"column:is_required;type:char(4);" json:"isRequired"` + IsInsert string `gorm:"column:is_insert;type:char(4);" json:"isInsert"` + IsEdit string `gorm:"column:is_edit;type:char(4);" json:"isEdit"` + IsList string `gorm:"column:is_list;type:char(4);" json:"isList"` + IsQuery string `gorm:"column:is_query;type:char(4);" json:"isQuery"` + QueryType string `gorm:"column:query_type;type:varchar(128);" json:"queryType"` + HtmlType string `gorm:"column:html_type;type:varchar(128);" json:"htmlType"` + DictType string `gorm:"column:dict_type;type:varchar(128);" json:"dictType"` + Sort int `gorm:"column:sort;type:int(4);" json:"sort"` + List string `gorm:"column:list;type:char(1);" json:"list"` + Pk bool `gorm:"column:pk;type:char(1);" json:"pk"` + Required bool `gorm:"column:required;type:char(1);" json:"required"` + SuperColumn bool `gorm:"column:super_column;type:char(1);" json:"superColumn"` + UsableColumn bool `gorm:"column:usable_column;type:char(1);" json:"usableColumn"` + Increment bool `gorm:"column:increment;type:char(1);" json:"increment"` + Insert bool `gorm:"column:insert;type:char(1);" json:"insert"` + Edit bool `gorm:"column:edit;type:char(1);" json:"edit"` + Query bool `gorm:"column:query;type:char(1);" json:"query"` + Remark string `gorm:"column:remark;type:varchar(255);" json:"remark"` + CreateBy string `gorm:"column:create_by;type:varchar(128);" json:"createBy"` + UpdateBy string `gorm:"column:update_By;type:varchar(128);" json:"updateBy"` + + models.BaseModel +} + +func (SysColumns) TableName() string { + return "sys_columns" } func (e *SysColumns) GetList() ([]SysColumns, error) { @@ -56,7 +60,6 @@ func (e *SysColumns) GetList() ([]SysColumns, error) { func (e *SysColumns) Create() (SysColumns, error) { var doc SysColumns - e.CreateTime = utils.GetCurrntTime() result := orm.Eloquent.Table("sys_columns").Create(&e) if result.Error != nil { err := result.Error @@ -67,7 +70,6 @@ func (e *SysColumns) Create() (SysColumns, error) { } func (e *SysColumns) Update() (update SysColumns, err error) { - e.UpdateTime = utils.GetCurrntTime() if err = orm.Eloquent.Table("sys_columns").First(&update, e.ColumnId).Error; err != nil { return } diff --git a/models/tools/systables.go b/models/tools/systables.go index 0a2e863..3deab5c 100644 --- a/models/tools/systables.go +++ b/models/tools/systables.go @@ -2,49 +2,40 @@ package tools import ( orm "go-admin/database" - "go-admin/utils" + "go-admin/models" ) type SysTables struct { - //表编码 - TableId int64 `gorm:"column:table_id;primary_key" json:"tableId"` - //表名称 - TableName string `gorm:"column:table_name" json:"tableName"` - //表备注 - TableComment string `gorm:"column:table_comment" json:"tableComment"` - //类名 - ClassName string `gorm:"column:class_name" json:"className"` - - TplCategory string `gorm:"column:tpl_category" json:"tplCategory"` - //包名 - PackageName string `gorm:"column:package_name" json:"packageName"` - //模块名 - ModuleName string `gorm:"column:module_name" json:"moduleName"` - BusinessName string `gorm:"column:business_name" json:"businessName"` - //功能名称 - FunctionName string `gorm:"column:function_name" json:"functionName"` - //功能作者 - FunctionAuthor string `gorm:"column:function_author" json:"functionAuthor"` - PkColumn string `gorm:"column:pk_column" json:"pkColumn"` - PkGoField string `gorm:"column:pk_go_field" json:"pkGoField"` - PkJsonField string `gorm:"column:pk_json_field" json:"pkJsonField"` - Options string `gorm:"column:options" json:"options"` - TreeCode string `gorm:"column:tree_code" json:"treeCode"` - TreeParentCode string `gorm:"column:tree_parent_code" json:"treeParentCode"` - TreeName string `gorm:"column:tree_name" json:"treeName"` - Tree bool `gorm:"column:tree" json:"tree"` - Crud bool `gorm:"column:crud" json:"crud"` - Remark string `gorm:"column:remark" json:"remark"` - IsLogicalDelete string `gorm:"column:is_logical_delete" json:"isLogicalDelete"` - LogicalDelete bool `gorm:"column:logical_delete" json:"logicalDelete"` - LogicalDeleteColumn string `gorm:"column:logical_delete_column" json:"logicalDeleteColumn"` - CreateBy string `gorm:"column:create_by" json:"createBy"` - CreateTime string `gorm:"column:create_time" json:"createTime"` - UpdateBy string `gorm:"column:update_By" json:"updateBy"` - UpdateTime string `gorm:"column:update_time" json:"updateTime"` + TableId int `gorm:"primary_key;AUTO_INCREMENT" json:"tableId"` //表编码 + TableName string `gorm:"type:varchar(255);" json:"tableName"` //表名称 + TableComment string `gorm:"type:varchar(255);" json:"tableComment"` //表备注 + ClassName string `gorm:"type:varchar(255);" json:"className"` //类名 + TplCategory string `gorm:"type:varchar(255);" json:"tplCategory"` + PackageName string `gorm:"type:varchar(255);" json:"packageName"` //包名 + ModuleName string `gorm:"type:varchar(255);" json:"moduleName"` //模块名 + BusinessName string `gorm:"type:varchar(255);" json:"businessName"` + FunctionName string `gorm:"type:varchar(255);" json:"functionName"` //功能名称 + FunctionAuthor string `gorm:"type:varchar(255);" json:"functionAuthor"` //功能作者 + PkColumn string `gorm:"type:varchar(255);" json:"pkColumn"` + PkGoField string `gorm:"type:varchar(255);" json:"pkGoField"` + PkJsonField string `gorm:"type:varchar(255);" json:"pkJsonField"` + Options string `gorm:"type:varchar(255);" json:"options"` + TreeCode string `gorm:"type:varchar(255);" json:"treeCode"` + TreeParentCode string `gorm:"type:varchar(255);" json:"treeParentCode"` + TreeName string `gorm:"type:varchar(255);" json:"treeName"` + Tree bool `gorm:"type:char(1);" json:"tree"` + Crud bool `gorm:"type:char(1);" json:"crud"` + Remark string `gorm:"type:varchar(255);" json:"remark"` + IsLogicalDelete string `gorm:"type:char(1);" json:"isLogicalDelete"` + LogicalDelete bool `gorm:"type:char(1);" json:"logicalDelete"` + LogicalDeleteColumn string `gorm:"type:varchar(128);" json:"logicalDeleteColumn"` + CreateBy string `gorm:"type:varchar(128);" json:"createBy"` + UpdateBy string `gorm:"type:varchar(128);" json:"updateBy"` DataScope string `gorm:"-" json:"dataScope"` Params Params `gorm:"-" json:"params"` Columns []SysColumns `gorm:"-" json:"columns"` + + models.BaseModel } type Params struct { @@ -53,7 +44,7 @@ type Params struct { TreeName string `gorm:"-" json:"treeName"` } -func (e *SysTables) GetPage(pageSize int, pageIndex int) ([]SysTables, int32, error) { +func (e *SysTables) GetPage(pageSize int, pageIndex int) ([]SysTables, int, error) { var doc []SysTables table := orm.Eloquent.Select("*").Table("sys_tables") @@ -65,7 +56,7 @@ func (e *SysTables) GetPage(pageSize int, pageIndex int) ([]SysTables, int32, er table = table.Where("table_comment = ?", e.TableComment) } - var count int32 + var count int if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { return nil, 0, err @@ -103,8 +94,6 @@ func (e *SysTables) Get() (SysTables, error) { func (e *SysTables) Create() (SysTables, error) { var doc SysTables - e.CreateTime = utils.GetCurrntTime() - e.UpdateTime = utils.GetCurrntTime() result := orm.Eloquent.Table("sys_tables").Create(&e) if result.Error != nil { err := result.Error @@ -121,7 +110,6 @@ func (e *SysTables) Create() (SysTables, error) { } func (e *SysTables) Update() (update SysTables, err error) { - e.UpdateTime = utils.GetCurrntTime() if err = orm.Eloquent.Table("sys_tables").First(&update, e.TableId).Error; err != nil { return } diff --git a/pkg/app/model.go b/pkg/app/model.go new file mode 100644 index 0000000..5892066 --- /dev/null +++ b/pkg/app/model.go @@ -0,0 +1,46 @@ +package app + +type Response struct { + // 代码 + Code int `json:"code" example:"200"` + // 数据集 + Data interface{} `json:"data"` + // 消息 + Msg string `json:"msg"` +} + +type Page struct { + List interface{} `json:"list"` + Count int `json:"count"` + PageIndex int `json:"pageIndex"` + PageSize int `json:"pageSize"` +} + +type PageResponse struct { + // 代码 + Code int `json:"code" example:"200"` + // 数据集 + Data Page `json:"data"` + // 消息 + Msg string `json:"msg"` +} + + +func (res *Response) ReturnOK() *Response { + res.Code = 200 + return res +} + +func (res *Response) ReturnError(code int) *Response { + res.Code = code + return res +} + + +func (res *PageResponse) ReturnOK() *PageResponse { + res.Code = 200 + return res +} + + + diff --git a/pkg/app/msg/message.go b/pkg/app/msg/message.go new file mode 100644 index 0000000..aafd31b --- /dev/null +++ b/pkg/app/msg/message.go @@ -0,0 +1,9 @@ +package msg + +var ( + CreatedSuccess = "创建成功!" + UpdatedSuccess = "更新成功!" + DeletedSuccess = "删除成功!" + GetSuccess = "查询成功!" + NotFound = "未找到相关内容或者数据为空!" +) diff --git a/pkg/app/return.go b/pkg/app/return.go new file mode 100644 index 0000000..0464228 --- /dev/null +++ b/pkg/app/return.go @@ -0,0 +1,44 @@ +package app + +import ( + "github.com/gin-gonic/gin" + "net/http" +) + +// 失败数据处理 +func Error(c *gin.Context, code int, err error, msg string) { + var res Response + res.Msg = err.Error() + if msg != "" { + res.Msg = msg + } + c.JSON(http.StatusOK, res.ReturnError(code)) +} + +// 通常成功数据处理 +func OK(c *gin.Context, data interface{}, msg string) { + var res Response + res.Data = data + if msg != "" { + res.Msg = msg + } + c.JSON(http.StatusOK, res.ReturnOK()) +} + +// 分页数据处理 +func PageOK(c *gin.Context, result interface{},count int,pageIndex int,pageSize int, msg string) { + var res PageResponse + res.Data.List = result + res.Data.Count = count + res.Data.PageIndex = pageIndex + res.Data.PageSize = pageSize + if msg != "" { + res.Msg = msg + } + c.JSON(http.StatusOK, res.ReturnOK()) +} + +// 兼容函数 +func Custum(c *gin.Context, data gin.H) { + c.JSON(http.StatusOK,data) +} diff --git a/pkg/captcha/captcha.go b/pkg/captcha/captcha.go new file mode 100644 index 0000000..63bb469 --- /dev/null +++ b/pkg/captcha/captcha.go @@ -0,0 +1,41 @@ +package captcha + +import ( + "github.com/google/uuid" + "github.com/mojocn/base64Captcha" + "image/color" +) + +var store = base64Captcha.DefaultMemStore + +//configJsonBody json request body. +type configJsonBody struct { + Id string + CaptchaType string + VerifyValue string + DriverAudio *base64Captcha.DriverAudio + DriverString *base64Captcha.DriverString + DriverChinese *base64Captcha.DriverChinese + DriverMath *base64Captcha.DriverMath + DriverDigit *base64Captcha.DriverDigit +} + + +func DriverStringFunc() (id, b64s string, err error) { + e :=configJsonBody{} + e.Id = uuid.New().String() + e.DriverString = base64Captcha.NewDriverString(46, 140, 2, 2, 4, "234567890abcdefghjkmnpqrstuvwxyz", &color.RGBA{240, 240, 246, 246}, []string{"wqy-microhei.ttc"}) + driver := e.DriverString.ConvertFonts() + cap := base64Captcha.NewCaptcha(driver, store) + return cap.Generate() +} + + +func DriverDigitFunc() (id, b64s string, err error) { + e := configJsonBody{} + e.Id = uuid.New().String() + e.DriverDigit = base64Captcha.DefaultDriverDigit + driver := e.DriverDigit + cap := base64Captcha.NewCaptcha(driver, store) + return cap.Generate() +} \ No newline at end of file diff --git a/pkg/casbin/mycasbin.go b/pkg/casbin/mycasbin.go index 59ab2b7..9b3b491 100644 --- a/pkg/casbin/mycasbin.go +++ b/pkg/casbin/mycasbin.go @@ -7,34 +7,24 @@ import ( "github.com/go-kit/kit/endpoint" _ "github.com/go-sql-driver/mysql" "go-admin/config" - "go-admin/utils" + "go-admin/pkg/utils" ) var Em endpoint.Middleware -func init() { - //Apter ,_ := gormadapter.NewAdapter("mysql", "testdb:Qq123456@tcp(rm-uf60100537o86401eao.mysql.rds.aliyuncs.com:3306)/testdb",true) // Your driver and data source. - //e,_ := casbin.NewEnforcer("config/rbac_model.conf", "config/policy.csv") - // - //err := Apter.SavePolicy(e.GetModel()) - //if err != nil { - // panic(err) - //} - // - //// Load the policy from DB. - //e.LoadPolicy() - -} - func Casbin() (*casbin.Enforcer, error) { conn := config.DatabaseConfig.Username + ":" + config.DatabaseConfig.Password + "@tcp(" + config.DatabaseConfig.Host + ":" + utils.IntToString(config.DatabaseConfig.Port) + ")/" + config.DatabaseConfig.Database if config.DatabaseConfig.Dbtype == "sqlite3" { conn = config.DatabaseConfig.Host } - Apter, _ := gormadapter.NewAdapter(config.DatabaseConfig.Dbtype, conn, true) - - e, _ := casbin.NewEnforcer("config/rbac_model.conf", Apter) - + Apter, err := gormadapter.NewAdapter(config.DatabaseConfig.Dbtype, conn, true) + if err != nil { + return nil, err + } + e, err := casbin.NewEnforcer("config/rbac_model.conf", Apter) + if err != nil { + return nil, err + } if err := e.LoadPolicy(); err == nil { return e, err } else { diff --git a/handler/cronjob/testjob.go b/pkg/cronjob/testjob.go similarity index 100% rename from handler/cronjob/testjob.go rename to pkg/cronjob/testjob.go diff --git a/pkg/jwtauth/jwtauth.go b/pkg/jwtauth/jwtauth.go index 9cd92e0..b38a799 100644 --- a/pkg/jwtauth/jwtauth.go +++ b/pkg/jwtauth/jwtauth.go @@ -5,14 +5,13 @@ import ( "errors" "github.com/dgrijalva/jwt-go" "github.com/gin-gonic/gin" + "go-admin/config" "io/ioutil" "net/http" "strings" "time" ) -// MapClaims type that uses the map[string]interface{} for JSON decoding -// This is the default claims type if you don't supply one type MapClaims map[string]interface{} // GinJWTMiddleware provides a Json-Web-Token authentication implementation. On failure, a 401 HTTP response @@ -81,10 +80,12 @@ type GinJWTMiddleware struct { // rolekey RKey string + // roleId RoleIdKey string RoleKey string + // roleName RoleNameKey string // TokenLookup is a string in the form of ":" that is used @@ -281,13 +282,12 @@ func (mw *GinJWTMiddleware) MiddlewareInit() error { mw.SigningAlgorithm = "HS256" } - if mw.Timeout == 0 { + mw.Timeout = time.Hour + if config.JwtConfig.Timeout != 0 { // TODO: token过期时长 - mw.Timeout = time.Hour + mw.Timeout = time.Duration(config.JwtConfig.Timeout) * time.Second } - //mw.Timeout = time.Second*5 - if mw.TimeFunc == nil { mw.TimeFunc = time.Now } diff --git a/pkg/logger/logger.go b/pkg/logger/logger.go new file mode 100644 index 0000000..98df35e --- /dev/null +++ b/pkg/logger/logger.go @@ -0,0 +1,25 @@ +package logger + +import ( + "io" + "log" + "os" +) + +var ( + Info *log.Logger + Warning *log.Logger + Error * log.Logger +) + +func init(){ + errFile,err:=os.OpenFile("errors.log",os.O_CREATE|os.O_WRONLY|os.O_APPEND,0666) + if err!=nil{ + log.Fatalln("打开日志文件失败:",err) + } + + Info = log.New(os.Stdout,"Info:",log.Ldate | log.Ltime | log.Lshortfile) + Warning = log.New(os.Stdout,"Warning:",log.Ldate | log.Ltime | log.Lshortfile) + Error = log.New(io.MultiWriter(os.Stderr,errFile),"Error:",log.Ldate | log.Ltime | log.Lshortfile) + +} diff --git a/pkg/utils.go b/pkg/utils.go index b8baa5b..25ecf5d 100644 --- a/pkg/utils.go +++ b/pkg/utils.go @@ -9,20 +9,11 @@ import ( func StrToInt(err error, index string) int { result, err := strconv.Atoi(index) if err != nil { - AssertErr(err, "string to int error"+err.Error(), -1) + HasError(err, "string to int error"+err.Error(), -1) } return result } -//加密 -func Encrypt(e string) ([]byte, error) { - //var s []byte - s, err := bcrypt.GenerateFromPassword([]byte(e), bcrypt.DefaultCost) - if err != nil { - return nil, err - } - return s, err -} func CompareHashAndPassword(e string, p string) (bool, error) { err := bcrypt.CompareHashAndPassword([]byte(e), []byte(p)) @@ -46,11 +37,11 @@ func Assert(condition bool, msg string, code ...int) { } } -// AssertErr 错误断言 +// HasError 错误断言 // 当 error 不为 nil 时触发 panic // 对于当前请求不会再执行接下来的代码,并且返回指定格式的错误信息和错误码 // 若 msg 为空,则默认为 error 中的内容 -func AssertErr(err error, msg string, code ...int) { +func HasError(err error, msg string, code ...int) { if err != nil { statusCode := 200 if len(code) > 0 { diff --git a/pkg/utils/float64.go b/pkg/utils/float64.go new file mode 100644 index 0000000..82a9302 --- /dev/null +++ b/pkg/utils/float64.go @@ -0,0 +1,7 @@ +package utils + +import "strconv" + +func Float64ToString(e float64) string { + return strconv.FormatFloat(e, 'E', -1, 64) +} \ No newline at end of file diff --git a/pkg/utils/int.go b/pkg/utils/int.go new file mode 100644 index 0000000..5d0b760 --- /dev/null +++ b/pkg/utils/int.go @@ -0,0 +1,7 @@ +package utils + +import "strconv" + +func IntToString(e int) string { + return strconv.Itoa(e) +} \ No newline at end of file diff --git a/pkg/utils/int64.go b/pkg/utils/int64.go new file mode 100644 index 0000000..d48bfff --- /dev/null +++ b/pkg/utils/int64.go @@ -0,0 +1,7 @@ +package utils + +import "strconv" + +func Int64ToString(e int64) string { + return strconv.FormatInt(e, 10) +} \ No newline at end of file diff --git a/pkg/utils/ip.go b/pkg/utils/ip.go new file mode 100644 index 0000000..2fdee85 --- /dev/null +++ b/pkg/utils/ip.go @@ -0,0 +1,33 @@ +package utils + +import ( + "encoding/json" + "fmt" + "io/ioutil" + "net/http" +) + +func GetLocation(ip string) string { + if ip == "127.0.0.1" || ip == "localhost" { + return "内部IP" + } + resp, err := http.Get("https://restapi.amap.com/v3/ip?ip=" + ip + "&key=3fabc36c20379fbb9300c79b19d5d05e") + if err != nil { + panic(err) + + } + defer resp.Body.Close() + s, err := ioutil.ReadAll(resp.Body) + fmt.Printf(string(s)) + + m := make(map[string]string) + + err = json.Unmarshal(s, &m) + if err != nil { + fmt.Println("Umarshal failed:", err) + } + if m["province"] == "" { + return "未知位置" + } + return m["province"] + "-" + m["city"] +} \ No newline at end of file diff --git a/pkg/utils/string.go b/pkg/utils/string.go new file mode 100644 index 0000000..9eca5e3 --- /dev/null +++ b/pkg/utils/string.go @@ -0,0 +1,55 @@ +package utils + +import ( + "encoding/json" + "fmt" + "github.com/gin-gonic/gin" + "io/ioutil" + "strconv" + "time" +) + +func StringToInt64(e string) (int64, error) { + return strconv.ParseInt(e, 10, 64) +} + +func StringToInt(e string) (int, error) { + return strconv.Atoi(e) +} + + +func GetCurrntTimeStr() string { + return time.Now().Format("2006/01/02 15:04:05") +} + +func GetCurrntTime() time.Time { + return time.Now() +} + + +func StructToJsonStr(e interface{}) (string, error) { + if b, err := json.Marshal(e); err == nil { + return string(b), err + } else { + return "", err + } +} + +func GetBodyString(c *gin.Context) (string, error) { + body, err := ioutil.ReadAll(c.Request.Body) + if err != nil { + fmt.Printf("read body err, %v\n", err) + return string(body), nil + } else { + return "", err + } +} + +func JsonStrToMap(e string) (map[string]interface{}, error) { + var dict map[string]interface{} + if err := json.Unmarshal([]byte(e), &dict); err == nil { + return dict, err + } else { + return nil, err + } +} diff --git a/pkg/utils/url.go b/pkg/utils/url.go new file mode 100644 index 0000000..3b61d94 --- /dev/null +++ b/pkg/utils/url.go @@ -0,0 +1,22 @@ +package utils + +import ( + "github.com/gin-gonic/gin" + "strings" +) + +//获取URL中批量id并解析 +func IdsStrToIdsIntGroup(key string, c *gin.Context) []int { + return idsStrToIdsIntGroup(c.Param(key)) +} + + +func idsStrToIdsIntGroup(keys string) []int { + IDS := make([]int, 0) + ids := strings.Split(keys, ",") + for i := 0; i < len(ids); i++ { + ID, _ := StringToInt(ids[i]) + IDS = append(IDS, ID) + } + return IDS +} \ No newline at end of file diff --git a/utils/user.go b/pkg/utils/user.go similarity index 90% rename from utils/user.go rename to pkg/utils/user.go index a81b15e..2cb24a9 100644 --- a/utils/user.go +++ b/pkg/utils/user.go @@ -15,10 +15,10 @@ func ExtractClaims(c *gin.Context) jwt.MapClaims { return claims.(jwt.MapClaims) } -func GetUserId(c *gin.Context) int64 { +func GetUserId(c *gin.Context) int { data := ExtractClaims(c) if data["identity"] != nil { - return int64((data["identity"]).(float64)) + return int((data["identity"]).(float64)) } fmt.Println("****************************** 路径:" + c.Request.URL.Path + " 请求方法:" + c.Request.Method + " 说明:缺少identity") return 0 @@ -51,10 +51,10 @@ func GetRoleName(c *gin.Context) string { return "" } -func GetRoleId(c *gin.Context) int64 { +func GetRoleId(c *gin.Context) int { data := ExtractClaims(c) if data["roleid"] != nil { - i := int64((data["roleid"]).(float64)) + i := int((data["roleid"]).(float64)) return i } fmt.Println("****************************** 路径:" + c.Request.URL.Path + " 请求方法:" + c.Request.Method + " 缺少roleid") diff --git a/router/router.go b/router/router.go index 0ead932..0ea3e21 100644 --- a/router/router.go +++ b/router/router.go @@ -3,16 +3,17 @@ package router import ( "fmt" "github.com/gin-gonic/gin" - "github.com/spf13/viper" "github.com/swaggo/gin-swagger" "github.com/swaggo/gin-swagger/swaggerFiles" - . "go-admin/apis" + log2 "go-admin/apis/log" + "go-admin/apis/system" + "go-admin/apis/system/dict" . "go-admin/apis/tools" _ "go-admin/docs" "go-admin/handler" "go-admin/handler/sd" + "go-admin/middleware" _ "go-admin/pkg/jwtauth" - "go-admin/router/middleware" "log" ) @@ -27,7 +28,7 @@ func InitRouter() *gin.Engine { r.Use(middleware.DemoEvn()) r.Static("/static", "./static") - r.GET("/info", Ping) + r.GET("/info", handler.Ping) // 监控信息 svcd := r.Group("/sd") @@ -50,12 +51,11 @@ func InitRouter() *gin.Engine { // Refresh time can be longer than token timeout r.GET("/refresh_token", authMiddleware.RefreshHandler) - //r.GET("/dashboard", Dashboard) r.GET("/routes", Dashboard) apiv1 := r.Group("/api/v1") { - apiv1.GET("/getCaptcha", GenerateCaptchaHandler) + apiv1.GET("/getCaptcha", system.GenerateCaptchaHandler) apiv1.GET("/db/tables/page", GetDBTableList) apiv1.GET("/db/columns/page", GetDBColumnList) apiv1.GET("/sys/tables/page", GetSysTableList) @@ -64,112 +64,99 @@ func InitRouter() *gin.Engine { apiv1.DELETE("/sys/tables/info/:tableId", DeleteSysTables) apiv1.GET("/sys/tables/info/:tableId", GetSysTables) apiv1.GET("/gen/preview/:tableId", Preview) - apiv1.GET("/menuTreeselect", GetMenuTreeelect) - apiv1.GET("/rolemenu", GetRoleMenu) - apiv1.POST("/rolemenu", InsertRoleMenu) - apiv1.DELETE("/rolemenu/:id", DeleteRoleMenu) - apiv1.GET("/dict/databytype/:dictType", GetDictDataByDictType) - + apiv1.GET("/menuTreeselect", system.GetMenuTreeelect) + apiv1.GET("/dict/databytype/:dictType", dict.GetDictDataByDictType) } auth := r.Group("/api/v1") auth.Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) { - auth.GET("/deptList", GetDeptList) - auth.GET("/deptTree", GetDeptTree) - auth.GET("/dept/:deptId", GetDept) - auth.POST("/dept", InsertDept) - auth.PUT("/dept", UpdateDept) - auth.DELETE("/dept/:id", DeleteDept) + auth.GET("/deptList", system.GetDeptList) + auth.GET("/deptTree", system.GetDeptTree) + auth.GET("/dept/:deptId", system.GetDept) + auth.POST("/dept", system.InsertDept) + auth.PUT("/dept", system.UpdateDept) + auth.DELETE("/dept/:id", system.DeleteDept) - auth.GET("/dict/datalist", GetDictDataList) - auth.GET("/dict/data/:dictCode", GetDictData) - auth.POST("/dict/data", InsertDictData) - auth.PUT("/dict/data/", UpdateDictData) - auth.DELETE("/dict/data/:dictCode", DeleteDictData) + auth.GET("/dict/datalist", dict.GetDictDataList) + auth.GET("/dict/data/:dictCode", dict.GetDictData) + auth.POST("/dict/data", dict.InsertDictData) + auth.PUT("/dict/data/", dict.UpdateDictData) + auth.DELETE("/dict/data/:dictCode", dict.DeleteDictData) - auth.GET("/dict/typelist", GetDictTypeList) - auth.GET("/dict/type/:dictId", GetDictType) - auth.POST("/dict/type", InsertDictType) - auth.PUT("/dict/type", UpdateDictType) - auth.DELETE("/dict/type/:dictId", DeleteDictType) + auth.GET("/dict/typelist", dict.GetDictTypeList) + auth.GET("/dict/type/:dictId", dict.GetDictType) + auth.POST("/dict/type", dict.InsertDictType) + auth.PUT("/dict/type", dict.UpdateDictType) + auth.DELETE("/dict/type/:dictId", dict.DeleteDictType) - auth.GET("/dict/typeoptionselect", GetDictTypeOptionSelect) + auth.GET("/dict/typeoptionselect", dict.GetDictTypeOptionSelect) - auth.GET("/sysUserList", GetSysUserList) - auth.GET("/sysUser/:userId", GetSysUser) - auth.GET("/sysUser/", GetSysUserInit) - auth.POST("/sysUser", InsertSysUser) - auth.PUT("/sysUser", UpdateSysUser) - auth.DELETE("/sysUser/:userId", DeleteSysUser) + auth.GET("/sysUserList", system.GetSysUserList) + auth.GET("/sysUser/:userId", system.GetSysUser) + auth.GET("/sysUser/", system.GetSysUserInit) + auth.POST("/sysUser", system.InsertSysUser) + auth.PUT("/sysUser", system.UpdateSysUser) + auth.DELETE("/sysUser/:userId", system.DeleteSysUser) - auth.GET("/rolelist", GetRoleList) - auth.GET("/role/:roleId", GetRole) - auth.POST("/role", InsertRole) - auth.PUT("/role", UpdateRole) - auth.PUT("/roledatascope", UpdateRoleDataScope) - auth.DELETE("/role/:roleId", DeleteRole) + auth.GET("/rolelist", system.GetRoleList) + auth.GET("/role/:roleId", system.GetRole) + auth.POST("/role", system.InsertRole) + auth.PUT("/role", system.UpdateRole) + auth.PUT("/roledatascope", system.UpdateRoleDataScope) + auth.DELETE("/role/:roleId", system.DeleteRole) - auth.GET("/configList", GetConfigList) - auth.GET("/config/:configId", GetConfig) - auth.POST("/config", InsertConfig) - auth.PUT("/config", UpdateConfig) - auth.DELETE("/config/:configId", DeleteConfig) + auth.GET("/configList", system.GetConfigList) + auth.GET("/config/:configId", system.GetConfig) + auth.POST("/config", system.InsertConfig) + auth.PUT("/config", system.UpdateConfig) + auth.DELETE("/config/:configId", system.DeleteConfig) - auth.GET("/roleMenuTreeselect/:roleId", GetMenuTreeRoleselect) - auth.GET("/roleDeptTreeselect/:roleId", GetDeptTreeRoleselect) + auth.GET("/roleMenuTreeselect/:roleId", system.GetMenuTreeRoleselect) + auth.GET("/roleDeptTreeselect/:roleId", system.GetDeptTreeRoleselect) - auth.GET("/getinfo", GetInfo) - auth.GET("/user/profile", GetSysUserProfile) - auth.POST("/user/avatar", InsetSysUserAvatar) - auth.PUT("/user/pwd", SysUserUpdatePwd) + auth.GET("/getinfo", system.GetInfo) + auth.GET("/user/profile", system.GetSysUserProfile) + auth.POST("/user/avatar", system.InsetSysUserAvatar) + auth.PUT("/user/pwd", system.SysUserUpdatePwd) - auth.GET("/postlist", GetPostList) - auth.GET("/post/:postId", GetPost) - auth.POST("/post", InsertPost) - auth.PUT("/post", UpdatePost) - auth.DELETE("/post/:postId", DeletePost) + auth.GET("/postlist", system.GetPostList) + auth.GET("/post/:postId", system.GetPost) + auth.POST("/post", system.InsertPost) + auth.PUT("/post", system.UpdatePost) + auth.DELETE("/post/:postId", system.DeletePost) - auth.GET("/menulist", GetMenuList) - auth.GET("/menu/:id", GetMenu) - auth.POST("/menu", InsertMenu) - auth.PUT("/menu", UpdateMenu) - auth.DELETE("/menu/:id", DeleteMenu) - auth.GET("/menurole", GetMenuRole) + auth.GET("/menulist", system.GetMenuList) + auth.GET("/menu/:id", system.GetMenu) + auth.POST("/menu", system.InsertMenu) + auth.PUT("/menu", system.UpdateMenu) + auth.DELETE("/menu/:id", system.DeleteMenu) + auth.GET("/menurole", system.GetMenuRole) - auth.GET("/menuids", GetMenuIDS) + auth.GET("/menuids", system.GetMenuIDS) - auth.GET("/loginloglist", GetLoginLogList) - auth.GET("/loginlog/:infoId", GetLoginLog) - auth.POST("/loginlog", InsertLoginLog) - auth.PUT("/loginlog", UpdateLoginLog) - auth.DELETE("/loginlog/:infoId", DeleteLoginLog) + auth.GET("/loginloglist", log2.GetLoginLogList) + auth.GET("/loginlog/:infoId", log2.GetLoginLog) + auth.POST("/loginlog", log2.InsertLoginLog) + auth.PUT("/loginlog", log2.UpdateLoginLog) + auth.DELETE("/loginlog/:infoId", log2.DeleteLoginLog) - auth.GET("/operloglist", GetOperLogList) - auth.GET("/operlog/:operId", GetOperLog) - auth.DELETE("/operlog/:operId", DeleteOperLog) + auth.GET("/operloglist", log2.GetOperLogList) + auth.GET("/operlog/:operId", log2.GetOperLog) + auth.DELETE("/operlog/:operId", log2.DeleteOperLog) - auth.GET("/configKey/:configKey", GetConfigByConfigKey) + auth.GET("/configKey/:configKey", system.GetConfigByConfigKey) auth.POST("/logout", handler.LogOut) } - //r.NoRoute(authMiddleware.MiddlewareFunc(), NoFound) r.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler)) - + log.Println("路由加载成功!") return r } -func Ping(c *gin.Context) { - log.Println(viper.GetString(`settings.database.type`)) - c.JSON(200, gin.H{ - "message": "ok", - }) -} - - func Dashboard(c *gin.Context) { var user = make(map[string]interface{}) diff --git a/template/api.go.template b/template/api.go.template index 9494f0c..7e54117 100644 --- a/template/api.go.template +++ b/template/api.go.template @@ -30,7 +30,7 @@ func Get{{.ClassName}}List(c *gin.Context) { data.DataScope = utils.GetUserIdStr(c) result, count, err := data.GetPage(pageSize, pageIndex) - pkg.AssertErr(err, "", -1) + pkg.HasError(err, "", -1) var mp = make(map[string]interface{}, 3) mp["list"] = result @@ -46,9 +46,9 @@ func Get{{.ClassName}}List(c *gin.Context) { func Get{{.ClassName}}(c *gin.Context) { var data models.{{.ClassName}} - data.{{.PkGoField}}, _ = utils.StringToInt64(c.Param("{{.PkJsonField}}")) + data.{{.PkGoField}}, _ = utils.StringToInt(c.Param("{{.PkJsonField}}")) result, err := data.Get() - pkg.AssertErr(err, "抱歉未找到相关信息", -1) + pkg.HasError(err, "抱歉未找到相关信息", -1) var res models.Response res.Data = result @@ -60,9 +60,9 @@ func Insert{{.ClassName}}(c *gin.Context) { var data models.{{.ClassName}} err := c.BindWith(&data, binding.JSON) data.CreateBy = utils.GetUserIdStr(c) - pkg.AssertErr(err, "", 500) + pkg.HasError(err, "", 500) result, err := data.Create() - pkg.AssertErr(err, "", -1) + pkg.HasError(err, "", -1) var res models.Response res.Data = result c.JSON(http.StatusOK, res.ReturnOK()) @@ -71,10 +71,10 @@ func Insert{{.ClassName}}(c *gin.Context) { func Update{{.ClassName}}(c *gin.Context) { var data models.{{.ClassName}} err := c.BindWith(&data, binding.JSON) - pkg.AssertErr(err, "数据解析失败", -1) + pkg.HasError(err, "数据解析失败", -1) data.UpdateBy = utils.GetUserIdStr(c) result, err := data.Update(data.{{.PkGoField}}) - pkg.AssertErr(err, "", -1) + pkg.HasError(err, "", -1) var res models.Response res.Data = result @@ -83,10 +83,10 @@ func Update{{.ClassName}}(c *gin.Context) { func Delete{{.ClassName}}(c *gin.Context) { var data models.{{.ClassName}} - id, err := utils.StringToInt64(c.Param("{{.PkJsonField}}")) + id, err := utils.StringToInt(c.Param("{{.PkJsonField}}")) data.UpdateBy = utils.GetUserIdStr(c) _, err = data.Delete(id) - pkg.AssertErr(err, "修改失败", 500) + pkg.HasError(err, "修改失败", 500) var res models.Response res.Msg = "删除成功" diff --git a/template/model.go.template b/template/model.go.template index 1831c59..8dc4186 100644 --- a/template/model.go.template +++ b/template/model.go.template @@ -9,16 +9,13 @@ import ( type {{.ClassName}} struct { {{ range .Columns -}} {{$x := .Pk}} - // {{.ColumnComment}} - {{if ($x)}}{{.GoField}} {{.GoType}} `json:"{{.JsonField}}" gorm:"column:{{.ColumnName}};primary_key"`{{else}}{{.GoField}} {{.GoType}} `json:"{{.JsonField}}" gorm:"column:{{.ColumnName}};"`{{end}} -{{ end -}} + {{if ($x)}}{{.GoField}} {{.GoType}} `json:"{{.JsonField}}" gorm:"type:{{.ColumnType}};primary_key"`{{else}}{{.GoField}} {{.GoType}} `json:"{{.JsonField}}" gorm:"type:{{.ColumnType}};"`{{end}} // {{.ColumnComment}} +{{- end }} } // 创建{{.ClassName}} func (e *{{.ClassName}}) Create() ({{.ClassName}}, error) { var doc {{.ClassName}} - doc.IsDel = "0" - e.CreateTime = time.Now().String() result := orm.Eloquent.Table("{{.TableName}}").Create(&e) if result.Error != nil { err := result.Error @@ -42,7 +39,7 @@ func (e *{{.ClassName}}) Get() ({{.ClassName}}, error) { {{ end -}} {{ end }} - if err := table.Where("is_del = 0").First(&doc).Error; err != nil { + if err := table.First(&doc).Error; err != nil { return doc, err } return doc, nil @@ -64,21 +61,20 @@ func (e *{{.ClassName}}) GetPage(pageSize int, pageIndex int) ([]{{.ClassName}}, // 数据权限控制 dataPermission := new(DataPermission) - dataPermission.UserId, _ = utils.StringToInt64(e.DataScope) + dataPermission.UserId, _ = utils.StringToInt(e.DataScope) table = dataPermission.GetDataScope("{{.TableName}}", table) var count int32 - table = table.Where("is_del = 0").Offset((pageIndex - 1) * pageSize).Limit(pageSize) + table = table.Offset((pageIndex - 1) * pageSize).Limit(pageSize) if err := table.Find(&doc).Error; err != nil { return nil, 0, err } - table.Where("is_del = 0").Count(&count) + table.Count(&count) return doc, count, nil } // 更新{{.ClassName}} func (e *{{.ClassName}}) Update(id int64) (update {{.ClassName}}, err error) { - e.UpdateTime = utils.GetCurrntTime() if err = orm.Eloquent.Table("{{.TableName}}").Where("{{.PkColumn}} = ?", id).First(&update).Error; err != nil { return } @@ -93,11 +89,7 @@ func (e *{{.ClassName}}) Update(id int64) (update {{.ClassName}}, err error) { // 删除{{.ClassName}} func (e *{{.ClassName}}) Delete(id int64) (success bool, err error) { - var mp = map[string]string{} - mp["is_del"] = "1" - mp["update_time"] = utils.GetCurrntTime() - mp["update_by"] = e.UpdateBy - if err = orm.Eloquent.Table("{{.TableName}}").Where("{{.PkColumn}} = ?", id).Update(mp).Error; err != nil { + if err = orm.Eloquent.Table("{{.TableName}}").Where("{{.PkColumn}} = ?", id).Delete(&{{.ClassName}}{}).Error; err != nil { success = false return } diff --git a/test/api.go.template b/test/api.go.template index f10c698..a9595e0 100644 --- a/test/api.go.template +++ b/test/api.go.template @@ -43,7 +43,7 @@ func Get{{.ClassName}}List(c *gin.Context) { data.DataScope = utils.GetUserIdStr(c) result, count, err := data.GetPage(pageSize, pageIndex) - pkg.AssertErr(err, "", -1) + pkg.HasError(err, "", -1) var mp = make(map[string]interface{}, 3) mp["list"] = result @@ -66,9 +66,9 @@ func Get{{.ClassName}}List(c *gin.Context) { // @Security func Get{{.ClassName}}(c *gin.Context) { var data models.{{.ClassName}} - data.{{.PkGoField}}, _ = utils.StringToInt64(c.Param("{{.PkJsonField}}")) + data.{{.PkGoField}}, _ = utils.StringToInt(c.Param("{{.PkJsonField}}")) result, err := data.Get() - pkg.AssertErr(err, "抱歉未找到相关信息", -1) + pkg.HasError(err, "抱歉未找到相关信息", -1) var res models.Response res.Data = result @@ -90,9 +90,9 @@ func Insert{{.ClassName}}(c *gin.Context) { var data models.{{.ClassName}} err := c.BindWith(&data, binding.JSON) data.CreateBy = utils.GetUserIdStr(c) - pkg.AssertErr(err, "", 500) + pkg.HasError(err, "", 500) result, err := data.Create() - pkg.AssertErr(err, "", -1) + pkg.HasError(err, "", -1) var res models.Response res.Data = result @@ -103,10 +103,10 @@ func Insert{{.ClassName}}(c *gin.Context) { func Update{{.ClassName}}(c *gin.Context) { var data models.{{.ClassName}} err := c.BindWith(&data, binding.JSON) - pkg.AssertErr(err, "数据解析失败", -1) + pkg.HasError(err, "数据解析失败", -1) data.UpdateBy = utils.GetUserIdStr(c) result, err := data.Update(data.{{.PkGoField}}) - pkg.AssertErr(err, "", -1) + pkg.HasError(err, "", -1) var res models.Response res.Data = result @@ -115,10 +115,10 @@ func Update{{.ClassName}}(c *gin.Context) { func Delete{{.ClassName}}(c *gin.Context) { var data models.{{.ClassName}} - id, err := utils.StringToInt64(c.Param("{{.PkJsonField}}")) + id, err := utils.StringToInt(c.Param("{{.PkJsonField}}")) data.UpdateBy = utils.GetUserIdStr(c) _, err = data.Delete(id) - pkg.AssertErr(err, "修改失败", 500) + pkg.HasError(err, "修改失败", 500) var res models.Response res.Msg = "删除成功" diff --git a/test/model.go.template b/test/model.go.template index 6ac73f9..500c479 100644 --- a/test/model.go.template +++ b/test/model.go.template @@ -42,7 +42,7 @@ func (e *{{.ClassName}}) Get() ({{.ClassName}}, error) { {{ end }} {{- end -}} - if err := table.Where("is_del = 0").First(&doc).Error; err != nil { + if err := table.First(&doc).Error; err != nil { return doc, err } return doc, nil @@ -63,21 +63,20 @@ func (e *{{.ClassName}}) GetPage(pageSize int, pageIndex int) ([]{{.ClassName}}, // 数据权限控制 dataPermission := new(DataPermission) - dataPermission.UserId, _ = utils.StringToInt64(e.DataScope) + dataPermission.UserId, _ = utils.StringToInt(e.DataScope) table = dataPermission.GetDataScope("{{.TableName}}", table) var count int32 - table = table.Where("is_del = 0").Offset((pageIndex - 1) * pageSize).Limit(pageSize) + table = table.Offset((pageIndex - 1) * pageSize).Limit(pageSize) if err := table.Find(&doc).Error; err != nil { return nil, 0, err } - table.Where("is_del = 0").Count(&count) + table.Count(&count) return doc, count, nil } // 更新{{.ClassName}} -func (e *{{.ClassName}}) Update(id int64) (update {{.ClassName}}, err error) { - e.UpdateTime = utils.GetCurrntTime() +func (e *{{.ClassName}}) Update(id int) (update {{.ClassName}}, err error) { if err = orm.Eloquent.Table("{{.TableName}}").Where("{{.PkColumn}} = ?", id).First(&update).Error; err != nil { return } @@ -91,12 +90,9 @@ func (e *{{.ClassName}}) Update(id int64) (update {{.ClassName}}, err error) { } // 删除{{.ClassName}} -func (e *{{.ClassName}}) Delete(id int64) (success bool, err error) { - var mp = map[string]string{} - mp["is_del"] = "1" - mp["update_time"] = utils.GetCurrntTime() - mp["update_by"] = e.UpdateBy - if err = orm.Eloquent.Table("{{.TableName}}").Where("{{.PkColumn}} = ?", id).Update(mp).Error; err != nil { +func (e *{{.ClassName}}) Delete(id int) (success bool, err error) { + + if err = orm.Eloquent.Table("{{.TableName}}").Where("{{.PkColumn}} = ?", id).Delete(&{{.ClassName}}{}).Error; err != nil { success = false return } diff --git a/utils/string.go b/utils/string.go deleted file mode 100644 index 9408857..0000000 --- a/utils/string.go +++ /dev/null @@ -1,95 +0,0 @@ -package utils - -import ( - "encoding/json" - "fmt" - "github.com/gin-gonic/gin" - "io/ioutil" - "net/http" - "strconv" - "strings" - "time" -) - -func StringToInt64(e string) (int64, error) { - return strconv.ParseInt(e, 10, 64) -} - -func IntToString(e int) string { - return strconv.Itoa(e) -} - -func Float64ToString(e float64) string { - return strconv.FormatFloat(e, 'E', -1, 64) -} - -func Int64ToString(e int64) string { - return strconv.FormatInt(e, 10) -} - -//获取URL中批量id并解析 -func IdsStrToIdsInt64Group(key string, c *gin.Context) []int64 { - IDS := make([]int64, 0) - ids := strings.Split(c.Param(key), ",") - for i := 0; i < len(ids); i++ { - ID, _ := strconv.ParseInt(ids[i], 10, 64) - IDS = append(IDS, ID) - } - return IDS -} - -func GetCurrntTime() string { - return time.Now().Format("2006/01/02 15:04:05") -} - -func GetLocation(ip string) string { - if ip == "127.0.0.1" || ip == "localhost" { - return "内部IP" - } - resp, err := http.Get("https://restapi.amap.com/v3/ip?ip=" + ip + "&key=3fabc36c20379fbb9300c79b19d5d05e") - if err != nil { - panic(err) - - } - defer resp.Body.Close() - s, err := ioutil.ReadAll(resp.Body) - fmt.Printf(string(s)) - - m := make(map[string]string) - - err = json.Unmarshal(s, &m) - if err != nil { - fmt.Println("Umarshal failed:", err) - } - if m["province"] == "" { - return "未知位置" - } - return m["province"] + "-" + m["city"] -} - -func StructToJsonStr(e interface{}) (string, error) { - if b, err := json.Marshal(e); err == nil { - return string(b), err - } else { - return "", err - } -} - -func GetBodyString(c *gin.Context) (string, error) { - body, err := ioutil.ReadAll(c.Request.Body) - if err != nil { - fmt.Printf("read body err, %v\n", err) - return string(body), nil - } else { - return "", err - } -} - -func JsonStrToMap(e string) (map[string]interface{}, error) { - var dict map[string]interface{} - if err := json.Unmarshal([]byte(e), &dict); err == nil { - return dict, err - } else { - return nil, err - } -}