Skip to content

G
gin-vue-admin

FLIPPED-AURORA / gin-vue-admin
大约 1 年 前同步成功

通知 332
Star 18154
Fork 5505
G
gin-vue-admin

体验新版 GitCode，发现更多精彩内容 >>

提交 9c5afb7c 编写于 作者: Mr.奇淼（'s avatar Mr.奇淼（
浏览文件
操作

模块化变更

上级 1bb13a3d
展开全部 隐藏空白更改
内联 并排
Showing with 643 addition and 447 deletion
server/api/v1/exa_breakpoint_continue.go
浏览文件 @ 9c5afb7c
......@@ -2,7 +2,7 @@ package v1
import (
"gin-vue-admin/global"
"gin-vue-admin/model/response"
"gin-vue-admin/model/example/response"
"gin-vue-admin/service"
"gin-vue-admin/utils"
"github.com/gin-gonic/gin"
......
server/api/v1/exa_customer.go
浏览文件 @ 9c5afb7c
......@@ -2,9 +2,9 @@ package v1
import (
"gin-vue-admin/global"
"gin-vue-admin/model"
"gin-vue-admin/model/request"
"gin-vue-admin/model/response"
"gin-vue-admin/model/example"
"gin-vue-admin/model/example/request"
"gin-vue-admin/model/example/response"
"gin-vue-admin/service"
"gin-vue-admin/utils"
"github.com/gin-gonic/gin"
......@@ -20,7 +20,7 @@ import (
// @Success 200 {string} string "{"success":true,"data":{},"msg":"创建成功"}"
// @Router /customer/customer [post]
func CreateExaCustomer(c *gin.Context) {
var customer model.ExaCustomer
var customer example.ExaCustomer
_ = c.ShouldBindJSON(&customer)
if err := utils.Verify(customer, utils.CustomerVerify); err != nil {
response.FailWithMessage(err.Error(), c)
......@@ -45,7 +45,7 @@ func CreateExaCustomer(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
// @Router /customer/customer [delete]
func DeleteExaCustomer(c *gin.Context) {
var customer model.ExaCustomer
var customer example.ExaCustomer
_ = c.ShouldBindJSON(&customer)
if err := utils.Verify(customer.GVA_MODEL, utils.IdVerify); err != nil {
response.FailWithMessage(err.Error(), c)
......@@ -68,7 +68,7 @@ func DeleteExaCustomer(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"更新成功"}"
// @Router /customer/customer [put]
func UpdateExaCustomer(c *gin.Context) {
var customer model.ExaCustomer
var customer example.ExaCustomer
_ = c.ShouldBindJSON(&customer)
if err := utils.Verify(customer.GVA_MODEL, utils.IdVerify); err != nil {
response.FailWithMessage(err.Error(), c)
......@@ -95,7 +95,7 @@ func UpdateExaCustomer(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /customer/customer [get]
func GetExaCustomer(c *gin.Context) {
var customer model.ExaCustomer
var customer example.ExaCustomer
_ = c.ShouldBindQuery(&customer)
if err := utils.Verify(customer.GVA_MODEL, utils.IdVerify); err != nil {
response.FailWithMessage(err.Error(), c)
......
server/api/v1/exa_excel.go
浏览文件 @ 9c5afb7c
......@@ -2,7 +2,7 @@ package v1
import (
"gin-vue-admin/global"
"gin-vue-admin/model"
"gin-vue-admin/model/example"
"gin-vue-admin/model/response"
"gin-vue-admin/service"
"gin-vue-admin/utils"
......@@ -24,7 +24,7 @@ import (
// @Success 200
// @Router /excel/exportExcel [post]
func ExportExcel(c *gin.Context) {
var excelInfo model.ExcelInfo
var excelInfo example.ExcelInfo
_ = c.ShouldBindJSON(&excelInfo)
filePath := global.GVA_CONFIG.Excel.Dir + excelInfo.FileName
err := service.ParseInfoList2Excel(excelInfo.InfoList, filePath)
......
server/api/v1/exa_file_upload_download.go
浏览文件 @ 9c5afb7c
......@@ -2,9 +2,9 @@ package v1
import (
"gin-vue-admin/global"
"gin-vue-admin/model"
"gin-vue-admin/model/request"
"gin-vue-admin/model/response"
"gin-vue-admin/model/example"
"gin-vue-admin/model/example/request"
"gin-vue-admin/model/example/response"
"gin-vue-admin/service"
"github.com/gin-gonic/gin"
"go.uber.org/zap"
......@@ -19,7 +19,7 @@ import (
// @Success 200 {string} string "{"success":true,"data":{},"msg":"上传成功"}"
// @Router /fileUploadAndDownload/upload [post]
func UploadFile(c *gin.Context) {
var file model.ExaFileUploadAndDownload
var file example.ExaFileUploadAndDownload
noSave := c.DefaultQuery("noSave", "0")
_, header, err := c.Request.FormFile("file")
if err != nil {
......@@ -44,7 +44,7 @@ func UploadFile(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
// @Router /fileUploadAndDownload/deleteFile [post]
func DeleteFile(c *gin.Context) {
var file model.ExaFileUploadAndDownload
var file example.ExaFileUploadAndDownload
_ = c.ShouldBindJSON(&file)
if err := service.DeleteFile(file); err != nil {
global.GVA_LOG.Error("删除失败!", zap.Any("err", err))
......
server/api/v1/exa_simple_uploader.go
浏览文件 @ 9c5afb7c
......@@ -2,7 +2,7 @@ package v1
import (
"gin-vue-admin/global"
"gin-vue-admin/model"
"gin-vue-admin/model/example"
"gin-vue-admin/model/response"
"gin-vue-admin/service"
"gin-vue-admin/utils"
......@@ -19,7 +19,7 @@ import (
// @Success 200 {string} string "{"success":true,"data":{},"msg":"切片创建成功"}"
// @Router /simpleUploader/upload [post]
func SimpleUploaderUpload(c *gin.Context) {
var chunk model.ExaSimpleUploader
var chunk example.ExaSimpleUploader
_, header, err := c.Request.FormFile("file")
chunk.Filename = c.PostForm("filename")
chunk.ChunkNumber = c.PostForm("chunkNumber")
......
server/api/v1/sys_api.go
浏览文件 @ 9c5afb7c
......@@ -2,9 +2,9 @@ package v1
import (
"gin-vue-admin/global"
"gin-vue-admin/model"
"gin-vue-admin/model/request"
"gin-vue-admin/model/response"
"gin-vue-admin/model/system"
"gin-vue-admin/model/system/request"
"gin-vue-admin/model/system/response"
"gin-vue-admin/service"
"gin-vue-admin/utils"
......@@ -21,7 +21,7 @@ import (
// @Success 200 {string} string "{"success":true,"data":{},"msg":"创建成功"}"
// @Router /api/createApi [post]
func CreateApi(c *gin.Context) {
var api model.SysApi
var api system.SysApi
_ = c.ShouldBindJSON(&api)
if err := utils.Verify(api, utils.ApiVerify); err != nil {
response.FailWithMessage(err.Error(), c)
......@@ -44,7 +44,7 @@ func CreateApi(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
// @Router /api/deleteApi [post]
func DeleteApi(c *gin.Context) {
var api model.SysApi
var api system.SysApi
_ = c.ShouldBindJSON(&api)
if err := utils.Verify(api.GVA_MODEL, utils.IdVerify); err != nil {
response.FailWithMessage(err.Error(), c)
......@@ -119,7 +119,7 @@ func GetApiById(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"修改成功"}"
// @Router /api/updateApi [post]
func UpdateApi(c *gin.Context) {
var api model.SysApi
var api system.SysApi
_ = c.ShouldBindJSON(&api)
if err := utils.Verify(api, utils.ApiVerify); err != nil {
response.FailWithMessage(err.Error(), c)
......
server/api/v1/sys_authority.go
浏览文件 @ 9c5afb7c
......@@ -2,9 +2,9 @@ package v1
import (
"gin-vue-admin/global"
"gin-vue-admin/model"
"gin-vue-admin/model/request"
"gin-vue-admin/model/response"
"gin-vue-admin/model/system"
"gin-vue-admin/model/system/request"
"gin-vue-admin/model/system/response"
"gin-vue-admin/service"
"gin-vue-admin/utils"
......@@ -21,7 +21,7 @@ import (
// @Success 200 {string} string "{"success":true,"data":{},"msg":"创建成功"}"
// @Router /authority/createAuthority [post]
func CreateAuthority(c *gin.Context) {
var authority model.SysAuthority
var authority system.SysAuthority
_ = c.ShouldBindJSON(&authority)
if err := utils.Verify(authority, utils.AuthorityVerify); err != nil {
response.FailWithMessage(err.Error(), c)
......@@ -72,7 +72,7 @@ func CopyAuthority(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
// @Router /authority/deleteAuthority [post]
func DeleteAuthority(c *gin.Context) {
var authority model.SysAuthority
var authority system.SysAuthority
_ = c.ShouldBindJSON(&authority)
if err := utils.Verify(authority, utils.AuthorityIdVerify); err != nil {
response.FailWithMessage(err.Error(), c)
......@@ -95,7 +95,7 @@ func DeleteAuthority(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"更新成功"}"
// @Router /authority/updateAuthority [post]
func UpdateAuthority(c *gin.Context) {
var auth model.SysAuthority
var auth system.SysAuthority
_ = c.ShouldBindJSON(&auth)
if err := utils.Verify(auth, utils.AuthorityVerify); err != nil {
response.FailWithMessage(err.Error(), c)
......@@ -146,7 +146,7 @@ func GetAuthorityList(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"设置成功"}"
// @Router /authority/setDataAuthority [post]
func SetDataAuthority(c *gin.Context) {
var auth model.SysAuthority
var auth system.SysAuthority
_ = c.ShouldBindJSON(&auth)
if err := utils.Verify(auth, utils.AuthorityIdVerify); err != nil {
response.FailWithMessage(err.Error(), c)
......
server/api/v1/sys_auto_code.go
浏览文件 @ 9c5afb7c
......@@ -4,9 +4,9 @@ import (
"errors"
"fmt"
"gin-vue-admin/global"
"gin-vue-admin/model"
"gin-vue-admin/model/request"
"gin-vue-admin/model/response"
"gin-vue-admin/model/system"
"gin-vue-admin/model/system/request"
"gin-vue-admin/model/system/response"
"gin-vue-admin/service"
"gin-vue-admin/utils"
"net/url"
......@@ -108,7 +108,7 @@ func GetMeta(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"创建成功"}"
// @Router /autoCode/preview [post]
func PreviewTemp(c *gin.Context) {
var a model.AutoCodeStruct
var a system.AutoCodeStruct
_ = c.ShouldBindJSON(&a)
if err := utils.Verify(a, utils.AutoCodeVerify); err != nil {
response.FailWithMessage(err.Error(), c)
......@@ -132,7 +132,7 @@ func PreviewTemp(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"创建成功"}"
// @Router /autoCode/createTemp [post]
func CreateTemp(c *gin.Context) {
var a model.AutoCodeStruct
var a system.AutoCodeStruct
_ = c.ShouldBindJSON(&a)
if err := utils.Verify(a, utils.AutoCodeVerify); err != nil {
response.FailWithMessage(err.Error(), c)
......@@ -151,7 +151,7 @@ func CreateTemp(c *gin.Context) {
}
err := service.CreateTemp(a, apiIds...)
if err != nil {
if errors.Is(err, model.AutoMoveErr) {
if errors.Is(err, system.AutoMoveErr) {
c.Writer.Header().Add("success", "false")
c.Writer.Header().Add("msgtype", "success")
c.Writer.Header().Add("msg", url.QueryEscape(err.Error()))
......
server/api/v1/sys_captcha.go
浏览文件 @ 9c5afb7c
......@@ -2,7 +2,7 @@ package v1
import (
"gin-vue-admin/global"
"gin-vue-admin/model/response"
"gin-vue-admin/model/system/response"
"github.com/gin-gonic/gin"
"github.com/mojocn/base64Captcha"
"go.uber.org/zap"
......
server/api/v1/sys_casbin.go
浏览文件 @ 9c5afb7c
......@@ -2,8 +2,8 @@ package v1
import (
"gin-vue-admin/global"
"gin-vue-admin/model/request"
"gin-vue-admin/model/response"
"gin-vue-admin/model/system/request"
"gin-vue-admin/model/system/response"
"gin-vue-admin/service"
"gin-vue-admin/utils"
"github.com/gin-gonic/gin"
......
server/api/v1/sys_dictionary.go
浏览文件 @ 9c5afb7c
......@@ -2,9 +2,9 @@ package v1
import (
"gin-vue-admin/global"
"gin-vue-admin/model"
"gin-vue-admin/model/request"
"gin-vue-admin/model/response"
"gin-vue-admin/model/system"
"gin-vue-admin/model/system/request"
"gin-vue-admin/model/system/response"
"gin-vue-admin/service"
"gin-vue-admin/utils"
"github.com/gin-gonic/gin"
......@@ -20,7 +20,7 @@ import (
// @Success 200 {string} string "{"success":true,"data":{},"msg":"创建成功"}"
// @Router /sysDictionary/createSysDictionary [post]
func CreateSysDictionary(c *gin.Context) {
var dictionary model.SysDictionary
var dictionary system.SysDictionary
_ = c.ShouldBindJSON(&dictionary)
if err := service.CreateSysDictionary(dictionary); err != nil {
global.GVA_LOG.Error("创建失败!", zap.Any("err", err))
......@@ -39,7 +39,7 @@ func CreateSysDictionary(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
// @Router /sysDictionary/deleteSysDictionary [delete]
func DeleteSysDictionary(c *gin.Context) {
var dictionary model.SysDictionary
var dictionary system.SysDictionary
_ = c.ShouldBindJSON(&dictionary)
if err := service.DeleteSysDictionary(dictionary); err != nil {
global.GVA_LOG.Error("删除失败!", zap.Any("err", err))
......@@ -58,7 +58,7 @@ func DeleteSysDictionary(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"更新成功"}"
// @Router /sysDictionary/updateSysDictionary [put]
func UpdateSysDictionary(c *gin.Context) {
var dictionary model.SysDictionary
var dictionary system.SysDictionary
_ = c.ShouldBindJSON(&dictionary)
if err := service.UpdateSysDictionary(&dictionary); err != nil {
global.GVA_LOG.Error("更新失败!", zap.Any("err", err))
......@@ -77,7 +77,7 @@ func UpdateSysDictionary(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
// @Router /sysDictionary/findSysDictionary [get]
func FindSysDictionary(c *gin.Context) {
var dictionary model.SysDictionary
var dictionary system.SysDictionary
_ = c.ShouldBindQuery(&dictionary)
if err, sysDictionary := service.GetSysDictionary(dictionary.Type, dictionary.ID); err != nil {
global.GVA_LOG.Error("查询失败!", zap.Any("err", err))
......
server/api/v1/sys_dictionary_detail.go
浏览文件 @ 9c5afb7c
......@@ -2,9 +2,9 @@ package v1
import (
"gin-vue-admin/global"
"gin-vue-admin/model"
"gin-vue-admin/model/request"
"gin-vue-admin/model/response"
"gin-vue-admin/model/system"
"gin-vue-admin/model/system/request"
"gin-vue-admin/model/system/response"
"gin-vue-admin/service"
"gin-vue-admin/utils"
"github.com/gin-gonic/gin"
......@@ -20,7 +20,7 @@ import (
// @Success 200 {string} string "{"success":true,"data":{},"msg":"创建成功"}"
// @Router /sysDictionaryDetail/createSysDictionaryDetail [post]
func CreateSysDictionaryDetail(c *gin.Context) {
var detail model.SysDictionaryDetail
var detail system.SysDictionaryDetail
_ = c.ShouldBindJSON(&detail)
if err := service.CreateSysDictionaryDetail(detail); err != nil {
global.GVA_LOG.Error("创建失败!", zap.Any("err", err))
......@@ -39,7 +39,7 @@ func CreateSysDictionaryDetail(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
// @Router /sysDictionaryDetail/deleteSysDictionaryDetail [delete]
func DeleteSysDictionaryDetail(c *gin.Context) {
var detail model.SysDictionaryDetail
var detail system.SysDictionaryDetail
_ = c.ShouldBindJSON(&detail)
if err := service.DeleteSysDictionaryDetail(detail); err != nil {
global.GVA_LOG.Error("删除失败!", zap.Any("err", err))
......@@ -58,7 +58,7 @@ func DeleteSysDictionaryDetail(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"更新成功"}"
// @Router /sysDictionaryDetail/updateSysDictionaryDetail [put]
func UpdateSysDictionaryDetail(c *gin.Context) {
var detail model.SysDictionaryDetail
var detail system.SysDictionaryDetail
_ = c.ShouldBindJSON(&detail)
if err := service.UpdateSysDictionaryDetail(&detail); err != nil {
global.GVA_LOG.Error("更新失败!", zap.Any("err", err))
......@@ -77,7 +77,7 @@ func UpdateSysDictionaryDetail(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
// @Router /sysDictionaryDetail/findSysDictionaryDetail [get]
func FindSysDictionaryDetail(c *gin.Context) {
var detail model.SysDictionaryDetail
var detail system.SysDictionaryDetail
_ = c.ShouldBindQuery(&detail)
if err := utils.Verify(detail, utils.IdVerify); err != nil {
response.FailWithMessage(err.Error(), c)
......
server/api/v1/sys_initdb.go
浏览文件 @ 9c5afb7c
......@@ -2,8 +2,8 @@ package v1
import (
"gin-vue-admin/global"
"gin-vue-admin/model/request"
"gin-vue-admin/model/response"
"gin-vue-admin/model/system/request"
"gin-vue-admin/model/system/response"
"gin-vue-admin/service"
"go.uber.org/zap"
......
server/api/v1/sys_jwt_blacklist.go
浏览文件 @ 9c5afb7c
......@@ -2,8 +2,8 @@ package v1
import (
"gin-vue-admin/global"
"gin-vue-admin/model"
"gin-vue-admin/model/response"
"gin-vue-admin/model/system"
"gin-vue-admin/service"
"github.com/gin-gonic/gin"
"go.uber.org/zap"
......@@ -18,7 +18,7 @@ import (
// @Router /jwt/jsonInBlacklist [post]
func JsonInBlacklist(c *gin.Context) {
token := c.Request.Header.Get("x-token")
jwt := model.JwtBlacklist{Jwt: token}
jwt := system.JwtBlacklist{Jwt: token}
if err := service.JsonInBlacklist(jwt); err != nil {
global.GVA_LOG.Error("jwt作废失败!", zap.Any("err", err))
response.FailWithMessage("jwt作废失败", c)
......
server/api/v1/sys_menu.go
浏览文件 @ 9c5afb7c
......@@ -2,9 +2,9 @@ package v1
import (
"gin-vue-admin/global"
"gin-vue-admin/model"
"gin-vue-admin/model/request"
"gin-vue-admin/model/response"
"gin-vue-admin/model/system"
"gin-vue-admin/model/system/request"
"gin-vue-admin/model/system/response"
"gin-vue-admin/service"
"gin-vue-admin/utils"
......@@ -25,7 +25,7 @@ func GetMenu(c *gin.Context) {
response.FailWithMessage("获取失败", c)
} else {
if menus == nil {
menus = []model.SysMenu{}
menus = []system.SysMenu{}
}
response.OkWithDetailed(response.SysMenusResponse{Menus: menus}, "获取成功", c)
}
......@@ -102,7 +102,7 @@ func GetMenuAuthority(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"添加成功"}"
// @Router /menu/addBaseMenu [post]
func AddBaseMenu(c *gin.Context) {
var menu model.SysBaseMenu
var menu system.SysBaseMenu
_ = c.ShouldBindJSON(&menu)
if err := utils.Verify(menu, utils.MenuVerify); err != nil {
response.FailWithMessage(err.Error(), c)
......@@ -153,7 +153,7 @@ func DeleteBaseMenu(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"更新成功"}"
// @Router /menu/updateBaseMenu [post]
func UpdateBaseMenu(c *gin.Context) {
var menu model.SysBaseMenu
var menu system.SysBaseMenu
_ = c.ShouldBindJSON(&menu)
if err := utils.Verify(menu, utils.MenuVerify); err != nil {
response.FailWithMessage(err.Error(), c)
......
server/api/v1/sys_operation_record.go
浏览文件 @ 9c5afb7c
......@@ -2,9 +2,9 @@ package v1
import (
"gin-vue-admin/global"
"gin-vue-admin/model"
"gin-vue-admin/model/request"
"gin-vue-admin/model/response"
"gin-vue-admin/model/system"
"gin-vue-admin/model/system/request"
"gin-vue-admin/model/system/response"
"gin-vue-admin/service"
"gin-vue-admin/utils"
"github.com/gin-gonic/gin"
......@@ -20,7 +20,7 @@ import (
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /sysOperationRecord/createSysOperationRecord [post]
func CreateSysOperationRecord(c *gin.Context) {
var sysOperationRecord model.SysOperationRecord
var sysOperationRecord system.SysOperationRecord
_ = c.ShouldBindJSON(&sysOperationRecord)
if err := service.CreateSysOperationRecord(sysOperationRecord); err != nil {
global.GVA_LOG.Error("创建失败!", zap.Any("err", err))
......@@ -39,7 +39,7 @@ func CreateSysOperationRecord(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
// @Router /sysOperationRecord/deleteSysOperationRecord [delete]
func DeleteSysOperationRecord(c *gin.Context) {
var sysOperationRecord model.SysOperationRecord
var sysOperationRecord system.SysOperationRecord
_ = c.ShouldBindJSON(&sysOperationRecord)
if err := service.DeleteSysOperationRecord(sysOperationRecord); err != nil {
global.GVA_LOG.Error("删除失败!", zap.Any("err", err))
......@@ -77,7 +77,7 @@ func DeleteSysOperationRecordByIds(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
// @Router /sysOperationRecord/findSysOperationRecord [get]
func FindSysOperationRecord(c *gin.Context) {
var sysOperationRecord model.SysOperationRecord
var sysOperationRecord system.SysOperationRecord
_ = c.ShouldBindQuery(&sysOperationRecord)
if err := utils.Verify(sysOperationRecord, utils.IdVerify); err != nil {
response.FailWithMessage(err.Error(), c)
......
server/api/v1/sys_system.go
浏览文件 @ 9c5afb7c
......@@ -2,8 +2,8 @@ package v1
import (
"gin-vue-admin/global"
"gin-vue-admin/model"
"gin-vue-admin/model/response"
"gin-vue-admin/model/system"
"gin-vue-admin/model/system/response"
"gin-vue-admin/service"
"gin-vue-admin/utils"
......@@ -34,7 +34,7 @@ func GetSystemConfig(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"设置成功"}"
// @Router /system/setSystemConfig [post]
func SetSystemConfig(c *gin.Context) {
var sys model.System
var sys system.System
_ = c.ShouldBindJSON(&sys)
if err := service.SetSystemConfig(sys); err != nil {
global.GVA_LOG.Error("设置失败!", zap.Any("err", err))
......
server/api/v1/sys_user.go
浏览文件 @ 9c5afb7c
......@@ -3,9 +3,9 @@ package v1
import (
"gin-vue-admin/global"
"gin-vue-admin/middleware"
"gin-vue-admin/model"
"gin-vue-admin/model/request"
"gin-vue-admin/model/response"
"gin-vue-admin/model/system"
"gin-vue-admin/model/system/request"
"gin-vue-admin/model/system/response"
"gin-vue-admin/service"
"gin-vue-admin/utils"
"time"
......@@ -30,7 +30,7 @@ func Login(c *gin.Context) {
return
}
if store.Verify(l.CaptchaId, l.Captcha, true) {
u := &model.SysUser{Username: l.Username, Password: l.Password}
u := &system.SysUser{Username: l.Username, Password: l.Password}
if err, user := service.Login(u); err != nil {
global.GVA_LOG.Error("登陆失败! 用户名不存在或者密码错误!", zap.Any("err", err))
response.FailWithMessage("用户名不存在或者密码错误", c)
......@@ -43,7 +43,7 @@ func Login(c *gin.Context) {
}
// 登录以后签发jwt
func tokenNext(c *gin.Context, user model.SysUser) {
func tokenNext(c *gin.Context, user system.SysUser) {
j := &middleware.JWT{SigningKey: []byte(global.GVA_CONFIG.JWT.SigningKey)} // 唯一签名
claims := request.CustomClaims{
UUID: user.UUID,
......@@ -87,7 +87,7 @@ func tokenNext(c *gin.Context, user model.SysUser) {
global.GVA_LOG.Error("设置登录状态失败!", zap.Any("err", err))
response.FailWithMessage("设置登录状态失败", c)
} else {
var blackJWT model.JwtBlacklist
var blackJWT system.JwtBlacklist
blackJWT.Jwt = jwtStr
if err := service.JsonInBlacklist(blackJWT); err != nil {
response.FailWithMessage("jwt作废失败", c)
......@@ -118,7 +118,7 @@ func Register(c *gin.Context) {
response.FailWithMessage(err.Error(), c)
return
}
user := &model.SysUser{Username: r.Username, NickName: r.NickName, Password: r.Password, HeaderImg: r.HeaderImg, AuthorityId: r.AuthorityId}
user := &system.SysUser{Username: r.Username, NickName: r.NickName, Password: r.Password, HeaderImg: r.HeaderImg, AuthorityId: r.AuthorityId}
err, userReturn := service.Register(*user)
if err != nil {
global.GVA_LOG.Error("注册失败!", zap.Any("err", err))
......@@ -142,7 +142,7 @@ func ChangePassword(c *gin.Context) {
response.FailWithMessage(err.Error(), c)
return
}
u := &model.SysUser{Username: user.Username, Password: user.Password}
u := &system.SysUser{Username: user.Username, Password: user.Password}
if err, _ := service.ChangePassword(u, user.NewPassword); err != nil {
global.GVA_LOG.Error("修改失败!", zap.Any("err", err))
response.FailWithMessage("修改失败，原密码与当前账户不符", c)
......@@ -239,7 +239,7 @@ func DeleteUser(c *gin.Context) {
// @Success 200 {string} string "{"success":true,"data":{},"msg":"设置成功"}"
// @Router /user/setUserInfo [put]
func SetUserInfo(c *gin.Context) {
var user model.SysUser
var user system.SysUser
_ = c.ShouldBindJSON(&user)
if err := utils.Verify(user, utils.IdVerify); err != nil {
response.FailWithMessage(err.Error(), c)
......
server/initialize/gorm.go
浏览文件 @ 9c5afb7c
......@@ -3,7 +3,8 @@ package initialize
import (
"gin-vue-admin/global"
"gin-vue-admin/initialize/internal"
"gin-vue-admin/model"
"gin-vue-admin/model/example"
"gin-vue-admin/model/system"
"os"
"go.uber.org/zap"
......@@ -34,21 +35,21 @@ func Gorm() *gorm.DB {
func MysqlTables(db *gorm.DB) {
err := db.AutoMigrate(
model.SysUser{},
model.SysAuthority{},
model.SysApi{},
model.SysBaseMenu{},
model.SysBaseMenuParameter{},
model.JwtBlacklist{},
model.SysDictionary{},
model.SysDictionaryDetail{},
model.ExaFileUploadAndDownload{},
model.ExaFile{},
model.ExaFileChunk{},
model.ExaSimpleUploader{},
model.ExaCustomer{},
model.SysOperationRecord{},
model.SysAutoCodeHistory{},
system.SysUser{},
system.SysAuthority{},
system.SysApi{},
system.SysBaseMenu{},
system.SysBaseMenuParameter{},
system.JwtBlacklist{},
system.SysDictionary{},
system.SysDictionaryDetail{},
example.ExaFileUploadAndDownload{},
example.ExaFile{},
example.ExaFileChunk{},
example.ExaSimpleUploader{},
example.ExaCustomer{},
system.SysOperationRecord{},
system.SysAutoCodeHistory{},
// Code generated by gin-vue-admin Begin; DO NOT EDIT.
// Code generated by gin-vue-admin End; DO NOT EDIT.
)
......
server/initialize/router.go
浏览文件 @ 9c5afb7c
......@@ -27,28 +27,28 @@ func Routers() *gin.Engine {
// 方便统一添加路由组前缀 多服务器上线使用
PublicGroup := Router.Group("")
{
router.InitBaseRouter(PublicGroup) // 注册基础功能路由 不做鉴权
router.InitInitRouter(PublicGroup) // 自动初始化相关
router.RouterApp.System.InitBaseRouter(PublicGroup) // 注册基础功能路由 不做鉴权
router.RouterApp.System.InitInitRouter(PublicGroup) // 自动初始化相关
}
PrivateGroup := Router.Group("")
PrivateGroup.Use(middleware.JWTAuth()).Use(middleware.CasbinHandler())
{
router.InitApiRouter(PrivateGroup) // 注册功能api路由
router.InitJwtRouter(PrivateGroup) // jwt相关路由
router.InitUserRouter(PrivateGroup) // 注册用户路由
router.InitMenuRouter(PrivateGroup) // 注册menu路由
router.InitEmailRouter(PrivateGroup) // 邮件相关路由
router.InitSystemRouter(PrivateGroup) // system相关路由
router.InitCasbinRouter(PrivateGroup) // 权限相关路由
router.InitCustomerRouter(PrivateGroup) // 客户路由
router.InitAutoCodeRouter(PrivateGroup) // 创建自动化代码
router.InitAuthorityRouter(PrivateGroup) // 注册角色路由
router.InitSimpleUploaderRouter(PrivateGroup) // 断点续传（插件版）
router.InitSysDictionaryRouter(PrivateGroup) // 字典管理
router.InitSysOperationRecordRouter(PrivateGroup) // 操作记录
router.InitSysDictionaryDetailRouter(PrivateGroup) // 字典详情管理
router.InitFileUploadAndDownloadRouter(PrivateGroup) // 文件上传下载功能路由
router.InitExcelRouter(PrivateGroup) // 表格导入导出
router.RouterApp.System.InitApiRouter(PrivateGroup) // 注册功能api路由
router.RouterApp.System.InitJwtRouter(PrivateGroup) // jwt相关路由
router.RouterApp.System.InitUserRouter(PrivateGroup) // 注册用户路由
router.RouterApp.System.InitMenuRouter(PrivateGroup) // 注册menu路由
router.RouterApp.System.InitEmailRouter(PrivateGroup) // 邮件相关路由
router.RouterApp.System.InitSystemRouter(PrivateGroup) // system相关路由
router.RouterApp.System.InitCasbinRouter(PrivateGroup) // 权限相关路由
router.RouterApp.Example.InitCustomerRouter(PrivateGroup) // 客户路由
router.RouterApp.System.InitAutoCodeRouter(PrivateGroup) // 创建自动化代码
router.RouterApp.System.InitAuthorityRouter(PrivateGroup) // 注册角色路由
router.RouterApp.Example.InitSimpleUploaderRouter(PrivateGroup) // 断点续传（插件版）
router.RouterApp.System.InitSysDictionaryRouter(PrivateGroup) // 字典管理
router.RouterApp.System.InitSysOperationRecordRouter(PrivateGroup) // 操作记录
router.RouterApp.System.InitSysDictionaryDetailRouter(PrivateGroup) // 字典详情管理
router.RouterApp.Example.InitFileUploadAndDownloadRouter(PrivateGroup) // 文件上传下载功能路由
router.RouterApp.Example.InitExcelRouter(PrivateGroup) // 表格导入导出
// Code generated by gin-vue-admin Begin; DO NOT EDIT.
// Code generated by gin-vue-admin End; DO NOT EDIT.
......
server/middleware/email.go
浏览文件 @ 9c5afb7c
......@@ -2,8 +2,8 @@ package middleware
import (
"gin-vue-admin/global"
"gin-vue-admin/model"
"gin-vue-admin/model/request"
"gin-vue-admin/model/system"
"gin-vue-admin/service"
"gin-vue-admin/utils"
"github.com/gin-gonic/gin"
......@@ -28,7 +28,7 @@ func ErrorToEmail() gin.HandlerFunc {
username = user.Username
}
body, _ := ioutil.ReadAll(c.Request.Body)
record := model.SysOperationRecord{
record := system.SysOperationRecord{
Ip: c.ClientIP(),
Method: c.Request.Method,
Path: c.Request.URL.Path,
......
server/middleware/jwt.go
浏览文件 @ 9c5afb7c
......@@ -3,9 +3,9 @@ package middleware
import (
"errors"
"gin-vue-admin/global"
"gin-vue-admin/model"
"gin-vue-admin/model/request"
"gin-vue-admin/model/response"
"gin-vue-admin/model/system"
"gin-vue-admin/model/system/request"
"gin-vue-admin/model/system/response"
"gin-vue-admin/service"
"strconv"
"time"
......@@ -43,7 +43,7 @@ func JWTAuth() gin.HandlerFunc {
return
}
if err, _ = service.FindUserByUuid(claims.UUID.String()); err != nil {
_ = service.JsonInBlacklist(model.JwtBlacklist{Jwt: token})
_ = service.JsonInBlacklist(system.JwtBlacklist{Jwt: token})
response.FailWithDetailed(gin.H{"reload": true}, err.Error(), c)
c.Abort()
}
......@@ -58,7 +58,7 @@ func JWTAuth() gin.HandlerFunc {
if err != nil {
global.GVA_LOG.Error("get redis jwt failed", zap.Any("err", err))
} else { // 当之前的取成功时才进行拉黑操作
_ = service.JsonInBlacklist(model.JwtBlacklist{Jwt: RedisJwtToken})
_ = service.JsonInBlacklist(system.JwtBlacklist{Jwt: RedisJwtToken})
}
// 无论如何都要记录当前的活跃状态
_ = service.SetRedisJWT(newToken, newClaims.Username)
......
server/middleware/operation.go
浏览文件 @ 9c5afb7c
......@@ -3,8 +3,8 @@ package middleware
import (
"bytes"
"gin-vue-admin/global"
"gin-vue-admin/model"
"gin-vue-admin/model/request"
"gin-vue-admin/model/system"
"gin-vue-admin/service"
"github.com/gin-gonic/gin"
"go.uber.org/zap"
......@@ -37,7 +37,7 @@ func OperationRecord() gin.HandlerFunc {
}
userId = id
}
record := model.SysOperationRecord{
record := system.SysOperationRecord{
Ip: c.ClientIP(),
Method: c.Request.Method,
Path: c.Request.URL.Path,
......
server/model/exa_customer.go 已删除 100644 → 0
浏览文件 @ 1bb13a3d
package model
import (
"gin-vue-admin/global"
)
type ExaCustomer struct {
global.GVA_MODEL
CustomerName string `json:"customerName" form:"customerName" gorm:"comment:客户名"` // 客户名
CustomerPhoneData string `json:"customerPhoneData" form:"customerPhoneData" gorm:"comment:客户手机号"` // 客户手机号
SysUserID uint `json:"sysUserId" form:"sysUserId" gorm:"comment:管理ID"` // 管理ID
SysUserAuthorityID string `json:"sysUserAuthorityID" form:"sysUserAuthorityID" gorm:"comment:管理角色ID"` // 管理角色ID
SysUser SysUser `json:"sysUser" form:"sysUser" gorm:"comment:管理详情"` // 管理详情
}
server/model/exa_excel.go 已删除 100644 → 0
浏览文件 @ 1bb13a3d
package model
type ExcelInfo struct {
FileName string `json:"fileName"` // 文件名
InfoList []SysBaseMenu `json:"infoList"`
}
server/model/example/exa_customer.go 0 → 100644
浏览文件 @ 9c5afb7c
package example
import (
"gin-vue-admin/global"
"gin-vue-admin/model/system"
)
type ExaCustomer struct {
global.GVA_MODEL
CustomerName string `json:"customerName" form:"customerName" gorm:"comment:客户名"` // 客户名
CustomerPhoneData string `json:"customerPhoneData" form:"customerPhoneData" gorm:"comment:客户手机号"` // 客户手机号
SysUserID uint `json:"sysUserId" form:"sysUserId" gorm:"comment:管理ID"` // 管理ID
SysUserAuthorityID string `json:"sysUserAuthorityID" form:"sysUserAuthorityID" gorm:"comment:管理角色ID"` // 管理角色ID
SysUser system.SysUser `json:"sysUser" form:"sysUser" gorm:"comment:管理详情"` // 管理详情
}
server/model/example/exa_excel.go 0 → 100644
浏览文件 @ 9c5afb7c
package example
import "gin-vue-admin/model/system"
type ExcelInfo struct {
FileName string `json:"fileName"` // 文件名
InfoList []system.SysBaseMenu `json:"infoList"`
}
server/model/exa_simple_uploader.go → server/model/example/exa_simple_uploader.go
浏览文件 @ 9c5afb7c
package model
package example
type ExaSimpleUploader struct {
ChunkNumber string `json:"chunkNumber" gorm:"comment:当前切片标记"`
......
server/model/example/request/common.go 0 → 100644
浏览文件 @ 9c5afb7c
package request
// Paging common input parameter structure
type PageInfo struct {
Page int `json:"page" form:"page"` // 页码
PageSize int `json:"pageSize" form:"pageSize"` // 每页大小
}
// Find by id structure
type GetById struct {
ID float64 `json:"id" form:"id"` // 主键ID
}
type IdsReq struct {
Ids []int `json:"ids" form:"ids"`
}
// Get role by id structure
type GetAuthorityId struct {
AuthorityId string // 角色ID
}
type Empty struct{}
server/model/example/request/jwt.go 0 → 100644
浏览文件 @ 9c5afb7c
package request
import (
"github.com/dgrijalva/jwt-go"
uuid "github.com/satori/go.uuid"
)
// Custom claims structure
type CustomClaims struct {
UUID uuid.UUID
ID uint
Username string
NickName string
AuthorityId string
BufferTime int64
jwt.StandardClaims
}
server/model/response/exa_breakpoint_continue.go → server/model/example/response/exa_breakpoint_continue.go
浏览文件 @ 9c5afb7c
package response
import "gin-vue-admin/model"
import "gin-vue-admin/model/example"
type FilePathResponse struct {
FilePath string `json:"filePath"`
}
type FileResponse struct {
File model.ExaFile `json:"file"`
File example.ExaFile `json:"file"`
}
server/model/response/exa_customer.go → server/model/example/response/exa_customer.go
浏览文件 @ 9c5afb7c
package response
import "gin-vue-admin/model"
import "gin-vue-admin/model/example"
type ExaCustomerResponse struct {
Customer model.ExaCustomer `json:"customer"`
Customer example.ExaCustomer `json:"customer"`
}
server/model/response/exa_file_upload_download.go → server/model/example/response/exa_file_upload_download.go
浏览文件 @ 9c5afb7c
package response
import "gin-vue-admin/model"
import "gin-vue-admin/model/example"
type ExaFileResponse struct {
File model.ExaFileUploadAndDownload `json:"file"`
File example.ExaFileUploadAndDownload `json:"file"`
}
server/model/request/sys_api.go → server/model/system/request/sys_api.go
浏览文件 @ 9c5afb7c
package request
import "gin-vue-admin/model"
import (
"gin-vue-admin/model/system"
)
// api分页条件查询及排序结构体
type SearchApiParams struct {
model.SysApi
system.SysApi
PageInfo
OrderKey string `json:"orderKey"` // 排序
Desc bool `json:"desc"` // 排序方式:升序false(默认)|降序true
......
server/model/request/sys_autocode.go → server/model/system/request/sys_autocode.go
浏览文件 @ 9c5afb7c
package request
import "gin-vue-admin/model/request"
type SysAutoHistory struct {
PageInfo
request.PageInfo
}
type AutoHistoryByID struct {
......
server/model/request/sys_dictionary.go → server/model/system/request/sys_dictionary.go
浏览文件 @ 9c5afb7c
package request
import "gin-vue-admin/model"
import (
"gin-vue-admin/model/request"
"gin-vue-admin/model/system"
)
type SysDictionarySearch struct {
model.SysDictionary
PageInfo
system.SysDictionary
request.PageInfo
}
server/model/request/sys_dictionary_detail.go → server/model/system/request/sys_dictionary_detail.go
浏览文件 @ 9c5afb7c
package request
import "gin-vue-admin/model"
import (
"gin-vue-admin/model/request"
"gin-vue-admin/model/system"
)
type SysDictionaryDetailSearch struct {
model.SysDictionaryDetail
PageInfo
system.SysDictionaryDetail
request.PageInfo
}
server/model/request/sys_menu.go → server/model/system/request/sys_menu.go
浏览文件 @ 9c5afb7c
......@@ -2,24 +2,24 @@ package request
import (
"gin-vue-admin/global"
"gin-vue-admin/model"
"gin-vue-admin/model/system"
)
// Add menu authority info structure
type AddMenuAuthorityInfo struct {
Menus []model.SysBaseMenu
Menus []system.SysBaseMenu
AuthorityId string // 角色ID
}
func DefaultMenu() []model.SysBaseMenu {
return []model.SysBaseMenu{{
func DefaultMenu() []system.SysBaseMenu {
return []system.SysBaseMenu{{
GVA_MODEL: global.GVA_MODEL{ID: 1},
ParentId: "0",
Path: "dashboard",
Name: "dashboard",
Component: "view/dashboard/index.vue",
Sort: 1,
Meta: model.Meta{
Meta: system.Meta{
Title: "仪表盘",
Icon: "setting",
},
......
server/model/request/sys_operation_record.go → server/model/system/request/sys_operation_record.go
浏览文件 @ 9c5afb7c
package request
import "gin-vue-admin/model"
import (
"gin-vue-admin/model/request"
"gin-vue-admin/model/system"
)
type SysOperationRecordSearch struct {
model.SysOperationRecord
PageInfo
system.SysOperationRecord
request.PageInfo
}
server/model/system/response/common.go 0 → 100644
浏览文件 @ 9c5afb7c
package response
type PageResult struct {
List interface{} `json:"list"`
Total int64 `json:"total"`
Page int `json:"page"`
PageSize int `json:"pageSize"`
}
server/model/response/sys_api.go → server/model/system/response/sys_api.go
浏览文件 @ 9c5afb7c
package response
import "gin-vue-admin/model"
import "gin-vue-admin/model/system"
type SysAPIResponse struct {
Api model.SysApi `json:"api"`
Api system.SysApi `json:"api"`
}
type SysAPIListResponse struct {
Apis []model.SysApi `json:"apis"`
Apis []system.SysApi `json:"apis"`
}
server/model/response/sys_authority.go → server/model/system/response/sys_authority.go
浏览文件 @ 9c5afb7c
package response
import "gin-vue-admin/model"
import "gin-vue-admin/model/system"
type SysAuthorityResponse struct {
Authority model.SysAuthority `json:"authority"`
Authority system.SysAuthority `json:"authority"`
}
type SysAuthorityCopyResponse struct {
Authority model.SysAuthority `json:"authority"`
OldAuthorityId string `json:"oldAuthorityId"` // 旧角色ID
Authority system.SysAuthority `json:"authority"`
OldAuthorityId string `json:"oldAuthorityId"` // 旧角色ID
}
server/model/response/sys_casbin.go → server/model/system/response/sys_casbin.go
浏览文件 @ 9c5afb7c
package response
import "gin-vue-admin/model/request"
import (
"gin-vue-admin/model/system/request"
)
type PolicyPathResponse struct {
Paths []request.CasbinInfo `json:"paths"`
......
server/model/response/sys_menu.go → server/model/system/response/sys_menu.go
浏览文件 @ 9c5afb7c
package response
import "gin-vue-admin/model"
import "gin-vue-admin/model/system"
type SysMenusResponse struct {
Menus []model.SysMenu `json:"menus"`
Menus []system.SysMenu `json:"menus"`
}
type SysBaseMenusResponse struct {
Menus []model.SysBaseMenu `json:"menus"`
Menus []system.SysBaseMenu `json:"menus"`
}
type SysBaseMenuResponse struct {
Menu model.SysBaseMenu `json:"menu"`
Menu system.SysBaseMenu `json:"menu"`
}
server/model/response/sys_user.go → server/model/system/response/sys_user.go
浏览文件 @ 9c5afb7c
package response
import (
"gin-vue-admin/model"
"gin-vue-admin/model/system"
)
type SysUserResponse struct {
User model.SysUser `json:"user"`
User system.SysUser `json:"user"`
}
type LoginResponse struct {
User model.SysUser `json:"user"`
Token string `json:"token"`
ExpiresAt int64 `json:"expiresAt"`
User system.SysUser `json:"user"`
Token string `json:"token"`
ExpiresAt int64 `json:"expiresAt"`
}
server/model/sys_api.go → server/model/system/sys_api.go
浏览文件 @ 9c5afb7c
package model
package system
import (
"gin-vue-admin/global"
......@@ -6,8 +6,8 @@ import (
type SysApi struct {
global.GVA_MODEL
Path string `json:"path" gorm:"comment:api路径"` // api路径
Description string `json:"description" gorm:"comment:api中文描述"` // api中文描述
ApiGroup string `json:"apiGroup" gorm:"comment:api组"` // api组
Path string `json:"path" gorm:"comment:api路径"` // api路径
Description string `json:"description" gorm:"comment:api中文描述"` // api中文描述
ApiGroup string `json:"apiGroup" gorm:"comment:api组"` // api组
Method string `json:"method" gorm:"default:POST;comment:方法"` // 方法:创建POST(默认)|查看GET|更新PUT|删除DELETE
}
server/model/sys_base_menu.go → server/model/system/sys_base_menu.go
浏览文件 @ 9c5afb7c
package model
package system
import (
"gin-vue-admin/global"
......@@ -6,17 +6,17 @@ import (
type SysBaseMenu struct {
global.GVA_MODEL
MenuLevel uint `json:"-"`
ParentId string `json:"parentId" gorm:"comment:父菜单ID"` // 父菜单ID
Path string `json:"path" gorm:"comment:路由path"` // 路由path
Name string `json:"name" gorm:"comment:路由name"` // 路由name
Hidden bool `json:"hidden" gorm:"comment:是否在列表隐藏"` // 是否在列表隐藏
Component string `json:"component" gorm:"comment:对应前端文件路径"` // 对应前端文件路径
Sort int `json:"sort" gorm:"comment:排序标记"` // 排序标记
Meta `json:"meta" gorm:"comment:附加属性"` // 附加属性
SysAuthoritys []SysAuthority `json:"authoritys" gorm:"many2many:sys_authority_menus;"`
Children []SysBaseMenu `json:"children" gorm:"-"`
Parameters []SysBaseMenuParameter `json:"parameters"`
MenuLevel uint `json:"-"`
ParentId string `json:"parentId" gorm:"comment:父菜单ID"` // 父菜单ID
Path string `json:"path" gorm:"comment:路由path"` // 路由path
Name string `json:"name" gorm:"comment:路由name"` // 路由name
Hidden bool `json:"hidden" gorm:"comment:是否在列表隐藏"` // 是否在列表隐藏
Component string `json:"component" gorm:"comment:对应前端文件路径"` // 对应前端文件路径
Sort int `json:"sort" gorm:"comment:排序标记"` // 排序标记
Meta `json:"meta" gorm:"comment:附加属性"` // 附加属性
SysAuthoritys []SysAuthority `json:"authoritys" gorm:"many2many:sys_authority_menus;"`
Children []SysBaseMenu `json:"children" gorm:"-"`
Parameters []SysBaseMenuParameter `json:"parameters"`
}
type Meta struct {
......
server/model/sys_casbin.go → server/model/system/sys_casbin.go
浏览文件 @ 9c5afb7c
package model
package system
type CasbinModel struct {
Ptype string `json:"ptype" gorm:"column:ptype"`
......
server/model/sys_dictionary.go → server/model/system/sys_dictionary.go
浏览文件 @ 9c5afb7c
// 自动生成模板SysDictionary
package model
package system
import (
"gin-vue-admin/global"
......
server/model/sys_dictionary_detail.go → server/model/system/sys_dictionary_detail.go
浏览文件 @ 9c5afb7c
// 自动生成模板SysDictionaryDetail
package model
package system
import (
"gin-vue-admin/global"
......
server/model/sys_initdb.go → server/model/system/sys_initdb.go
浏览文件 @ 9c5afb7c
package model
package system
type InitDBFunc interface {
Init() (err error)
......
server/model/sys_operation_record.go → server/model/system/sys_operation_record.go
浏览文件 @ 9c5afb7c
// 自动生成模板SysOperationRecord
package model
package system
import (
"gin-vue-admin/global"
......
server/model/sys_system.go → server/model/system/sys_system.go
浏览文件 @ 9c5afb7c
package model
package system
import (
"gin-vue-admin/config"
......
server/model/sys_user.go → server/model/system/sys_user.go
浏览文件 @ 9c5afb7c
package model
package system
import (
"gin-vue-admin/global"
......@@ -13,8 +13,8 @@ type SysUser struct {
NickName string `json:"nickName" gorm:"default:系统用户;comment:用户昵称"` // 用户昵称
HeaderImg string `json:"headerImg" gorm:"default:http://qmplusimg.henrongyi.top/head.png;comment:用户头像"` // 用户头像
Authority SysAuthority `json:"authority" gorm:"foreignKey:AuthorityId;references:AuthorityId;comment:用户角色"`
AuthorityId string `json:"authorityId" gorm:"default:888;comment:用户角色ID"` // 用户角色ID
SideMode string `json:"sideMode" gorm:"default:dark;comment:用户角色ID"` // 用户侧边主题
ActiveColor string `json:"activeColor" gorm:"default:#1890ff;comment:用户角色ID"` // 活跃颜色
BaseColor string `json:"baseColor" gorm:"default:#fff;comment:用户角色ID"` // 基础颜色
AuthorityId string `json:"authorityId" gorm:"default:888;comment:用户角色ID"` // 用户角色ID
SideMode string `json:"sideMode" gorm:"default:dark;comment:用户角色ID"` // 用户侧边主题
ActiveColor string `json:"activeColor" gorm:"default:#1890ff;comment:用户角色ID"` // 活跃颜色
BaseColor string `json:"baseColor" gorm:"default:#fff;comment:用户角色ID"` // 基础颜色
}
server/router/exa_customer.go → server/router/example/exa_customer.go
浏览文件 @ 9c5afb7c
package router
package example
import (
"gin-vue-admin/api/v1"
......@@ -6,7 +6,7 @@ import (
"github.com/gin-gonic/gin"
)
func InitCustomerRouter(Router *gin.RouterGroup) {
func (e *Router) InitCustomerRouter(Router *gin.RouterGroup) {
CustomerRouter := Router.Group("customer").Use(middleware.OperationRecord())
{
CustomerRouter.POST("customer", v1.CreateExaCustomer) // 创建客户
......
server/router/exa_excel.go → server/router/example/exa_excel.go
浏览文件 @ 9c5afb7c
package router
package example
import (
"gin-vue-admin/api/v1"
"github.com/gin-gonic/gin"
)
func InitExcelRouter(Router *gin.RouterGroup) {
func (e *Router) InitExcelRouter(Router *gin.RouterGroup) {
ExcelRouter := Router.Group("excel")
{
ExcelRouter.POST("/importExcel", v1.ImportExcel) // 导入Excel
......
server/router/exa_file_upload_and_download.go → server/router/example/exa_file_upload_and_download.go
浏览文件 @ 9c5afb7c
package router
package example
import (
"gin-vue-admin/api/v1"
"github.com/gin-gonic/gin"
)
func InitFileUploadAndDownloadRouter(Router *gin.RouterGroup) {
func (e *Router) InitFileUploadAndDownloadRouter(Router *gin.RouterGroup) {
FileUploadAndDownloadRouter := Router.Group("fileUploadAndDownload")
{
FileUploadAndDownloadRouter.POST("/upload", v1.UploadFile) // 上传文件
......
server/router/exa_simple_uploader.go → server/router/example/exa_simple_uploader.go
浏览文件 @ 9c5afb7c
package router
package example
import (
"gin-vue-admin/api/v1"
"github.com/gin-gonic/gin"
)
func InitSimpleUploaderRouter(Router *gin.RouterGroup) {
func (e *Router) InitSimpleUploaderRouter(Router *gin.RouterGroup) {
SimpleUploaderRouter := Router.Group("simpleUploader")
{
SimpleUploaderRouter.POST("upload", v1.SimpleUploaderUpload) // 上传功能
......
server/router/sys_api.go → server/router/system/sys_api.go
浏览文件 @ 9c5afb7c
package router
package system
import (
"gin-vue-admin/api/v1"
......@@ -6,7 +6,7 @@ import (
"github.com/gin-gonic/gin"
)
func InitApiRouter(Router *gin.RouterGroup) {
func (s *Router) InitApiRouter(Router *gin.RouterGroup) {
ApiRouter := Router.Group("api").Use(middleware.OperationRecord())
{
ApiRouter.POST("createApi", v1.CreateApi) // 创建Api
......
server/router/sys_authority.go → server/router/system/sys_authority.go
浏览文件 @ 9c5afb7c
package router
package system
import (
"gin-vue-admin/api/v1"
......@@ -6,7 +6,7 @@ import (
"github.com/gin-gonic/gin"
)
func InitAuthorityRouter(Router *gin.RouterGroup) {
func (s *Router) InitAuthorityRouter(Router *gin.RouterGroup) {
AuthorityRouter := Router.Group("authority").Use(middleware.OperationRecord())
{
AuthorityRouter.POST("createAuthority", v1.CreateAuthority) // 创建角色
......
server/router/sys_auto_code.go → server/router/system/sys_auto_code.go
浏览文件 @ 9c5afb7c
package router
package system
import (
"gin-vue-admin/api/v1"
"github.com/gin-gonic/gin"
)
func InitAutoCodeRouter(Router *gin.RouterGroup) {
func (s *Router) InitAutoCodeRouter(Router *gin.RouterGroup) {
AutoCodeRouter := Router.Group("autoCode")
{
AutoCodeRouter.POST("delSysHistory", v1.DelSysHistory) // 删除回滚记录
......
server/router/sys_base.go → server/router/system/sys_base.go
浏览文件 @ 9c5afb7c
package router
package system
import (
"gin-vue-admin/api/v1"
"github.com/gin-gonic/gin"
)
func InitBaseRouter(Router *gin.RouterGroup) (R gin.IRoutes) {
func (s *Router) InitBaseRouter(Router *gin.RouterGroup) (R gin.IRoutes) {
BaseRouter := Router.Group("base")
{
BaseRouter.POST("login", v1.Login)
......
server/router/sys_casbin.go → server/router/system/sys_casbin.go
浏览文件 @ 9c5afb7c
package router
package system
import (
"gin-vue-admin/api/v1"
......@@ -6,7 +6,7 @@ import (
"github.com/gin-gonic/gin"
)
func InitCasbinRouter(Router *gin.RouterGroup) {
func (s *Router) InitCasbinRouter(Router *gin.RouterGroup) {
CasbinRouter := Router.Group("casbin").Use(middleware.OperationRecord())
{
CasbinRouter.POST("updateCasbin", v1.UpdateCasbin)
......
server/router/sys_dictionary.go → server/router/system/sys_dictionary.go
浏览文件 @ 9c5afb7c
package router
package system
import (
"gin-vue-admin/api/v1"
......@@ -6,7 +6,7 @@ import (
"github.com/gin-gonic/gin"
)
func InitSysDictionaryRouter(Router *gin.RouterGroup) {
func (s *Router) InitSysDictionaryRouter(Router *gin.RouterGroup) {
SysDictionaryRouter := Router.Group("sysDictionary").Use(middleware.OperationRecord())
{
SysDictionaryRouter.POST("createSysDictionary", v1.CreateSysDictionary) // 新建SysDictionary
......
server/router/sys_dictionary_detail.go → server/router/system/sys_dictionary_detail.go
浏览文件 @ 9c5afb7c
package router
package system
import (
"gin-vue-admin/api/v1"
......@@ -6,7 +6,7 @@ import (
"github.com/gin-gonic/gin"
)
func InitSysDictionaryDetailRouter(Router *gin.RouterGroup) {
func (s *Router) InitSysDictionaryDetailRouter(Router *gin.RouterGroup) {
SysDictionaryDetailRouter := Router.Group("sysDictionaryDetail").Use(middleware.OperationRecord())
{
SysDictionaryDetailRouter.POST("createSysDictionaryDetail", v1.CreateSysDictionaryDetail) // 新建SysDictionaryDetail
......
server/router/sys_email.go → server/router/system/sys_email.go
浏览文件 @ 9c5afb7c
package router
package system
import (
"gin-vue-admin/api/v1"
......@@ -6,7 +6,7 @@ import (
"github.com/gin-gonic/gin"
)
func InitEmailRouter(Router *gin.RouterGroup) {
func (s *Router) InitEmailRouter(Router *gin.RouterGroup) {
EmailRouter := Router.Group("email").Use(middleware.OperationRecord())
{
EmailRouter.POST("emailTest", v1.EmailTest) // 发送测试邮件
......
server/router/sys_initdb.go → server/router/system/sys_initdb.go
浏览文件 @ 9c5afb7c
package router
package system
import (
"gin-vue-admin/api/v1"
"github.com/gin-gonic/gin"
)
func InitInitRouter(Router *gin.RouterGroup) {
func (s *Router) InitInitRouter(Router *gin.RouterGroup) {
InitRouter := Router.Group("init")
{
InitRouter.POST("initdb", v1.InitDB) // 创建Api
......
server/router/sys_jwt.go → server/router/system/sys_jwt.go
浏览文件 @ 9c5afb7c
package router
package system
import (
"gin-vue-admin/api/v1"
......@@ -6,7 +6,7 @@ import (
"github.com/gin-gonic/gin"
)
func InitJwtRouter(Router *gin.RouterGroup) {
func (s *Router) InitJwtRouter(Router *gin.RouterGroup) {
JwtRouter := Router.Group("jwt").Use(middleware.OperationRecord())
{
JwtRouter.POST("jsonInBlacklist", v1.JsonInBlacklist) // jwt加入黑名单
......
server/router/sys_menu.go → server/router/system/sys_menu.go
浏览文件 @ 9c5afb7c
package router
package system
import (
"gin-vue-admin/api/v1"
......@@ -6,7 +6,7 @@ import (
"github.com/gin-gonic/gin"
)
func InitMenuRouter(Router *gin.RouterGroup) (R gin.IRoutes) {
func (s *Router) InitMenuRouter(Router *gin.RouterGroup) (R gin.IRoutes) {
MenuRouter := Router.Group("menu").Use(middleware.OperationRecord())
{
MenuRouter.POST("getMenu", v1.GetMenu) // 获取菜单树
......
server/router/sys_operation_record.go → server/router/system/sys_operation_record.go
浏览文件 @ 9c5afb7c
package router
package system
import (
"gin-vue-admin/api/v1"
......@@ -6,7 +6,7 @@ import (
"github.com/gin-gonic/gin"
)
func InitSysOperationRecordRouter(Router *gin.RouterGroup) {
func (s *Router) InitSysOperationRecordRouter(Router *gin.RouterGroup) {
SysOperationRecordRouter := Router.Group("sysOperationRecord").Use(middleware.OperationRecord())
{
SysOperationRecordRouter.POST("createSysOperationRecord", v1.CreateSysOperationRecord) // 新建SysOperationRecord
......
server/router/sys_system.go → server/router/system/sys_system.go
浏览文件 @ 9c5afb7c
package router
package system
import (
"gin-vue-admin/api/v1"
......@@ -6,7 +6,7 @@ import (
"github.com/gin-gonic/gin"
)
func InitSystemRouter(Router *gin.RouterGroup) {
func (s *Router) InitSystemRouter(Router *gin.RouterGroup) {
SystemRouter := Router.Group("system").Use(middleware.OperationRecord())
{
SystemRouter.POST("getSystemConfig", v1.GetSystemConfig) // 获取配置文件内容
......
server/router/sys_user.go → server/router/system/sys_user.go
浏览文件 @ 9c5afb7c
package router
package system
import (
"gin-vue-admin/api/v1"
......@@ -6,7 +6,7 @@ import (
"github.com/gin-gonic/gin"
)
func InitUserRouter(Router *gin.RouterGroup) {
func (s *Router) InitUserRouter(Router *gin.RouterGroup) {
UserRouter := Router.Group("user").Use(middleware.OperationRecord())
{
UserRouter.POST("register", v1.Register) // 用户注册账号
......
server/service/exa_breakpoint_continue.go
浏览文件 @ 9c5afb7c
......@@ -3,7 +3,7 @@ package service
import (
"errors"
"gin-vue-admin/global"
"gin-vue-admin/model"
"gin-vue-admin/model/example"
"gorm.io/gorm"
)
......@@ -13,8 +13,8 @@ import (
//@param: fileMd5 string, fileName string, chunkTotal int
//@return: err error, file model.ExaFile
func FindOrCreateFile(fileMd5 string, fileName string, chunkTotal int) (err error, file model.ExaFile) {
var cfile model.ExaFile
func FindOrCreateFile(fileMd5 string, fileName string, chunkTotal int) (err error, file example.ExaFile) {
var cfile example.ExaFile
cfile.FileMd5 = fileMd5
cfile.FileName = fileName
cfile.ChunkTotal = chunkTotal
......@@ -36,7 +36,7 @@ func FindOrCreateFile(fileMd5 string, fileName string, chunkTotal int) (err erro
//@return: error
func CreateFileChunk(id uint, fileChunkPath string, fileChunkNumber int) error {
var chunk model.ExaFileChunk
var chunk example.ExaFileChunk
chunk.FileChunkPath = fileChunkPath
chunk.ExaFileID = id
chunk.FileChunkNumber = fileChunkNumber
......@@ -51,8 +51,8 @@ func CreateFileChunk(id uint, fileChunkPath string, fileChunkNumber int) error {
//@return: error
func DeleteFileChunk(fileMd5 string, fileName string, filePath string) error {
var chunks []model.ExaFileChunk
var file model.ExaFile
var chunks []example.ExaFileChunk
var file example.ExaFile
err := global.GVA_DB.Where("file_md5 = ? AND file_name = ?", fileMd5, fileName).First(&file).Update("IsFinish", true).Update("file_path", filePath).Error
err = global.GVA_DB.Where("exa_file_id = ?", file.ID).Delete(&chunks).Unscoped().Error
return err
......
server/service/exa_customer.go
浏览文件 @ 9c5afb7c
......@@ -2,8 +2,9 @@ package service
import (
"gin-vue-admin/global"
"gin-vue-admin/model"
"gin-vue-admin/model/request"
"gin-vue-admin/model/example"
"gin-vue-admin/model/example/request"
"gin-vue-admin/model/system"
)
//@author: [piexlmax](https://github.com/piexlmax)
......@@ -12,7 +13,7 @@ import (
//@param: e model.ExaCustomer
//@return: err error
func CreateExaCustomer(e model.ExaCustomer) (err error) {
func CreateExaCustomer(e example.ExaCustomer) (err error) {
err = global.GVA_DB.Create(&e).Error
return err
}
......@@ -23,7 +24,7 @@ func CreateExaCustomer(e model.ExaCustomer) (err error) {
//@param: e model.ExaCustomer
//@return: err error
func DeleteExaCustomer(e model.ExaCustomer) (err error) {
func DeleteExaCustomer(e example.ExaCustomer) (err error) {
err = global.GVA_DB.Delete(&e).Error
return err
}
......@@ -34,7 +35,7 @@ func DeleteExaCustomer(e model.ExaCustomer) (err error) {
//@param: e *model.ExaCustomer
//@return: err error
func UpdateExaCustomer(e *model.ExaCustomer) (err error) {
func UpdateExaCustomer(e *example.ExaCustomer) (err error) {
err = global.GVA_DB.Save(e).Error
return err
}
......@@ -45,7 +46,7 @@ func UpdateExaCustomer(e *model.ExaCustomer) (err error) {
//@param: id uint
//@return: err error, customer model.ExaCustomer
func GetExaCustomer(id uint) (err error, customer model.ExaCustomer) {
func GetExaCustomer(id uint) (err error, customer example.ExaCustomer) {
err = global.GVA_DB.Where("id = ?", id).First(&customer).Error
return
}
......@@ -59,15 +60,15 @@ func GetExaCustomer(id uint) (err error, customer model.ExaCustomer) {
func GetCustomerInfoList(sysUserAuthorityID string, info request.PageInfo) (err error, list interface{}, total int64) {
limit := info.PageSize
offset := info.PageSize * (info.Page - 1)
db := global.GVA_DB.Model(&model.ExaCustomer{})
var a model.SysAuthority
db := global.GVA_DB.Model(&example.ExaCustomer{})
var a system.SysAuthority
a.AuthorityId = sysUserAuthorityID
err, auth := GetAuthorityInfo(a)
var dataId []string
for _, v := range auth.DataAuthorityId {
dataId = append(dataId, v.AuthorityId)
}
var CustomerList []model.ExaCustomer
var CustomerList []example.ExaCustomer
err = db.Where("sys_user_authority_id in ?", dataId).Count(&total).Error
if err != nil {
return err, CustomerList, total
......
server/service/exa_excel_parse.go
浏览文件 @ 9c5afb7c
......@@ -4,12 +4,12 @@ import (
"errors"
"fmt"
"gin-vue-admin/global"
"gin-vue-admin/model"
"gin-vue-admin/model/system"
"github.com/360EntSecGroup-Skylar/excelize/v2"
"strconv"
)
func ParseInfoList2Excel(infoList []model.SysBaseMenu, filePath string) error {
func ParseInfoList2Excel(infoList []system.SysBaseMenu, filePath string) error {
excel := excelize.NewFile()
excel.SetSheetRow("Sheet1", "A1", &[]string{"ID", "路由Name", "路由Path", "是否隐藏", "父节点", "排序", "文件名称"})
for i, menu := range infoList {
......@@ -28,14 +28,14 @@ func ParseInfoList2Excel(infoList []model.SysBaseMenu, filePath string) error {
return err
}
func ParseExcel2InfoList() ([]model.SysBaseMenu, error) {
func ParseExcel2InfoList() ([]system.SysBaseMenu, error) {
skipHeader := true
fixedHeader := []string{"ID", "路由Name", "路由Path", "是否隐藏", "父节点", "排序", "文件名称"}
file, err := excelize.OpenFile(global.GVA_CONFIG.Excel.Dir + "ExcelImport.xlsx")
if err != nil {
return nil, err
}
menus := make([]model.SysBaseMenu, 0)
menus := make([]system.SysBaseMenu, 0)
rows, err := file.Rows("Sheet1")
if err != nil {
return nil, err
......@@ -59,7 +59,7 @@ func ParseExcel2InfoList() ([]model.SysBaseMenu, error) {
id, _ := strconv.Atoi(row[0])
hidden, _ := strconv.ParseBool(row[3])
sort, _ := strconv.Atoi(row[5])
menu := model.SysBaseMenu{
menu := system.SysBaseMenu{
GVA_MODEL: global.GVA_MODEL{
ID: uint(id),
},
......
server/service/exa_file_upload_download.go
浏览文件 @ 9c5afb7c
......@@ -3,8 +3,8 @@ package service
import (
"errors"
"gin-vue-admin/global"
"gin-vue-admin/model"
"gin-vue-admin/model/request"
"gin-vue-admin/model/example"
"gin-vue-admin/model/example/request"
"gin-vue-admin/utils/upload"
"mime/multipart"
"strings"
......@@ -16,7 +16,7 @@ import (
//@param: file model.ExaFileUploadAndDownload
//@return: error
func Upload(file model.ExaFileUploadAndDownload) error {
func Upload(file example.ExaFileUploadAndDownload) error {
return global.GVA_DB.Create(&file).Error
}
......@@ -26,8 +26,8 @@ func Upload(file model.ExaFileUploadAndDownload) error {
//@param: id uint
//@return: error, model.ExaFileUploadAndDownload
func FindFile(id uint) (error, model.ExaFileUploadAndDownload) {
var file model.ExaFileUploadAndDownload
func FindFile(id uint) (error, example.ExaFileUploadAndDownload) {
var file example.ExaFileUploadAndDownload
err := global.GVA_DB.Where("id = ?", id).First(&file).Error
return err, file
}
......@@ -38,8 +38,8 @@ func FindFile(id uint) (error, model.ExaFileUploadAndDownload) {
//@param: file model.ExaFileUploadAndDownload
//@return: err error
func DeleteFile(file model.ExaFileUploadAndDownload) (err error) {
var fileFromDb model.ExaFileUploadAndDownload
func DeleteFile(file example.ExaFileUploadAndDownload) (err error) {
var fileFromDb example.ExaFileUploadAndDownload
err, fileFromDb = FindFile(file.ID)
oss := upload.NewOss()
if err = oss.DeleteFile(fileFromDb.Key); err != nil {
......@@ -59,7 +59,7 @@ func GetFileRecordInfoList(info request.PageInfo) (err error, list interface{},
limit := info.PageSize
offset := info.PageSize * (info.Page - 1)
db := global.GVA_DB
var fileLists []model.ExaFileUploadAndDownload
var fileLists []example.ExaFileUploadAndDownload
err = db.Find(&fileLists).Count(&total).Error
err = db.Limit(limit).Offset(offset).Order("updated_at desc").Find(&fileLists).Error
return err, fileLists, total
......@@ -71,7 +71,7 @@ func GetFileRecordInfoList(info request.PageInfo) (err error, list interface{},
//@param: header *multipart.FileHeader, noSave string
//@return: err error, file model.ExaFileUploadAndDownload
func UploadFile(header *multipart.FileHeader, noSave string) (err error, file model.ExaFileUploadAndDownload) {
func UploadFile(header *multipart.FileHeader, noSave string) (err error, file example.ExaFileUploadAndDownload) {
oss := upload.NewOss()
filePath, key, uploadErr := oss.UploadFile(header)
if uploadErr != nil {
......@@ -79,7 +79,7 @@ func UploadFile(header *multipart.FileHeader, noSave string) (err error, file mo
}
if noSave == "0" {
s := strings.Split(header.Filename, ".")
f := model.ExaFileUploadAndDownload{
f := example.ExaFileUploadAndDownload{
Url: filePath,
Name: header.Filename,
Tag: s[len(s)-1],
......
server/service/exa_simple_uploader.go
浏览文件 @ 9c5afb7c
......@@ -4,7 +4,7 @@ import (
"errors"
"fmt"
"gin-vue-admin/global"
"gin-vue-admin/model"
"gin-vue-admin/model/example"
"gorm.io/gorm"
"io/ioutil"
"os"
......@@ -17,7 +17,7 @@ import (
//@param: uploader model.ExaSimpleUploader
//@return: err error
func SaveChunk(uploader model.ExaSimpleUploader) (err error) {
func SaveChunk(uploader example.ExaSimpleUploader) (err error) {
return global.GVA_DB.Create(uploader).Error
}
......@@ -27,9 +27,9 @@ func SaveChunk(uploader model.ExaSimpleUploader) (err error) {
//@param: md5 string
//@return: err error, uploads []model.ExaSimpleUploader, isDone bool
func CheckFileMd5(md5 string) (err error, uploads []model.ExaSimpleUploader, isDone bool) {
func CheckFileMd5(md5 string) (err error, uploads []example.ExaSimpleUploader, isDone bool) {
err = global.GVA_DB.Find(&uploads, "identifier = ? AND is_done = ?", md5, false).Error
isDone = errors.Is(global.GVA_DB.First(&model.ExaSimpleUploader{}, "identifier = ? AND is_done = ?", md5, true).Error, gorm.ErrRecordNotFound)
isDone = errors.Is(global.GVA_DB.First(&example.ExaSimpleUploader{}, "identifier = ? AND is_done = ?", md5, true).Error, gorm.ErrRecordNotFound)
return err, uploads, !isDone
}
......@@ -43,7 +43,7 @@ func MergeFileMd5(md5 string, fileName string) (err error) {
finishDir := "./finish/"
dir := "./chunk/" + md5
// 如果文件上传成功 不做后续操作 通知成功即可
if !errors.Is(global.GVA_DB.First(&model.ExaSimpleUploader{}, "identifier = ? AND is_done = ?", md5, true).Error, gorm.ErrRecordNotFound) {
if !errors.Is(global.GVA_DB.First(&example.ExaSimpleUploader{}, "identifier = ? AND is_done = ?", md5, true).Error, gorm.ErrRecordNotFound) {
return nil
}
......@@ -71,11 +71,11 @@ func MergeFileMd5(md5 string, fileName string) (err error) {
}
err = global.GVA_DB.Transaction(func(tx *gorm.DB) error {
// 删除切片信息
if err = tx.Delete(&model.ExaSimpleUploader{}, "identifier = ? AND is_done = ?", md5, false).Error; err != nil {
if err = tx.Delete(&example.ExaSimpleUploader{}, "identifier = ? AND is_done = ?", md5, false).Error; err != nil {
fmt.Println(err)
return err
}
data := model.ExaSimpleUploader{
data := example.ExaSimpleUploader{
Identifier: md5,
IsDone: true,
FilePath: finishDir + fileName,
......
server/service/jwt_black_list.go
浏览文件 @ 9c5afb7c
......@@ -4,7 +4,7 @@ import (
"context"
"errors"
"gin-vue-admin/global"
"gin-vue-admin/model"
"gin-vue-admin/model/system"
"time"
"gorm.io/gorm"
......@@ -16,7 +16,7 @@ import (
//@param: jwtList model.JwtBlacklist
//@return: err error
func JsonInBlacklist(jwtList model.JwtBlacklist) (err error) {
func JsonInBlacklist(jwtList system.JwtBlacklist) (err error) {
err = global.GVA_DB.Create(&jwtList).Error
return
}
......@@ -28,7 +28,7 @@ func JsonInBlacklist(jwtList model.JwtBlacklist) (err error) {
//@return: bool
func IsBlacklist(jwt string) bool {
err := global.GVA_DB.Where("jwt = ?", jwt).First(&model.JwtBlacklist{}).Error
err := global.GVA_DB.Where("jwt = ?", jwt).First(&system.JwtBlacklist{}).Error
isNotFound := errors.Is(err, gorm.ErrRecordNotFound)
return !isNotFound
}
......
server/service/sys_api.go
浏览文件 @ 9c5afb7c
......@@ -3,8 +3,8 @@ package service
import (
"errors"
"gin-vue-admin/global"
"gin-vue-admin/model"
"gin-vue-admin/model/request"
"gin-vue-admin/model/system"
"gin-vue-admin/model/system/request"
"gorm.io/gorm"
)
......@@ -15,8 +15,8 @@ import (
//@param: api model.SysApi
//@return: err error
func CreateApi(api model.SysApi) (err error) {
if !errors.Is(global.GVA_DB.Where("path = ? AND method = ?", api.Path, api.Method).First(&model.SysApi{}).Error, gorm.ErrRecordNotFound) {
func CreateApi(api system.SysApi) (err error) {
if !errors.Is(global.GVA_DB.Where("path = ? AND method = ?", api.Path, api.Method).First(&system.SysApi{}).Error, gorm.ErrRecordNotFound) {
return errors.New("存在相同api")
}
return global.GVA_DB.Create(&api).Error
......@@ -28,7 +28,7 @@ func CreateApi(api model.SysApi) (err error) {
//@param: api model.SysApi
//@return: err error
func DeleteApi(api model.SysApi) (err error) {
func DeleteApi(api system.SysApi) (err error) {
err = global.GVA_DB.Delete(&api).Error
ClearCasbin(1, api.Path, api.Method)
return err
......@@ -40,11 +40,11 @@ func DeleteApi(api model.SysApi) (err error) {
//@param: api model.SysApi, info request.PageInfo, order string, desc bool
//@return: err error
func GetAPIInfoList(api model.SysApi, info request.PageInfo, order string, desc bool) (err error, list interface{}, total int64) {
func GetAPIInfoList(api system.SysApi, info request.PageInfo, order string, desc bool) (err error, list interface{}, total int64) {
limit := info.PageSize
offset := info.PageSize * (info.Page - 1)
db := global.GVA_DB.Model(&model.SysApi{})
var apiList []model.SysApi
db := global.GVA_DB.Model(&system.SysApi{})
var apiList []system.SysApi
if api.Path != "" {
db = db.Where("path LIKE ?", "%"+api.Path+"%")
......@@ -88,7 +88,7 @@ func GetAPIInfoList(api model.SysApi, info request.PageInfo, order string, desc
//@description: 获取所有的api
//@return: err error, apis []model.SysApi
func GetAllApis() (err error, apis []model.SysApi) {
func GetAllApis() (err error, apis []system.SysApi) {
err = global.GVA_DB.Find(&apis).Error
return
}
......@@ -99,7 +99,7 @@ func GetAllApis() (err error, apis []model.SysApi) {
//@param: id float64
//@return: err error, api model.SysApi
func GetApiById(id float64) (err error, api model.SysApi) {
func GetApiById(id float64) (err error, api system.SysApi) {
err = global.GVA_DB.Where("id = ?", id).First(&api).Error
return
}
......@@ -110,11 +110,11 @@ func GetApiById(id float64) (err error, api model.SysApi) {
//@param: api model.SysApi
//@return: err error
func UpdateApi(api model.SysApi) (err error) {
var oldA model.SysApi
func UpdateApi(api system.SysApi) (err error) {
var oldA system.SysApi
err = global.GVA_DB.Where("id = ?", api.ID).First(&oldA).Error
if oldA.Path != api.Path || oldA.Method != api.Method {
if !errors.Is(global.GVA_DB.Where("path = ? AND method = ?", api.Path, api.Method).First(&model.SysApi{}).Error, gorm.ErrRecordNotFound) {
if !errors.Is(global.GVA_DB.Where("path = ? AND method = ?", api.Path, api.Method).First(&system.SysApi{}).Error, gorm.ErrRecordNotFound) {
return errors.New("存在相同api路径")
}
}
......@@ -138,10 +138,10 @@ func UpdateApi(api model.SysApi) (err error) {
//@return: err error
func DeleteApisByIds(ids request.IdsReq) (err error) {
err = global.GVA_DB.Delete(&[]model.SysApi{}, "id in ?", ids.Ids).Error
err = global.GVA_DB.Delete(&[]system.SysApi{}, "id in ?", ids.Ids).Error
return err
}
func DeleteApiByIds(ids []string) (err error) {
return global.GVA_DB.Delete(model.SysApi{}, ids).Error
return global.GVA_DB.Delete(system.SysApi{}, ids).Error
}
server/service/sys_authority.go
浏览文件 @ 9c5afb7c
......@@ -3,9 +3,9 @@ package service
import (
"errors"
"gin-vue-admin/global"
"gin-vue-admin/model"
"gin-vue-admin/model/request"
"gin-vue-admin/model/response"
"gin-vue-admin/model/system"
"gin-vue-admin/model/system/request"
"gin-vue-admin/model/system/response"
"gorm.io/gorm"
"strconv"
)
......@@ -16,8 +16,8 @@ import (
//@param: auth model.SysAuthority
//@return: err error, authority model.SysAuthority
func CreateAuthority(auth model.SysAuthority) (err error, authority model.SysAuthority) {
var authorityBox model.SysAuthority
func CreateAuthority(auth system.SysAuthority) (err error, authority system.SysAuthority) {
var authorityBox system.SysAuthority
if !errors.Is(global.GVA_DB.Where("authority_id = ?", auth.AuthorityId).First(&authorityBox).Error, gorm.ErrRecordNotFound) {
return errors.New("存在相同角色id"), auth
}
......@@ -31,14 +31,14 @@ func CreateAuthority(auth model.SysAuthority) (err error, authority model.SysAut
//@param: copyInfo response.SysAuthorityCopyResponse
//@return: err error, authority model.SysAuthority
func CopyAuthority(copyInfo response.SysAuthorityCopyResponse) (err error, authority model.SysAuthority) {
var authorityBox model.SysAuthority
func CopyAuthority(copyInfo response.SysAuthorityCopyResponse) (err error, authority system.SysAuthority) {
var authorityBox system.SysAuthority
if !errors.Is(global.GVA_DB.Where("authority_id = ?", copyInfo.Authority.AuthorityId).First(&authorityBox).Error, gorm.ErrRecordNotFound) {
return errors.New("存在相同角色id"), authority
}
copyInfo.Authority.Children = []model.SysAuthority{}
copyInfo.Authority.Children = []system.SysAuthority{}
err, menus := GetMenuAuthority(&request.GetAuthorityId{AuthorityId: copyInfo.OldAuthorityId})
var baseMenu []model.SysBaseMenu
var baseMenu []system.SysBaseMenu
for _, v := range menus {
intNum, _ := strconv.Atoi(v.MenuId)
v.SysBaseMenu.ID = uint(intNum)
......@@ -61,8 +61,8 @@ func CopyAuthority(copyInfo response.SysAuthorityCopyResponse) (err error, autho
//@param: auth model.SysAuthority
//@return: err error, authority model.SysAuthority
func UpdateAuthority(auth model.SysAuthority) (err error, authority model.SysAuthority) {
err = global.GVA_DB.Where("authority_id = ?", auth.AuthorityId).First(&model.SysAuthority{}).Updates(&auth).Error
func UpdateAuthority(auth system.SysAuthority) (err error, authority system.SysAuthority) {
err = global.GVA_DB.Where("authority_id = ?", auth.AuthorityId).First(&system.SysAuthority{}).Updates(&auth).Error
return err, auth
}
......@@ -72,11 +72,11 @@ func UpdateAuthority(auth model.SysAuthority) (err error, authority model.SysAut
//@param: auth *model.SysAuthority
//@return: err error
func DeleteAuthority(auth *model.SysAuthority) (err error) {
if !errors.Is(global.GVA_DB.Where("authority_id = ?", auth.AuthorityId).First(&model.SysUser{}).Error, gorm.ErrRecordNotFound) {
func DeleteAuthority(auth *system.SysAuthority) (err error) {
if !errors.Is(global.GVA_DB.Where("authority_id = ?", auth.AuthorityId).First(&system.SysUser{}).Error, gorm.ErrRecordNotFound) {
return errors.New("此角色有用户正在使用禁止删除")
}
if !errors.Is(global.GVA_DB.Where("parent_id = ?", auth.AuthorityId).First(&model.SysAuthority{}).Error, gorm.ErrRecordNotFound) {
if !errors.Is(global.GVA_DB.Where("parent_id = ?", auth.AuthorityId).First(&system.SysAuthority{}).Error, gorm.ErrRecordNotFound) {
return errors.New("此角色存在子角色不允许删除")
}
db := global.GVA_DB.Preload("SysBaseMenus").Where("authority_id = ?", auth.AuthorityId).First(auth)
......@@ -101,7 +101,7 @@ func GetAuthorityInfoList(info request.PageInfo) (err error, list interface{}, t
limit := info.PageSize
offset := info.PageSize * (info.Page - 1)
db := global.GVA_DB
var authority []model.SysAuthority
var authority []system.SysAuthority
err = db.Limit(limit).Offset(offset).Preload("DataAuthorityId").Where("parent_id = 0").Find(&authority).Error
if len(authority) > 0 {
for k := range authority {
......@@ -117,7 +117,7 @@ func GetAuthorityInfoList(info request.PageInfo) (err error, list interface{}, t
//@param: auth model.SysAuthority
//@return: err error, sa model.SysAuthority
func GetAuthorityInfo(auth model.SysAuthority) (err error, sa model.SysAuthority) {
func GetAuthorityInfo(auth system.SysAuthority) (err error, sa system.SysAuthority) {
err = global.GVA_DB.Preload("DataAuthorityId").Where("authority_id = ?", auth.AuthorityId).First(&sa).Error
return err, sa
}
......@@ -128,8 +128,8 @@ func GetAuthorityInfo(auth model.SysAuthority) (err error, sa model.SysAuthority
//@param: auth model.SysAuthority
//@return: error
func SetDataAuthority(auth model.SysAuthority) error {
var s model.SysAuthority
func SetDataAuthority(auth system.SysAuthority) error {
var s system.SysAuthority
global.GVA_DB.Preload("DataAuthorityId").First(&s, "authority_id = ?", auth.AuthorityId)
err := global.GVA_DB.Model(&s).Association("DataAuthorityId").Replace(&auth.DataAuthorityId)
return err
......@@ -141,8 +141,8 @@ func SetDataAuthority(auth model.SysAuthority) error {
//@param: auth *model.SysAuthority
//@return: error
func SetMenuAuthority(auth *model.SysAuthority) error {
var s model.SysAuthority
func SetMenuAuthority(auth *system.SysAuthority) error {
var s system.SysAuthority
global.GVA_DB.Preload("SysBaseMenus").First(&s, "authority_id = ?", auth.AuthorityId)
err := global.GVA_DB.Model(&s).Association("SysBaseMenus").Replace(&auth.SysBaseMenus)
return err
......@@ -154,7 +154,7 @@ func SetMenuAuthority(auth *model.SysAuthority) error {
//@param: authority *model.SysAuthority
//@return: err error
func findChildrenAuthority(authority *model.SysAuthority) (err error) {
func findChildrenAuthority(authority *system.SysAuthority) (err error) {
err = global.GVA_DB.Preload("DataAuthorityId").Where("parent_id = ?", authority.AuthorityId).Find(&authority.Children).Error
if len(authority.Children) > 0 {
for k := range authority.Children {
......
server/service/sys_auto_code.go
浏览文件 @ 9c5afb7c
......@@ -5,8 +5,8 @@ import (
"errors"
"fmt"
"gin-vue-admin/global"
"gin-vue-admin/model"
"gin-vue-admin/model/request"
"gin-vue-admin/model/system"
"gin-vue-admin/model/system/request"
"gin-vue-admin/utils"
"io/ioutil"
"os"
......@@ -36,7 +36,7 @@ type tplData struct {
//@param: model.AutoCodeStruct
//@return: map[string]string, error
func PreviewTemp(autoCode model.AutoCodeStruct) (map[string]string, error) {
func PreviewTemp(autoCode system.AutoCodeStruct) (map[string]string, error) {
dataList, _, needMkdir, err := getNeedList(&autoCode)
if err != nil {
return nil, err
......@@ -101,7 +101,7 @@ func PreviewTemp(autoCode model.AutoCodeStruct) (map[string]string, error) {
//@param: model.AutoCodeStruct
//@return: err error
func CreateTemp(autoCode model.AutoCodeStruct, ids ...uint) (err error) {
func CreateTemp(autoCode system.AutoCodeStruct, ids ...uint) (err error) {
dataList, fileList, needMkdir, err := getNeedList(&autoCode)
if err != nil {
return err
......@@ -325,8 +325,8 @@ func addAutoMoveFile(data *tplData) {
//@param: a *model.AutoCodeStruct
//@return: err error
func AutoCreateApi(a *model.AutoCodeStruct) (ids []uint, err error) {
var apiList = []model.SysApi{
func AutoCreateApi(a *system.AutoCodeStruct) (ids []uint, err error) {
var apiList = []system.SysApi{
{
Path: "/" + a.Abbreviation + "/" + "create" + a.StructName,
Description: "新增" + a.Description,
......@@ -367,7 +367,7 @@ func AutoCreateApi(a *model.AutoCodeStruct) (ids []uint, err error) {
err = global.GVA_DB.Transaction(func(tx *gorm.DB) error {
for _, v := range apiList {
var api model.SysApi
var api system.SysApi
if errors.Is(tx.Where("path = ? AND method = ?", v.Path, v.Method).First(&api).Error, gorm.ErrRecordNotFound) {
if err = tx.Create(&v).Error; err != nil { // 遇到错误时回滚事务
return err
......@@ -381,7 +381,7 @@ func AutoCreateApi(a *model.AutoCodeStruct) (ids []uint, err error) {
return ids, err
}
func getNeedList(autoCode *model.AutoCodeStruct) (dataList []tplData, fileList []string, needMkdir []string, err error) {
func getNeedList(autoCode *system.AutoCodeStruct) (dataList []tplData, fileList []string, needMkdir []string, err error) {
// 去除所有空格
utils.TrimSpace(autoCode)
for _, field := range autoCode.Fields {
......
server/service/sys_autocode_history.go
浏览文件 @ 9c5afb7c
......@@ -2,8 +2,8 @@ package service
import (
"gin-vue-admin/global"
"gin-vue-admin/model"
"gin-vue-admin/model/request"
"gin-vue-admin/model/system"
"gin-vue-admin/utils"
"strings"
......@@ -12,7 +12,7 @@ import (
// CreateAutoCodeHistory RouterPath : RouterPath@RouterString;RouterPath2@RouterString2
func CreateAutoCodeHistory(meta, structName, structCNName, autoCodePath string, injectionMeta string, tableName string, apiIds string) error {
return global.GVA_DB.Create(&model.SysAutoCodeHistory{
return global.GVA_DB.Create(&system.SysAutoCodeHistory{
RequestMeta: meta,
AutoCodePath: autoCodePath,
InjectionMeta: injectionMeta,
......@@ -25,7 +25,7 @@ func CreateAutoCodeHistory(meta, structName, structCNName, autoCodePath string,
// RollBack 回滚
func RollBack(id uint) error {
md := model.SysAutoCodeHistory{}
md := system.SysAutoCodeHistory{}
if err := global.GVA_DB.First(&md, id).Error; err != nil {
return err
}
......@@ -67,7 +67,7 @@ func RollBack(id uint) error {
func GetMeta(id uint) (string, error) {
var meta string
return meta, global.GVA_DB.Model(model.SysAutoCodeHistory{}).Select("request_meta").First(&meta, id).Error
return meta, global.GVA_DB.Model(system.SysAutoCodeHistory{}).Select("request_meta").First(&meta, id).Error
}
// GetSysHistoryPage 获取系统历史数据
......@@ -75,7 +75,7 @@ func GetSysHistoryPage(info request.PageInfo) (err error, list interface{}, tota
limit := info.PageSize
offset := info.PageSize * (info.Page - 1)
db := global.GVA_DB
var fileLists []model.SysAutoCodeHistory
var fileLists []system.SysAutoCodeHistory
err = db.Find(&fileLists).Count(&total).Error
err = db.Limit(limit).Offset(offset).Order("updated_at desc").Select("id,created_at,updated_at,struct_name,struct_cn_name,flag,table_name").Find(&fileLists).Error
return err, fileLists, total
......@@ -83,5 +83,5 @@ func GetSysHistoryPage(info request.PageInfo) (err error, list interface{}, tota
// DeletePage 删除历史数据
func DeletePage(id uint) error {
return global.GVA_DB.Delete(model.SysAutoCodeHistory{}, id).Error
return global.GVA_DB.Delete(system.SysAutoCodeHistory{}, id).Error
}
server/service/sys_base_menu.go
浏览文件 @ 9c5afb7c
......@@ -3,7 +3,7 @@ package service
import (
"errors"
"gin-vue-admin/global"
"gin-vue-admin/model"
"gin-vue-admin/model/system"
"gorm.io/gorm"
)
......@@ -14,11 +14,11 @@ import (
//@return: err error
func DeleteBaseMenu(id float64) (err error) {
err = global.GVA_DB.Preload("Parameters").Where("parent_id = ?", id).First(&model.SysBaseMenu{}).Error
err = global.GVA_DB.Preload("Parameters").Where("parent_id = ?", id).First(&system.SysBaseMenu{}).Error
if err != nil {
var menu model.SysBaseMenu
var menu system.SysBaseMenu
db := global.GVA_DB.Preload("SysAuthoritys").Where("id = ?", id).First(&menu).Delete(&menu)
err = global.GVA_DB.Delete(&model.SysBaseMenuParameter{}, "sys_base_menu_id = ?", id).Error
err = global.GVA_DB.Delete(&system.SysBaseMenuParameter{}, "sys_base_menu_id = ?", id).Error
if len(menu.SysAuthoritys) > 0 {
err = global.GVA_DB.Model(&menu).Association("SysAuthoritys").Delete(&menu.SysAuthoritys)
} else {
......@@ -36,8 +36,8 @@ func DeleteBaseMenu(id float64) (err error) {
//@param: menu model.SysBaseMenu
//@return: err error
func UpdateBaseMenu(menu model.SysBaseMenu) (err error) {
var oldMenu model.SysBaseMenu
func UpdateBaseMenu(menu system.SysBaseMenu) (err error) {
var oldMenu system.SysBaseMenu
upDateMap := make(map[string]interface{})
upDateMap["keep_alive"] = menu.KeepAlive
upDateMap["close_tab"] = menu.CloseTab
......@@ -54,12 +54,12 @@ func UpdateBaseMenu(menu model.SysBaseMenu) (err error) {
err = global.GVA_DB.Transaction(func(tx *gorm.DB) error {
db := tx.Where("id = ?", menu.ID).Find(&oldMenu)
if oldMenu.Name != menu.Name {
if !errors.Is(tx.Where("id <> ? AND name = ?", menu.ID, menu.Name).First(&model.SysBaseMenu{}).Error, gorm.ErrRecordNotFound) {
if !errors.Is(tx.Where("id <> ? AND name = ?", menu.ID, menu.Name).First(&system.SysBaseMenu{}).Error, gorm.ErrRecordNotFound) {
global.GVA_LOG.Debug("存在相同name修改失败")
return errors.New("存在相同name修改失败")
}
}
txErr := tx.Unscoped().Delete(&model.SysBaseMenuParameter{}, "sys_base_menu_id = ?", menu.ID).Error
txErr := tx.Unscoped().Delete(&system.SysBaseMenuParameter{}, "sys_base_menu_id = ?", menu.ID).Error
if txErr != nil {
global.GVA_LOG.Debug(txErr.Error())
return txErr
......@@ -91,7 +91,7 @@ func UpdateBaseMenu(menu model.SysBaseMenu) (err error) {
//@param: id float64
//@return: err error, menu model.SysBaseMenu
func GetBaseMenuById(id float64) (err error, menu model.SysBaseMenu) {
func GetBaseMenuById(id float64) (err error, menu system.SysBaseMenu) {
err = global.GVA_DB.Preload("Parameters").Where("id = ?", id).First(&menu).Error
return
}
server/service/sys_casbin.go
浏览文件 @ 9c5afb7c
......@@ -3,8 +3,8 @@ package service
import (
"errors"
"gin-vue-admin/global"
"gin-vue-admin/model"
"gin-vue-admin/model/request"
"gin-vue-admin/model/system"
"gin-vue-admin/model/system/request"
"github.com/casbin/casbin/v2"
"github.com/casbin/casbin/v2/util"
gormadapter "github.com/casbin/gorm-adapter/v3"
......@@ -23,7 +23,7 @@ func UpdateCasbin(authorityId string, casbinInfos []request.CasbinInfo) error {
ClearCasbin(0, authorityId)
rules := [][]string{}
for _, v := range casbinInfos {
cm := model.CasbinModel{
cm := system.CasbinModel{
Ptype: "p",
AuthorityId: authorityId,
Path: v.Path,
......@@ -46,7 +46,7 @@ func UpdateCasbin(authorityId string, casbinInfos []request.CasbinInfo) error {
//@return: error
func UpdateCasbinApi(oldPath string, newPath string, oldMethod string, newMethod string) error {
err := global.GVA_DB.Table("casbin_rule").Model(&model.CasbinModel{}).Where("v1 = ? AND v2 = ?", oldPath, oldMethod).Updates(map[string]interface{}{
err := global.GVA_DB.Table("casbin_rule").Model(&system.CasbinModel{}).Where("v1 = ? AND v2 = ?", oldPath, oldMethod).Updates(map[string]interface{}{
"v1": newPath,
"v2": newMethod,
}).Error
......
server/service/sys_dictionary.go
浏览文件 @ 9c5afb7c
......@@ -3,8 +3,8 @@ package service
import (
"errors"
"gin-vue-admin/global"
"gin-vue-admin/model"
"gin-vue-admin/model/request"
"gin-vue-admin/model/system"
"gin-vue-admin/model/system/request"
"gorm.io/gorm"
)
......@@ -14,8 +14,8 @@ import (
//@param: sysDictionary model.SysDictionary
//@return: err error
func CreateSysDictionary(sysDictionary model.SysDictionary) (err error) {
if (!errors.Is(global.GVA_DB.First(&model.SysDictionary{}, "type = ?", sysDictionary.Type).Error, gorm.ErrRecordNotFound)) {
func CreateSysDictionary(sysDictionary system.SysDictionary) (err error) {
if (!errors.Is(global.GVA_DB.First(&system.SysDictionary{}, "type = ?", sysDictionary.Type).Error, gorm.ErrRecordNotFound)) {
return errors.New("存在相同的type，不允许创建")
}
err = global.GVA_DB.Create(&sysDictionary).Error
......@@ -28,7 +28,7 @@ func CreateSysDictionary(sysDictionary model.SysDictionary) (err error) {
//@param: sysDictionary model.SysDictionary
//@return: err error
func DeleteSysDictionary(sysDictionary model.SysDictionary) (err error) {
func DeleteSysDictionary(sysDictionary system.SysDictionary) (err error) {
err = global.GVA_DB.Delete(&sysDictionary).Delete(&sysDictionary.SysDictionaryDetails).Error
return err
}
......@@ -39,8 +39,8 @@ func DeleteSysDictionary(sysDictionary model.SysDictionary) (err error) {
//@param: sysDictionary *model.SysDictionary
//@return: err error
func UpdateSysDictionary(sysDictionary *model.SysDictionary) (err error) {
var dict model.SysDictionary
func UpdateSysDictionary(sysDictionary *system.SysDictionary) (err error) {
var dict system.SysDictionary
sysDictionaryMap := map[string]interface{}{
"Name": sysDictionary.Name,
"Type": sysDictionary.Type,
......@@ -51,7 +51,7 @@ func UpdateSysDictionary(sysDictionary *model.SysDictionary) (err error) {
if dict.Type == sysDictionary.Type {
err = db.Updates(sysDictionaryMap).Error
} else {
if (!errors.Is(global.GVA_DB.First(&model.SysDictionary{}, "type = ?", sysDictionary.Type).Error, gorm.ErrRecordNotFound)) {
if (!errors.Is(global.GVA_DB.First(&system.SysDictionary{}, "type = ?", sysDictionary.Type).Error, gorm.ErrRecordNotFound)) {
return errors.New("存在相同的type，不允许创建")
}
err = db.Updates(sysDictionaryMap).Error
......@@ -66,7 +66,7 @@ func UpdateSysDictionary(sysDictionary *model.SysDictionary) (err error) {
//@param: Type string, Id uint
//@return: err error, sysDictionary model.SysDictionary
func GetSysDictionary(Type string, Id uint) (err error, sysDictionary model.SysDictionary) {
func GetSysDictionary(Type string, Id uint) (err error, sysDictionary system.SysDictionary) {
err = global.GVA_DB.Where("type = ? OR id = ?", Type, Id).Preload("SysDictionaryDetails").First(&sysDictionary).Error
return
}
......@@ -82,8 +82,8 @@ func GetSysDictionaryInfoList(info request.SysDictionarySearch) (err error, list
limit := info.PageSize
offset := info.PageSize * (info.Page - 1)
// 创建db
db := global.GVA_DB.Model(&model.SysDictionary{})
var sysDictionarys []model.SysDictionary
db := global.GVA_DB.Model(&system.SysDictionary{})
var sysDictionarys []system.SysDictionary
// 如果有条件搜索 下方会自动创建搜索语句
if info.Name != "" {
db = db.Where("`name` LIKE ?", "%"+info.Name+"%")
......
server/service/sys_dictionary_detail.go
浏览文件 @ 9c5afb7c
......@@ -2,8 +2,8 @@ package service
import (
"gin-vue-admin/global"
"gin-vue-admin/model"
"gin-vue-admin/model/request"
"gin-vue-admin/model/system"
"gin-vue-admin/model/system/request"
)
//@author: [piexlmax](https://github.com/piexlmax)
......@@ -12,7 +12,7 @@ import (
//@param: sysDictionaryDetail model.SysDictionaryDetail
//@return: err error
func CreateSysDictionaryDetail(sysDictionaryDetail model.SysDictionaryDetail) (err error) {
func CreateSysDictionaryDetail(sysDictionaryDetail system.SysDictionaryDetail) (err error) {
err = global.GVA_DB.Create(&sysDictionaryDetail).Error
return err
}
......@@ -23,7 +23,7 @@ func CreateSysDictionaryDetail(sysDictionaryDetail model.SysDictionaryDetail) (e
//@param: sysDictionaryDetail model.SysDictionaryDetail
//@return: err error
func DeleteSysDictionaryDetail(sysDictionaryDetail model.SysDictionaryDetail) (err error) {
func DeleteSysDictionaryDetail(sysDictionaryDetail system.SysDictionaryDetail) (err error) {
err = global.GVA_DB.Delete(&sysDictionaryDetail).Error
return err
}
......@@ -34,7 +34,7 @@ func DeleteSysDictionaryDetail(sysDictionaryDetail model.SysDictionaryDetail) (e
//@param: sysDictionaryDetail *model.SysDictionaryDetail
//@return: err error
func UpdateSysDictionaryDetail(sysDictionaryDetail *model.SysDictionaryDetail) (err error) {
func UpdateSysDictionaryDetail(sysDictionaryDetail *system.SysDictionaryDetail) (err error) {
err = global.GVA_DB.Save(sysDictionaryDetail).Error
return err
}
......@@ -45,7 +45,7 @@ func UpdateSysDictionaryDetail(sysDictionaryDetail *model.SysDictionaryDetail) (
//@param: id uint
//@return: err error, sysDictionaryDetail model.SysDictionaryDetail
func GetSysDictionaryDetail(id uint) (err error, sysDictionaryDetail model.SysDictionaryDetail) {
func GetSysDictionaryDetail(id uint) (err error, sysDictionaryDetail system.SysDictionaryDetail) {
err = global.GVA_DB.Where("id = ?", id).First(&sysDictionaryDetail).Error
return
}
......@@ -60,8 +60,8 @@ func GetSysDictionaryDetailInfoList(info request.SysDictionaryDetailSearch) (err
limit := info.PageSize
offset := info.PageSize * (info.Page - 1)
// 创建db
db := global.GVA_DB.Model(&model.SysDictionaryDetail{})
var sysDictionaryDetails []model.SysDictionaryDetail
db := global.GVA_DB.Model(&system.SysDictionaryDetail{})
var sysDictionaryDetails []system.SysDictionaryDetail
// 如果有条件搜索 下方会自动创建搜索语句
if info.Label != "" {
db = db.Where("label LIKE ?", "%"+info.Label+"%")
......
server/service/sys_initdb.go
浏览文件 @ 9c5afb7c
......@@ -5,8 +5,9 @@ import (
"fmt"
"gin-vue-admin/config"
"gin-vue-admin/global"
"gin-vue-admin/model"
"gin-vue-admin/model/request"
"gin-vue-admin/model/example"
"gin-vue-admin/model/system"
"gin-vue-admin/model/system/request"
"gin-vue-admin/source"
"gin-vue-admin/utils"
"path/filepath"
......@@ -55,7 +56,7 @@ func createTable(dsn string, driver string, createSql string) error {
return err
}
func initDB(InitDBFunctions ...model.InitDBFunc) (err error) {
func initDB(InitDBFunctions ...system.InitDBFunc) (err error) {
for _, v := range InitDBFunctions {
err = v.Init()
if err != nil {
......@@ -117,21 +118,21 @@ func InitDB(conf request.InitDB) error {
}
err := global.GVA_DB.AutoMigrate(
model.SysUser{},
model.SysAuthority{},
model.SysApi{},
model.SysBaseMenu{},
model.SysBaseMenuParameter{},
model.JwtBlacklist{},
model.SysDictionary{},
model.SysDictionaryDetail{},
model.ExaFileUploadAndDownload{},
model.ExaFile{},
model.ExaFileChunk{},
model.ExaSimpleUploader{},
model.ExaCustomer{},
model.SysOperationRecord{},
model.SysAutoCodeHistory{},
system.SysUser{},
system.SysAuthority{},
system.SysApi{},
system.SysBaseMenu{},
system.SysBaseMenuParameter{},
system.JwtBlacklist{},
system.SysDictionary{},
system.SysDictionaryDetail{},
example.ExaFileUploadAndDownload{},
example.ExaFile{},
example.ExaFileChunk{},
example.ExaSimpleUploader{},
example.ExaCustomer{},
system.SysOperationRecord{},
system.SysAutoCodeHistory{},
)
if err != nil {
global.GVA_DB = nil
......
server/service/sys_menu.go
浏览文件 @ 9c5afb7c
......@@ -3,8 +3,8 @@ package service
import (
"errors"
"gin-vue-admin/global"
"gin-vue-admin/model"
"gin-vue-admin/model/request"
"gin-vue-admin/model/system"
"gin-vue-admin/model/system/request"
"gorm.io/gorm"
"strconv"
)
......@@ -15,9 +15,9 @@ import (
//@param: authorityId string
//@return: err error, treeMap map[string][]model.SysMenu
func getMenuTreeMap(authorityId string) (err error, treeMap map[string][]model.SysMenu) {
var allMenus []model.SysMenu
treeMap = make(map[string][]model.SysMenu)
func getMenuTreeMap(authorityId string) (err error, treeMap map[string][]system.SysMenu) {
var allMenus []system.SysMenu
treeMap = make(map[string][]system.SysMenu)
err = global.GVA_DB.Where("authority_id = ?", authorityId).Order("sort").Preload("Parameters").Find(&allMenus).Error
for _, v := range allMenus {
treeMap[v.ParentId] = append(treeMap[v.ParentId], v)
......@@ -31,7 +31,7 @@ func getMenuTreeMap(authorityId string) (err error, treeMap map[string][]model.S
//@param: authorityId string
//@return: err error, menus []model.SysMenu
func GetMenuTree(authorityId string) (err error, menus []model.SysMenu) {
func GetMenuTree(authorityId string) (err error, menus []system.SysMenu) {
err, menuTree := getMenuTreeMap(authorityId)
menus = menuTree["0"]
for i := 0; i < len(menus); i++ {
......@@ -46,7 +46,7 @@ func GetMenuTree(authorityId string) (err error, menus []model.SysMenu) {
//@param: menu *model.SysMenu, treeMap map[string][]model.SysMenu
//@return: err error
func getChildrenList(menu *model.SysMenu, treeMap map[string][]model.SysMenu) (err error) {
func getChildrenList(menu *system.SysMenu, treeMap map[string][]system.SysMenu) (err error) {
menu.Children = treeMap[menu.MenuId]
for i := 0; i < len(menu.Children); i++ {
err = getChildrenList(&menu.Children[i], treeMap)
......@@ -60,7 +60,7 @@ func getChildrenList(menu *model.SysMenu, treeMap map[string][]model.SysMenu) (e
//@return: err error, list interface{}, total int64
func GetInfoList() (err error, list interface{}, total int64) {
var menuList []model.SysBaseMenu
var menuList []system.SysBaseMenu
err, treeMap := getBaseMenuTreeMap()
menuList = treeMap["0"]
for i := 0; i < len(menuList); i++ {
......@@ -75,7 +75,7 @@ func GetInfoList() (err error, list interface{}, total int64) {
//@param: menu *model.SysBaseMenu, treeMap map[string][]model.SysBaseMenu
//@return: err error
func getBaseChildrenList(menu *model.SysBaseMenu, treeMap map[string][]model.SysBaseMenu) (err error) {
func getBaseChildrenList(menu *system.SysBaseMenu, treeMap map[string][]system.SysBaseMenu) (err error) {
menu.Children = treeMap[strconv.Itoa(int(menu.ID))]
for i := 0; i < len(menu.Children); i++ {
err = getBaseChildrenList(&menu.Children[i], treeMap)
......@@ -89,8 +89,8 @@ func getBaseChildrenList(menu *model.SysBaseMenu, treeMap map[string][]model.Sys
//@param: menu model.SysBaseMenu
//@return: error
func AddBaseMenu(menu model.SysBaseMenu) error {
if !errors.Is(global.GVA_DB.Where("name = ?", menu.Name).First(&model.SysBaseMenu{}).Error, gorm.ErrRecordNotFound) {
func AddBaseMenu(menu system.SysBaseMenu) error {
if !errors.Is(global.GVA_DB.Where("name = ?", menu.Name).First(&system.SysBaseMenu{}).Error, gorm.ErrRecordNotFound) {
return errors.New("存在重复name，请修改name")
}
return global.GVA_DB.Create(&menu).Error
......@@ -101,9 +101,9 @@ func AddBaseMenu(menu model.SysBaseMenu) error {
//@description: 获取路由总树map
//@return: err error, treeMap map[string][]model.SysBaseMenu
func getBaseMenuTreeMap() (err error, treeMap map[string][]model.SysBaseMenu) {
var allMenus []model.SysBaseMenu
treeMap = make(map[string][]model.SysBaseMenu)
func getBaseMenuTreeMap() (err error, treeMap map[string][]system.SysBaseMenu) {
var allMenus []system.SysBaseMenu
treeMap = make(map[string][]system.SysBaseMenu)
err = global.GVA_DB.Order("sort").Preload("Parameters").Find(&allMenus).Error
for _, v := range allMenus {
treeMap[v.ParentId] = append(treeMap[v.ParentId], v)
......@@ -116,7 +116,7 @@ func getBaseMenuTreeMap() (err error, treeMap map[string][]model.SysBaseMenu) {
//@description: 获取基础路由树
//@return: err error, menus []model.SysBaseMenu
func GetBaseMenuTree() (err error, menus []model.SysBaseMenu) {
func GetBaseMenuTree() (err error, menus []system.SysBaseMenu) {
err, treeMap := getBaseMenuTreeMap()
menus = treeMap["0"]
for i := 0; i < len(menus); i++ {
......@@ -131,8 +131,8 @@ func GetBaseMenuTree() (err error, menus []model.SysBaseMenu) {
//@param: menus []model.SysBaseMenu, authorityId string
//@return: err error
func AddMenuAuthority(menus []model.SysBaseMenu, authorityId string) (err error) {
var auth model.SysAuthority
func AddMenuAuthority(menus []system.SysBaseMenu, authorityId string) (err error) {
var auth system.SysAuthority
auth.AuthorityId = authorityId
auth.SysBaseMenus = menus
err = SetMenuAuthority(&auth)
......@@ -145,7 +145,7 @@ func AddMenuAuthority(menus []model.SysBaseMenu, authorityId string) (err error)
//@param: info *request.GetAuthorityId
//@return: err error, menus []model.SysMenu
func GetMenuAuthority(info *request.GetAuthorityId) (err error, menus []model.SysMenu) {
func GetMenuAuthority(info *request.GetAuthorityId) (err error, menus []system.SysMenu) {
err = global.GVA_DB.Where("authority_id = ? ", info.AuthorityId).Order("sort").Find(&menus).Error
//sql := "SELECT authority_menu.keep_alive,authority_menu.default_menu,authority_menu.created_at,authority_menu.updated_at,authority_menu.deleted_at,authority_menu.menu_level,authority_menu.parent_id,authority_menu.path,authority_menu.`name`,authority_menu.hidden,authority_menu.component,authority_menu.title,authority_menu.icon,authority_menu.sort,authority_menu.menu_id,authority_menu.authority_id FROM authority_menu WHERE authority_menu.authority_id = ? ORDER BY authority_menu.sort ASC"
//err = global.GVA_DB.Raw(sql, authorityId).Scan(&menus).Error
......
server/service/sys_system.go
浏览文件 @ 9c5afb7c
此差异已折叠。
server/service/sys_user.go
浏览文件 @ 9c5afb7c
此差异已折叠。
server/source/admin.go
浏览文件 @ 9c5afb7c
此差异已折叠。
server/source/api.go
浏览文件 @ 9c5afb7c
此差异已折叠。
server/source/authority.go
浏览文件 @ 9c5afb7c
此差异已折叠。
server/source/authority_menu.go
浏览文件 @ 9c5afb7c
此差异已折叠。
server/source/dictionary.go
浏览文件 @ 9c5afb7c
此差异已折叠。
server/source/dictionary_details.go
浏览文件 @ 9c5afb7c
此差异已折叠。
server/source/file.go
浏览文件 @ 9c5afb7c
此差异已折叠。
server/source/menu.go
浏览文件 @ 9c5afb7c
此差异已折叠。
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或