yvan/Study
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Migrate all methods in the model package to the service package

Browse Source
This commit is contained in:
Granty1
2020-04-08 11:07:27 +08:00
parent 2c35adaffc
commit 5d222585dd
49 changed files with 1348 additions and 1261 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/api/v1/exa_breakpoint_continue.go
+5 -5
View File
@@ -3,7 +3,7 @@ package v1
import (
"fmt"
"gin-vue-admin/global/response"
"gin-vue-admin/model"
"gin-vue-admin/service"
"gin-vue-admin/utils"
"github.com/gin-gonic/gin"
"io/ioutil"
@@ -35,7 +35,7 @@ func BreakpointContinue(c *gin.Context) {
cen, _ := ioutil.ReadAll(f)
defer f.Close()
if flag := utils.CheckMd5(cen, chunkMd5); flag {
err, file := new(model.ExaFile).FindOrCreateFile(fileMd5, fileName, chunkTotal)
err, file := service.FindOrCreateFile(fileMd5, fileName, chunkTotal)
if err != nil {
response.Result(response.ERROR, nil, fmt.Sprintf("%v", err), c)
} else {
@@ -43,7 +43,7 @@ func BreakpointContinue(c *gin.Context) {
if err != nil {
response.Result(response.ERROR, nil, fmt.Sprintf("%v", err), c)
} else {
err = file.CreateFileChunk(pathc, chunkNumber)
err = service.CreateFileChunk(file.ID, pathc, chunkNumber)
if err != nil {
response.Result(response.ERROR, nil, fmt.Sprintf("%v", err), c)
} else {
@@ -69,7 +69,7 @@ func FindFile(c *gin.Context) {
fileMd5 := c.Query("fileMd5")
fileName := c.Query("fileName")
chunkTotal, _ := strconv.Atoi(c.Query("chunkTotal"))
err, file := new(model.ExaFile).FindOrCreateFile(fileMd5, fileName, chunkTotal)
err, file := service.FindOrCreateFile(fileMd5, fileName, chunkTotal)
if err != nil {
response.Result(response.ERROR, nil, fmt.Sprintf("查找失败：%v", err), c)
} else {
@@ -109,7 +109,7 @@ func RemoveChunk(c *gin.Context) {
fileName := c.Query("fileName")
filePath := c.Query("filePath")
err := utils.RemoveChunk(fileMd5)
err = new(model.ExaFile).DeleteFileChunk(fileMd5, fileName, filePath)
err = service.DeleteFileChunk(fileMd5, fileName, filePath)
if err != nil {
response.Result(response.ERROR, gin.H{"filePath": filePath}, fmt.Sprintf("缓存切片删除失败：%v", err), c)
} else {
server/api/v1/exa_customer.go
+10 -11
View File
@@ -3,8 +3,9 @@ package v1
import (
"fmt"
"gin-vue-admin/global/response"
"gin-vue-admin/middleware"
"gin-vue-admin/model"
"gin-vue-admin/model/request"
"gin-vue-admin/service"
"github.com/gin-gonic/gin"
)
@@ -20,10 +21,10 @@ func CreateExaCustomer(c *gin.Context) {
var cu model.ExaCustomer
_ = c.ShouldBindJSON(&cu)
claims, _ := c.Get("claims")
waitUse := claims.(*middleware.CustomClaims)
waitUse := claims.(*request.CustomClaims)
cu.SysUserID = waitUse.ID
cu.SysUserAuthorityID = waitUse.AuthorityId
err := cu.CreateExaCustomer()
err := service.CreateExaCustomer(cu)
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("创建失败：%v", err), c)
} else {
@@ -42,7 +43,7 @@ func CreateExaCustomer(c *gin.Context) {
func DeleteExaCustomer(c *gin.Context) {
var cu model.ExaCustomer
_ = c.ShouldBindJSON(&cu)
err := cu.DeleteExaCustomer()
err := service.DeleteExaCustomer(cu)
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("删除失败：%v", err), c)
} else {
@@ -61,7 +62,7 @@ func DeleteExaCustomer(c *gin.Context) {
func UpdateExaCustomer(c *gin.Context) {
var cu model.ExaCustomer
_ = c.ShouldBindJSON(&cu)
err := cu.UpdateExaCustomer()
err := service.UpdateExaCustomer(&cu)
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("更新失败：%v", err), c)
} else {
@@ -80,7 +81,7 @@ func UpdateExaCustomer(c *gin.Context) {
func GetExaCustomer(c *gin.Context) {
var cu model.ExaCustomer
_ = c.ShouldBindJSON(&cu)
err, customer := cu.GetExaCustomer()
err, customer := service.GetExaCustomer(cu.ID)
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("获取失败：%v", err), c)
} else {
@@ -100,12 +101,10 @@ func GetExaCustomer(c *gin.Context) {
// @Router /customer/getExaCustomerList [post]
func GetExaCustomerList(c *gin.Context) {
claims, _ := c.Get("claims")
waitUse := claims.(*middleware.CustomClaims)
var cu model.ExaCustomer
cu.SysUserAuthorityID = waitUse.AuthorityId
var pageInfo model.PageInfo
waitUse := claims.(*request.CustomClaims)
var pageInfo request.PageInfo
_ = c.ShouldBindJSON(&pageInfo)
err, customerList, total := cu.GetInfoList(pageInfo)
err, customerList, total := service.GetCustomerInfoList(waitUse.AuthorityId, pageInfo)
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("创建失败：%v", err), c)
} else {
server/api/v1/exa_file_upload_download.go
+7 -5
View File
@@ -4,6 +4,8 @@ import (
"fmt"
"gin-vue-admin/global/response"
"gin-vue-admin/model"
"gin-vue-admin/model/request"
"gin-vue-admin/service"
"gin-vue-admin/utils"
"github.com/gin-gonic/gin"
"strings"
@@ -36,7 +38,7 @@ func UploadFile(c *gin.Context) {
file.Tag = s[len(s)-1]
file.Key = key
if noSave == "0" {
err = file.Upload()
err = service.Upload(file)
}
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("修改数据库链接失败，%v", err), c)
@@ -58,7 +60,7 @@ func UploadFile(c *gin.Context) {
func DeleteFile(c *gin.Context) {
var file model.ExaFileUploadAndDownload
_ = c.ShouldBindJSON(&file)
err, f := file.FindFile()
err, f := service.FindFile(file.ID)
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("删除失败，%v", err), c)
} else {
@@ -67,7 +69,7 @@ func DeleteFile(c *gin.Context) {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("删除失败，%v", err), c)
} else {
err = f.DeleteFile()
err = service.DeleteFile(f)
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("删除失败，%v", err), c)
} else {
@@ -86,9 +88,9 @@ func DeleteFile(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /fileUploadAndDownload/getFileList [post]
func GetFileList(c *gin.Context) {
var pageInfo model.PageInfo
var pageInfo request.PageInfo
_ = c.ShouldBindJSON(&pageInfo)
err, list, total := new(model.ExaFileUploadAndDownload).GetInfoList(pageInfo)
err, list, total := service.GetFileRecordInfoList(pageInfo)
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("获取数据失败，%v", err), c)
} else {
server/api/v1/sys_api.go
+10 -8
View File
@@ -4,6 +4,8 @@ import (
"fmt"
"gin-vue-admin/global/response"
"gin-vue-admin/model"
"gin-vue-admin/model/request"
"gin-vue-admin/service"
"github.com/gin-gonic/gin"
)
@@ -18,7 +20,7 @@ import (
func CreateApi(c *gin.Context) {
var api model.SysApi
_ = c.ShouldBindJSON(&api)
err := api.CreateApi()
err := service.CreateApi(api)
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("创建失败，%v", err), c)
} else {
@@ -37,7 +39,7 @@ func CreateApi(c *gin.Context) {
func DeleteApi(c *gin.Context) {
var a model.SysApi
_ = c.ShouldBindJSON(&a)
err := a.DeleteApi()
err := service.DeleteApi(a)
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("删除失败，%v", err), c)
} else {
@@ -57,9 +59,9 @@ func DeleteApi(c *gin.Context) {
// @Router /api/getApiList [post]
func GetApiList(c *gin.Context) {
// 此结构体仅本方法使用
var sp model.SearchApiParams
var sp request.SearchApiParams
_ = c.ShouldBindJSON(&sp)
err, list, total := sp.SysApi.GetInfoList(sp.PageInfo, sp.OrderKey, sp.Desc)
err, list, total := service.GetAPIInfoList(sp.SysApi, sp.PageInfo, sp.OrderKey, sp.Desc)
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("获取数据失败，%v", err), c)
} else {
@@ -81,9 +83,9 @@ func GetApiList(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /api/getApiById [post]
func GetApiById(c *gin.Context) {
var idInfo model.GetById
var idInfo request.GetById
_ = c.ShouldBindJSON(&idInfo)
err, api := new(model.SysApi).GetApiById(idInfo.Id)
err, api := service.GetApiById(idInfo.Id)
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("获取数据失败，%v", err), c)
} else {
@@ -105,7 +107,7 @@ func GetApiById(c *gin.Context) {
func UpdateApi(c *gin.Context) {
var api model.SysApi
_ = c.ShouldBindJSON(&api)
err := api.UpdateApi()
err := service.UpdateApi(api)
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("修改数据失败，%v", err), c)
} else {
@@ -121,7 +123,7 @@ func UpdateApi(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /api/getAllApis [post]
func GetAllApis(c *gin.Context) {
err, apis := new(model.SysApi).GetAllApis()
err, apis := service.GetAllApis()
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("获取数据失败，%v", err), c)
} else {
server/api/v1/sys_authority.go
+7 -5
View File
@@ -4,6 +4,8 @@ import (
"fmt"
"gin-vue-admin/global/response"
"gin-vue-admin/model"
"gin-vue-admin/model/request"
"gin-vue-admin/service"
"github.com/gin-gonic/gin"
)
@@ -18,7 +20,7 @@ import (
func CreateAuthority(c *gin.Context) {
var auth model.SysAuthority
_ = c.ShouldBindJSON(&auth)
err, authBack := auth.CreateAuthority()
err, authBack := service.CreateAuthority(&auth)
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("创建失败，%v", err), c)
} else {
@@ -40,7 +42,7 @@ func DeleteAuthority(c *gin.Context) {
var a model.SysAuthority
_ = c.ShouldBindJSON(&a)
//删除角色之前需要判断是否有用户正在使用此角色
err := a.DeleteAuthority()
err := service.DeleteAuthority(a)
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("删除失败，%v", err), c)
} else {
@@ -57,9 +59,9 @@ func DeleteAuthority(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /authority/getAuthorityList [post]
func GetAuthorityList(c *gin.Context) {
var pageInfo model.PageInfo
var pageInfo request.PageInfo
_ = c.ShouldBindJSON(&pageInfo)
err, list, total := new(model.SysAuthority).GetInfoList(pageInfo)
err, list, total := service.GetAuthorityInfoList(pageInfo)
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("获取数据失败，%v", err), c)
} else {
@@ -83,7 +85,7 @@ func GetAuthorityList(c *gin.Context) {
func SetDataAuthority(c *gin.Context) {
var auth model.SysAuthority
_ = c.ShouldBindJSON(&auth)
err := auth.SetDataAuthority()
err := service.SetDataAuthority(auth)
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("设置关联失败，%v", err), c)
} else {
server/api/v1/sys_auto_code.go
+2 -1
View File
@@ -4,6 +4,7 @@ import (
"fmt"
"gin-vue-admin/global/response"
"gin-vue-admin/model"
"gin-vue-admin/service"
"github.com/gin-gonic/gin"
"os"
)
@@ -19,7 +20,7 @@ import (
func CreateTemp(c *gin.Context) {
var a model.AutoCodeStruct
_ = c.ShouldBindJSON(&a)
err := a.CreateTemp()
err := service.CreateTemp(a)
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("创建失败，%v", err), c)
os.Remove("./ginvueadmin.zip")
server/api/v1/sys_casbin.go
+6 -5
View File
@@ -3,7 +3,8 @@ package v1
import (
"fmt"
"gin-vue-admin/global/response"
"gin-vue-admin/model"
"gin-vue-admin/model/request"
"gin-vue-admin/service"
"github.com/gin-gonic/gin"
)
@@ -16,9 +17,9 @@ import (
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /casbin/UpdateCasbin [post]
func UpdateCasbin(c *gin.Context) {
var cmr model.CasbinInReceive
var cmr request.CasbinInReceive
_ = c.ShouldBindJSON(&cmr)
err := new(model.CasbinModel).UpdateCasbin(cmr.AuthorityId, cmr.CasbinInfos)
err := service.UpdateCasbin(cmr.AuthorityId, cmr.CasbinInfos)
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("添加规则失败，%v", err), c)
} else {
@@ -35,9 +36,9 @@ func UpdateCasbin(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /casbin/getPolicyPathByAuthorityId [post]
func GetPolicyPathByAuthorityId(c *gin.Context) {
var cmr model.CasbinInReceive
var cmr request.CasbinInReceive
_ = c.ShouldBindJSON(&cmr)
paths := new(model.CasbinModel).GetPolicyPathByAuthorityId(cmr.AuthorityId)
paths := service.GetPolicyPathByAuthorityId(cmr.AuthorityId)
response.Result(response.SUCCESS, gin.H{"paths": paths}, "获取规则成功", c)
}
server/api/v1/sys_jwt_blacklist.go
+3 -2
View File
@@ -4,6 +4,7 @@ import (
"fmt"
"gin-vue-admin/global/response"
"gin-vue-admin/model"
"gin-vue-admin/service"
"github.com/gin-gonic/gin"
)
@@ -16,10 +17,10 @@ import (
// @Router /jwt/jsonInBlacklist [post]
func JsonInBlacklist(c *gin.Context) {
token := c.Request.Header.Get("x-token")
ModelJwt := model.JwtBlacklist{
modelJwt := model.JwtBlacklist{
Jwt: token,
}
err := ModelJwt.JsonInBlacklist()
err := service.JsonInBlacklist(modelJwt)
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("jwt作废失败，%v", err), c)
} else {
server/api/v1/sys_menu.go
+19 -18
View File
@@ -3,8 +3,9 @@ package v1
import (
"fmt"
"gin-vue-admin/global/response"
"gin-vue-admin/middleware"
"gin-vue-admin/model"
"gin-vue-admin/model/request"
"gin-vue-admin/service"
"github.com/gin-gonic/gin"
)
@@ -17,8 +18,8 @@ import (
// @Router /menu/getMenu [post]
func GetMenu(c *gin.Context) {
claims, _ := c.Get("claims")
waitUse := claims.(*middleware.CustomClaims)
err, menus := new(model.SysMenu).GetMenuTree(waitUse.AuthorityId)
waitUse := claims.(*request.CustomClaims)
err, menus := service.GetMenuTree(waitUse.AuthorityId)
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("获取失败，%v", err), c)
} else {
@@ -35,9 +36,9 @@ func GetMenu(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /menu/getMenuList [post]
func GetMenuList(c *gin.Context) {
var pageInfo model.PageInfo
var pageInfo request.PageInfo
_ = c.ShouldBindJSON(&pageInfo)
err, menuList, total := new(model.SysBaseMenu).GetInfoList(pageInfo)
err, menuList, total := service.GetInfoList(pageInfo)
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("获取数据失败，%v", err), c)
} else {
@@ -59,9 +60,9 @@ func GetMenuList(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /menu/addBaseMenu [post]
func AddBaseMenu(c *gin.Context) {
var addMenu model.SysBaseMenu
_ = c.ShouldBindJSON(&addMenu)
err := addMenu.AddBaseMenu()
var menu model.SysBaseMenu
_ = c.ShouldBindJSON(&menu)
err := service.AddBaseMenu(menu)
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("添加失败，%v", err), c)
} else {
@@ -77,7 +78,7 @@ func AddBaseMenu(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"返回成功"}"
// @Router /menu/getBaseMenuTree [post]
func GetBaseMenuTree(c *gin.Context) {
err, menus := new(model.SysBaseMenu).GetBaseMenuTree()
err, menus := service.GetBaseMenuTree()
if err != nil {
response.Result(response.ERROR, gin.H{"menus": menus}, fmt.Sprintf("获取失败，%v", err), c)
} else {
@@ -95,10 +96,10 @@ func GetBaseMenuTree(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /menu/addMenuAuthority [post]
func AddMenuAuthority(c *gin.Context) {
var addMenuAuthorityInfo model.AddMenuAuthorityInfo
var addMenuAuthorityInfo request.AddMenuAuthorityInfo
_ = c.ShouldBindJSON(&addMenuAuthorityInfo)
err := new(model.SysMenu).AddMenuAuthority(addMenuAuthorityInfo.Menus, addMenuAuthorityInfo.AuthorityId)
err := service.AddMenuAuthority(addMenuAuthorityInfo.Menus, addMenuAuthorityInfo.AuthorityId)
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("添加失败，%v", err), c)
} else {
@@ -115,9 +116,9 @@ func AddMenuAuthority(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /menu/GetMenuAuthority [post]
func GetMenuAuthority(c *gin.Context) {
var authorityIdInfo model.AuthorityIdInfo
var authorityIdInfo request.AuthorityIdInfo
_ = c.ShouldBindJSON(&authorityIdInfo)
err, menus := new(model.SysMenu).GetMenuAuthority(authorityIdInfo.AuthorityId)
err, menus := service.GetMenuAuthority(authorityIdInfo.AuthorityId)
if err != nil {
response.Result(response.ERROR, gin.H{"menus": menus}, fmt.Sprintf("添加失败，%v", err), c)
} else {
@@ -134,9 +135,9 @@ func GetMenuAuthority(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /menu/deleteBaseMenu [post]
func DeleteBaseMenu(c *gin.Context) {
var idInfo model.GetById
var idInfo request.GetById
_ = c.ShouldBindJSON(&idInfo)
err := new(model.SysBaseMenu).DeleteBaseMenu(idInfo.Id)
err := service.DeleteBaseMenu(idInfo.Id)
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("删除失败：%v", err), c)
} else {
@@ -156,7 +157,7 @@ func DeleteBaseMenu(c *gin.Context) {
func UpdateBaseMenu(c *gin.Context) {
var menu model.SysBaseMenu
_ = c.ShouldBindJSON(&menu)
err := menu.UpdateBaseMenu()
err := service.UpdateBaseMenu(menu)
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("修改失败：%v", err), c)
} else {
@@ -173,9 +174,9 @@ func UpdateBaseMenu(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /menu/getBaseMenuById [post]
func GetBaseMenuById(c *gin.Context) {
var idInfo model.GetById
var idInfo request.GetById
_ = c.ShouldBindJSON(&idInfo)
err, menu := new(model.SysBaseMenu).GetBaseMenuById(idInfo.Id)
err, menu := service.GetBaseMenuById(idInfo.Id)
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("查询失败：%v", err), c)
} else {
server/api/v1/sys_system.go
+4 -3
View File
@@ -4,6 +4,7 @@ import (
"fmt"
"gin-vue-admin/global/response"
"gin-vue-admin/model"
"gin-vue-admin/service"
"github.com/gin-gonic/gin"
)
@@ -14,7 +15,7 @@ import (
// @Success 200 {string} string "{"success":true,"data":{},"msg":"返回成功"}"
// @Router /system/getSystemConfig [post]
func GetSystemConfig(c *gin.Context) {
err, config := new(model.System).GetSystemConfig()
err, config := service.GetSystemConfig()
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("获取失败，%v", err), c)
} else {
@@ -32,7 +33,7 @@ func GetSystemConfig(c *gin.Context) {
func SetSystemConfig(c *gin.Context) {
var sys model.System
_ = c.ShouldBindJSON(&sys)
err := sys.SetSystemConfig()
err := service.SetSystemConfig(sys)
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("设置失败，%v", err), c)
} else {
@@ -51,7 +52,7 @@ func SetSystemConfig(c *gin.Context) {
func ReloadSystem(c *gin.Context) {
var sys model.System
_ = c.ShouldBindJSON(&sys)
err := sys.SetSystemConfig()
err := service.SetSystemConfig(sys)
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("设置失败，%v", err), c)
} else {
server/api/v1/sys_user.go
+21 -19
View File
@@ -6,6 +6,8 @@ import (
"gin-vue-admin/global/response"
"gin-vue-admin/middleware"
"gin-vue-admin/model"
"gin-vue-admin/model/request"
"gin-vue-admin/service"
"gin-vue-admin/utils"
"github.com/dchest/captcha"
"github.com/dgrijalva/jwt-go"
@@ -27,10 +29,10 @@ const (
// @Success 200 {string} string "{"success":true,"data":{},"msg":"注册成功"}"
// @Router /base/register [post]
func Register(c *gin.Context) {
var R model.RegisterStruct
var R request.RegisterStruct
_ = c.ShouldBindJSON(&R)
user := &model.SysUser{Username: R.Username, NickName: R.NickName, Password: R.Password, HeaderImg: R.HeaderImg, AuthorityId: R.AuthorityId}
err, user := user.Register()
err, user := service.Register(user)
if err != nil {
response.Result(response.ERROR, gin.H{
"user": user,
@@ -49,11 +51,11 @@ func Register(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"登陆成功"}"
// @Router /base/login [post]
func Login(c *gin.Context) {
var L model.RegisterAndLoginStruct
var L request.RegisterAndLoginStruct
_ = c.ShouldBindJSON(&L)
if captcha.VerifyString(L.CaptchaId, L.Captcha) {
U := &model.SysUser{Username: L.Username, Password: L.Password}
if err, user := U.Login(); err != nil {
if err, user := service.Login(U); err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("用户名密码错误或%v", err), c)
} else {
tokenNext(c, *user)
@@ -69,7 +71,7 @@ func tokenNext(c *gin.Context, user model.SysUser) {
j := &middleware.JWT{
[]byte(global.GVA_CONFIG.JWT.SigningKey), // 唯一签名
}
clams := middleware.CustomClaims{
clams := request.CustomClaims{
UUID: user.UUID,
ID: user.ID,
NickName: user.NickName,
@@ -87,9 +89,9 @@ func tokenNext(c *gin.Context, user model.SysUser) {
if global.GVA_CONFIG.System.UseMultipoint {
var loginJwt model.JwtBlacklist
loginJwt.Jwt = token
err, jwtStr := loginJwt.GetRedisJWT(user.Username)
err, jwtStr := service.GetRedisJWT(user.Username)
if err == redis.Nil {
err2 := loginJwt.SetRedisJWT(user.Username)
err2 := service.SetRedisJWT(loginJwt, user.Username)
if err2 != nil {
response.Result(response.ERROR, gin.H{}, "设置登录状态失败", c)
} else {
@@ -98,13 +100,13 @@ func tokenNext(c *gin.Context, user model.SysUser) {
} else if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("%v", err), c)
} else {
var blackjWT model.JwtBlacklist
blackjWT.Jwt = jwtStr
err3 := blackjWT.JsonInBlacklist()
var blackJWT model.JwtBlacklist
blackJWT.Jwt = jwtStr
err3 := service.JsonInBlacklist(blackJWT)
if err3 != nil {
response.Result(response.ERROR, gin.H{}, "jwt作废失败", c)
} else {
err2 := loginJwt.SetRedisJWT(user.Username)
err2 := service.SetRedisJWT(loginJwt, user.Username)
if err2 != nil {
response.Result(response.ERROR, gin.H{}, "设置登录状态失败", c)
} else {
@@ -126,10 +128,10 @@ func tokenNext(c *gin.Context, user model.SysUser) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"修改成功"}"
// @Router /user/changePassword [put]
func ChangePassword(c *gin.Context) {
var params model.ChangePasswordStutrc
var params request.ChangePasswordStruct
_ = c.ShouldBindJSON(&params)
U := &model.SysUser{Username: params.Username, Password: params.Password}
if err, _ := U.ChangePassword(params.NewPassword); err != nil {
if err, _ := service.ChangePassword(U, params.NewPassword); err != nil {
response.Result(response.ERROR, gin.H{}, "修改失败，请检查用户名密码", c)
} else {
response.Result(response.SUCCESS, gin.H{}, "修改成功", c)
@@ -153,7 +155,7 @@ func UploadHeaderImg(c *gin.Context) {
claims, _ := c.Get("claims")
//获取头像文件
// 这里我们通过断言获取 claims内的所有内容
waitUse := claims.(*middleware.CustomClaims)
waitUse := claims.(*request.CustomClaims)
uuid := waitUse.UUID
_, header, err := c.Request.FormFile("headerImg")
//便于找到用户 以后从jwt中取
@@ -166,7 +168,7 @@ func UploadHeaderImg(c *gin.Context) {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("接收返回值失败，%v", err), c)
} else {
//修改数据库后得到修改后的user并且返回供前端使用
err, user := new(model.SysUser).UploadHeaderImg(uuid, filePath)
err, user := service.UploadHeaderImg(uuid, filePath)
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("修改数据库链接失败，%v", err), c)
} else {
@@ -185,9 +187,9 @@ func UploadHeaderImg(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /user/getUserList [post]
func GetUserList(c *gin.Context) {
var pageInfo model.PageInfo
var pageInfo request.PageInfo
_ = c.ShouldBindJSON(&pageInfo)
err, list, total := new(model.SysUser).GetInfoList(pageInfo)
err, list, total := service.GetUserInfoList(pageInfo)
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("获取数据失败，%v", err), c)
} else {
@@ -209,9 +211,9 @@ func GetUserList(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"修改成功"}"
// @Router /user/setUserAuthority [post]
func SetUserAuthority(c *gin.Context) {
var sua model.SetUserAuth
var sua request.SetUserAuth
_ = c.ShouldBindJSON(&sua)
err := new(model.SysUser).SetUserAuthority(sua.UUID, sua.AuthorityId)
err := service.SetUserAuthority(sua.UUID, sua.AuthorityId)
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("修改失败，%v", err), c)
} else {
server/api/v1/sys_work_flow.go
+2 -1
View File
@@ -4,6 +4,7 @@ import (
"fmt"
"gin-vue-admin/global/response"
"gin-vue-admin/model"
"gin-vue-admin/service"
"github.com/gin-gonic/gin"
)
@@ -16,7 +17,7 @@ import (
func CreateWorkFlow(c *gin.Context) {
var wk model.SysWorkflow
_ = c.ShouldBindJSON(&wk)
err := wk.Create()
err := service.Create(wk)
if err != nil {
response.Result(response.ERROR, gin.H{}, fmt.Sprintf("获取失败：%v", err), c)
} else {