This commit is contained in:
zhangwenjian committed 2020-04-13 00:30:58 +08:00
1 parent f25da5f1ee
commit 1df55e75e5
72 files changed
+1401 -1559

No files matched your search

-1
View File
@@ -1 +0,0 @@
package apis
-41
View File
@@ -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)
}
+18 -18
View File
@@ -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())
}
+14 -14
View File
@@ -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())
}
+19
View File
@@ -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",
})
}
+29 -38
View File
@@ -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)
}
+32 -48
View File
@@ -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,
@@ -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())
}
@@ -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,
+6 -8
View File
@@ -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,"")
}
+29 -49
View File
@@ -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,"")
}
+18 -37
View File
@@ -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,"","删除成功")
}
+34 -69
View File
@@ -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, "", "删除成功")
}
+7 -26
View File
@@ -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
+36 -81
View File
@@ -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, "", "密码修改成功")
}
+3 -3
View File
@@ -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())
+3 -3
View File
@@ -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
+7 -7
View File
@@ -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())
+16 -17
View File
@@ -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())
}