修改包名main-->gin-vue-admin

This commit is contained in:
pixel 2019-12-19 09:36:21 +08:00
parent 07364c903b
commit 403a18a1ce
34 changed files with 120 additions and 122 deletions

View File

@ -2,10 +2,10 @@ package api
import ( import (
"fmt" "fmt"
"gin-vue-admin/controller/servers"
"gin-vue-admin/model/dbModel"
"gin-vue-admin/model/modelInterface"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"main/controller/servers"
"main/model/dbModel"
"main/model/modelInterface"
"strings" "strings"
) )
@ -35,7 +35,7 @@ func UploadFile(c *gin.Context) {
s := strings.Split(file.Name, ".") s := strings.Split(file.Name, ".")
file.Tag = s[len(s)-1] file.Tag = s[len(s)-1]
file.Key = key file.Key = key
if(noSave=="0"){ if noSave == "0" {
err = file.Upload() err = file.Upload()
} }
if err != nil { if err != nil {

View File

@ -2,10 +2,10 @@ package api
import ( import (
"fmt" "fmt"
"gin-vue-admin/controller/servers"
"gin-vue-admin/model/modelInterface"
"gin-vue-admin/model/sysModel"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"main/controller/servers"
"main/model/modelInterface"
"main/model/sysModel"
) )
type CreateApiParams struct { type CreateApiParams struct {

View File

@ -2,10 +2,10 @@ package api
import ( import (
"fmt" "fmt"
"gin-vue-admin/controller/servers"
"gin-vue-admin/model/modelInterface"
"gin-vue-admin/model/sysModel"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"main/controller/servers"
"main/model/modelInterface"
"main/model/sysModel"
) )
type CreateAuthorityPatams struct { type CreateAuthorityPatams struct {

View File

@ -2,9 +2,9 @@ package api
import ( import (
"fmt" "fmt"
"gin-vue-admin/controller/servers"
"gin-vue-admin/model/sysModel"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"main/controller/servers"
"main/model/sysModel"
) )
type CasbinInReceive struct { type CasbinInReceive struct {

View File

@ -2,11 +2,11 @@ package api
import ( import (
"fmt" "fmt"
"gin-vue-admin/controller/servers"
"gin-vue-admin/middleware"
"gin-vue-admin/model/modelInterface"
"gin-vue-admin/model/sysModel"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"main/controller/servers"
"main/middleware"
"main/model/modelInterface"
"main/model/sysModel"
) )
// @Tags authorityAndMenu // @Tags authorityAndMenu

View File

@ -2,13 +2,13 @@ package api
import ( import (
"fmt" "fmt"
"gin-vue-admin/controller/servers"
"gin-vue-admin/middleware"
"gin-vue-admin/model/modelInterface"
"gin-vue-admin/model/sysModel"
"github.com/dgrijalva/jwt-go" "github.com/dgrijalva/jwt-go"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
uuid "github.com/satori/go.uuid" uuid "github.com/satori/go.uuid"
"main/controller/servers"
"main/middleware"
"main/model/modelInterface"
"main/model/sysModel"
"mime/multipart" "mime/multipart"
"time" "time"
) )

View File

@ -2,9 +2,9 @@ package api
import ( import (
"fmt" "fmt"
"gin-vue-admin/controller/servers"
"gin-vue-admin/model/sysModel"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"main/controller/servers"
"main/model/sysModel"
) )
// @Tags workflow // @Tags workflow

View File

@ -1,9 +1,9 @@
package servers package servers
import ( import (
"gin-vue-admin/init/qmsql"
"gin-vue-admin/model/modelInterface"
"github.com/jinzhu/gorm" "github.com/jinzhu/gorm"
"main/init/qmsql"
"main/model/modelInterface"
) )
//获取分页功能 接收实现了分页接口的结构体 返回搜索完成的结果 许需要自行scan 或者find //获取分页功能 接收实现了分页接口的结构体 返回搜索完成的结果 许需要自行scan 或者find

View File

@ -1,8 +1,8 @@
package servers package servers
import ( import (
"gin-vue-admin/init/qmlog"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"main/init/qmlog"
"net/http" "net/http"
"time" "time"
) )

View File

@ -1,4 +1,4 @@
module main module gin-vue-admin
go 1.12 go 1.12

View File

@ -1,12 +1,12 @@
package initRouter package initRouter
import ( import (
_ "gin-vue-admin/docs"
"gin-vue-admin/middleware"
"gin-vue-admin/router"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/swaggo/gin-swagger" "github.com/swaggo/gin-swagger"
"github.com/swaggo/gin-swagger/swaggerFiles" "github.com/swaggo/gin-swagger/swaggerFiles"
_ "main/docs"
"main/middleware"
"main/router"
) )
//初始化总路由 //初始化总路由

View File

@ -3,15 +3,16 @@ package qmlog
// 日志初始化包 调用qmlog.QMLog.Info 记录日志 24小时切割 日志保存7天 可自行设置 // 日志初始化包 调用qmlog.QMLog.Info 记录日志 24小时切割 日志保存7天 可自行设置
import ( import (
"fmt" "fmt"
"gin-vue-admin/tools"
rotatelogs "github.com/lestrrat/go-file-rotatelogs" rotatelogs "github.com/lestrrat/go-file-rotatelogs"
"github.com/rifflock/lfshook" "github.com/rifflock/lfshook"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"main/tools"
"os" "os"
"time" "time"
) )
var QMLog = logrus.New() var QMLog = logrus.New()
//禁止logrus的输出 //禁止logrus的输出
func InitLog() *logrus.Logger { func InitLog() *logrus.Logger {
src, err := os.OpenFile(os.DevNull, os.O_APPEND|os.O_WRONLY, os.ModeAppend) src, err := os.OpenFile(os.DevNull, os.O_APPEND|os.O_WRONLY, os.ModeAppend)

View File

@ -1,10 +1,10 @@
package qmsql package qmsql
import ( import (
"gin-vue-admin/config"
"github.com/jinzhu/gorm" "github.com/jinzhu/gorm"
_ "github.com/jinzhu/gorm/dialects/mysql" _ "github.com/jinzhu/gorm/dialects/mysql"
"log" "log"
"main/config"
) )
var DEFAULTDB *gorm.DB var DEFAULTDB *gorm.DB

View File

@ -1,9 +1,9 @@
package registTable package registTable
import ( import (
"gin-vue-admin/model/dbModel"
"gin-vue-admin/model/sysModel"
"github.com/jinzhu/gorm" "github.com/jinzhu/gorm"
"main/model/dbModel"
"main/model/sysModel"
) )
//注册数据库表专用 //注册数据库表专用

View File

@ -2,16 +2,15 @@ package main
import ( import (
"fmt" "fmt"
"main/config" "gin-vue-admin/config"
"main/init/initRouter" "gin-vue-admin/init/initRouter"
"main/init/qmlog" "gin-vue-admin/init/qmlog"
"main/init/qmsql" "gin-vue-admin/init/qmsql"
"main/init/registTable" "gin-vue-admin/init/registTable"
"net/http" "net/http"
"time" "time"
) )
// @title Swagger Example API // @title Swagger Example API
// @version 0.0.1 // @version 0.0.1
// @description This is a sample Server pets // @description This is a sample Server pets

View File

@ -2,9 +2,9 @@ package middleware
import ( import (
"fmt" "fmt"
"gin-vue-admin/controller/servers"
"gin-vue-admin/model/sysModel"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"main/controller/servers"
"main/model/sysModel"
) )
//拦截器 //拦截器

View File

@ -2,10 +2,10 @@ package middleware
import ( import (
"errors" "errors"
"gin-vue-admin/controller/servers"
"github.com/dgrijalva/jwt-go" "github.com/dgrijalva/jwt-go"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
uuid "github.com/satori/go.uuid" uuid "github.com/satori/go.uuid"
"main/controller/servers"
"time" "time"
) )

View File

@ -1,8 +1,8 @@
package middleware package middleware
import ( import (
"gin-vue-admin/init/qmlog"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"main/init/qmlog"
"time" "time"
) )

View File

@ -1,10 +1,10 @@
package dbModel package dbModel
import ( import (
"gin-vue-admin/controller/servers"
"gin-vue-admin/init/qmsql"
"gin-vue-admin/model/modelInterface"
"github.com/jinzhu/gorm" "github.com/jinzhu/gorm"
"main/controller/servers"
"main/init/qmsql"
"main/model/modelInterface"
) )
type ExaFileUploadAndDownload struct { type ExaFileUploadAndDownload struct {

View File

@ -1,11 +1,11 @@
package sysModel package sysModel
import ( import (
"gin-vue-admin/controller/servers"
"gin-vue-admin/init/qmsql"
"gin-vue-admin/model/modelInterface"
"github.com/jinzhu/gorm" "github.com/jinzhu/gorm"
"github.com/pkg/errors" "github.com/pkg/errors"
"main/controller/servers"
"main/init/qmsql"
"main/model/modelInterface"
) )
type SysApi struct { type SysApi struct {
@ -34,11 +34,11 @@ func (a *SysApi) DeleteApi() (err error) {
func (a *SysApi) UpdataApi() (err error) { func (a *SysApi) UpdataApi() (err error) {
var oldA SysApi var oldA SysApi
err = qmsql.DEFAULTDB.Where("id = ?", a.ID).First(&oldA).Error err = qmsql.DEFAULTDB.Where("id = ?", a.ID).First(&oldA).Error
if(err!=nil){ if err != nil {
return err return err
} else { } else {
err = new(CasbinModel).CasbinApiUpdata(oldA.Path, a.Path) err = new(CasbinModel).CasbinApiUpdata(oldA.Path, a.Path)
if(err!=nil){ if err != nil {
return err return err
} else { } else {
err = qmsql.DEFAULTDB.Save(a).Error err = qmsql.DEFAULTDB.Save(a).Error

View File

@ -1,11 +1,11 @@
package sysModel package sysModel
import ( import (
"gin-vue-admin/controller/servers"
"gin-vue-admin/init/qmsql"
"gin-vue-admin/model/modelInterface"
"github.com/jinzhu/gorm" "github.com/jinzhu/gorm"
"github.com/pkg/errors" "github.com/pkg/errors"
"main/controller/servers"
"main/init/qmsql"
"main/model/modelInterface"
) )
type SysAuthority struct { type SysAuthority struct {

View File

@ -2,11 +2,11 @@ package sysModel
import ( import (
"fmt" "fmt"
"gin-vue-admin/controller/servers"
"gin-vue-admin/init/qmsql"
"gin-vue-admin/model/modelInterface"
"github.com/jinzhu/gorm" "github.com/jinzhu/gorm"
"github.com/pkg/errors" "github.com/pkg/errors"
"main/controller/servers"
"main/init/qmsql"
"main/model/modelInterface"
) )
type SysBaseMenu struct { type SysBaseMenu struct {

View File

@ -2,9 +2,9 @@ package sysModel
import ( import (
"errors" "errors"
"gin-vue-admin/init/qmsql"
"github.com/casbin/casbin" "github.com/casbin/casbin"
gormadapter "github.com/casbin/gorm-adapter" gormadapter "github.com/casbin/gorm-adapter"
"main/init/qmsql"
"strings" "strings"
) )
@ -16,8 +16,6 @@ type CasbinModel struct {
Method string `json:"method" gorm:"column:v2"` Method string `json:"method" gorm:"column:v2"`
} }
// 更新权限 // 更新权限
func (c *CasbinModel) CasbinPUpdata(AuthorityId string, Paths []string) error { func (c *CasbinModel) CasbinPUpdata(AuthorityId string, Paths []string) error {
c.clearCasbin(0, AuthorityId) c.clearCasbin(0, AuthorityId)
@ -30,7 +28,7 @@ func (c *CasbinModel) CasbinPUpdata(AuthorityId string,Paths []string)error{
Method: "POST", Method: "POST",
} }
addflag := c.AddCasbin(cm) addflag := c.AddCasbin(cm)
if(addflag == false){ if addflag == false {
return errors.New("存在相同api,添加失败,请联系管理员") return errors.New("存在相同api,添加失败,请联系管理员")
} }
} }

View File

@ -2,7 +2,7 @@ package sysModel
import ( import (
"fmt" "fmt"
"main/init/qmsql" "gin-vue-admin/init/qmsql"
) )
// menu需要构建的点有点多 这里关联关系表直接把所有数据拿过来 用代码实现关联 后期实现主外键模式 // menu需要构建的点有点多 这里关联关系表直接把所有数据拿过来 用代码实现关联 后期实现主外键模式

View File

@ -1,13 +1,13 @@
package sysModel package sysModel
import ( import (
"gin-vue-admin/controller/servers"
"gin-vue-admin/init/qmsql"
"gin-vue-admin/model/modelInterface"
"gin-vue-admin/tools"
"github.com/jinzhu/gorm" "github.com/jinzhu/gorm"
"github.com/pkg/errors" "github.com/pkg/errors"
uuid "github.com/satori/go.uuid" uuid "github.com/satori/go.uuid"
"main/controller/servers"
"main/init/qmsql"
"main/model/modelInterface"
"main/tools"
) )
type SysUser struct { type SysUser struct {
@ -62,7 +62,7 @@ func (u *SysUser) Login() (err error, userInter *SysUser) {
var user SysUser var user SysUser
u.Password = tools.MD5V(u.Password) u.Password = tools.MD5V(u.Password)
err = qmsql.DEFAULTDB.Where("username = ? AND password = ?", u.Username, u.Password).First(&user).Error err = qmsql.DEFAULTDB.Where("username = ? AND password = ?", u.Username, u.Password).First(&user).Error
if(err!=nil){ if err != nil {
return err, &user return err, &user
} }
err = qmsql.DEFAULTDB.Where("authority_id = ?", user.AuthorityId).First(&user.Authority).Error err = qmsql.DEFAULTDB.Where("authority_id = ?", user.AuthorityId).First(&user.Authority).Error

View File

@ -1,8 +1,8 @@
package sysModel package sysModel
import ( import (
"gin-vue-admin/init/qmsql"
"github.com/jinzhu/gorm" "github.com/jinzhu/gorm"
"main/init/qmsql"
) )
//工作流属性表 //工作流属性表

View File

@ -1,9 +1,9 @@
package router package router
import ( import (
"gin-vue-admin/controller/api"
"gin-vue-admin/middleware"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"main/controller/api"
"main/middleware"
) )
func InitFileUploadAndDownloadRouter(Router *gin.RouterGroup) { func InitFileUploadAndDownloadRouter(Router *gin.RouterGroup) {

View File

@ -1,9 +1,9 @@
package router package router
import ( import (
"gin-vue-admin/controller/api"
"gin-vue-admin/middleware"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"main/controller/api"
"main/middleware"
) )
func InitApiRouter(Router *gin.RouterGroup) { func InitApiRouter(Router *gin.RouterGroup) {

View File

@ -1,9 +1,9 @@
package router package router
import ( import (
"gin-vue-admin/controller/api"
"gin-vue-admin/middleware"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"main/controller/api"
"main/middleware"
) )
func InitAuthorityRouter(Router *gin.RouterGroup) { func InitAuthorityRouter(Router *gin.RouterGroup) {

View File

@ -1,8 +1,8 @@
package router package router
import ( import (
"gin-vue-admin/controller/api"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"main/controller/api"
) )
func InitBaseRouter(Router *gin.RouterGroup) (R gin.IRoutes) { func InitBaseRouter(Router *gin.RouterGroup) (R gin.IRoutes) {

View File

@ -1,9 +1,9 @@
package router package router
import ( import (
"gin-vue-admin/controller/api"
"gin-vue-admin/middleware"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"main/controller/api"
"main/middleware"
) )
func InitCasbinRouter(Router *gin.RouterGroup) { func InitCasbinRouter(Router *gin.RouterGroup) {

View File

@ -1,9 +1,9 @@
package router package router
import ( import (
"gin-vue-admin/controller/api"
"gin-vue-admin/middleware"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"main/controller/api"
"main/middleware"
) )
func InitMenuRouter(Router *gin.RouterGroup) (R gin.IRoutes) { func InitMenuRouter(Router *gin.RouterGroup) (R gin.IRoutes) {

View File

@ -1,9 +1,9 @@
package router package router
import ( import (
"gin-vue-admin/controller/api"
"gin-vue-admin/middleware"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"main/controller/api"
"main/middleware"
) )
func InitUserRouter(Router *gin.RouterGroup) { func InitUserRouter(Router *gin.RouterGroup) {

View File

@ -1,9 +1,9 @@
package router package router
import ( import (
"gin-vue-admin/controller/api"
"gin-vue-admin/middleware"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"main/controller/api"
"main/middleware"
) )
func InitWorkflowRouter(Router *gin.RouterGroup) { func InitWorkflowRouter(Router *gin.RouterGroup) {