update: The code structure is finished, and the project can run successfully

server/api/v1/sys_menu.go

@@ -2,6 +2,7 @@ package v1
 
 import (
 	"fmt"
+	"gin-vue-admin/global/response"
 	"gin-vue-admin/middleware"
 	"gin-vue-admin/model"
 	"github.com/gin-gonic/gin"
@@ -19,9 +20,9 @@ func GetMenu(c *gin.Context) {
 	waitUse := claims.(*middleware.CustomClaims)
 	err, menus := new(model.SysMenu).GetMenuTree(waitUse.AuthorityId)
 	if err != nil {
-		servers.ReportFormat(c, false, fmt.Sprintf("获取失败：%v", err), gin.H{"menus": menus})
+		response.Result(response.ERROR, gin.H{}, fmt.Sprintf("获取失败，%v", err), c)
 	} else {
-		servers.ReportFormat(c, true, "获取成功", gin.H{"menus": menus})
+		response.Result(response.SUCCESS, gin.H{"menus": menus}, "获取成功", c)
 	}
 }
 
@@ -38,14 +39,14 @@ func GetMenuList(c *gin.Context) {
 	_ = c.ShouldBindJSON(&pageInfo)
 	err, menuList, total := new(model.SysBaseMenu).GetInfoList(pageInfo)
 	if err != nil {
-		servers.ReportFormat(c, false, fmt.Sprintf("获取数据失败，%v", err), gin.H{})
+		response.Result(response.ERROR, gin.H{}, fmt.Sprintf("获取数据失败，%v", err), c)
 	} else {
-		servers.ReportFormat(c, true, "获取数据成功", gin.H{
+		response.Result(response.SUCCESS, gin.H{
 			"list":     menuList,
 			"total":    total,
 			"page":     pageInfo.Page,
 			"pageSize": pageInfo.PageSize,
-		})
+		}, "获取数据成功", c)
 	}
 }
 
@@ -62,9 +63,9 @@ func AddBaseMenu(c *gin.Context) {
 	_ = c.ShouldBindJSON(&addMenu)
 	err := addMenu.AddBaseMenu()
 	if err != nil {
-		servers.ReportFormat(c, false, fmt.Sprintf("添加失败，%v", err), gin.H{})
+		response.Result(response.ERROR, gin.H{}, fmt.Sprintf("添加失败，%v", err), c)
 	} else {
-		servers.ReportFormat(c, true, fmt.Sprintf("添加成功，%v", err), gin.H{})
+		response.Result(response.SUCCESS, gin.H{}, "添加成功", c)
 	}
 }
 
@@ -78,9 +79,10 @@ func AddBaseMenu(c *gin.Context) {
 func GetBaseMenuTree(c *gin.Context) {
 	err, menus := new(model.SysBaseMenu).GetBaseMenuTree()
 	if err != nil {
-		servers.ReportFormat(c, false, fmt.Sprintf("获取失败：%v", err), gin.H{"menus": menus})
+		response.Result(response.ERROR, gin.H{"menus": menus}, fmt.Sprintf("获取失败，%v", err), c)
 	} else {
-		servers.ReportFormat(c, true, "获取成功", gin.H{"menus": menus})
+		response.Result(response.SUCCESS, gin.H{"menus": menus}, "获取成功", c)
+
 	}
 }
 
@@ -103,9 +105,9 @@ func AddMenuAuthority(c *gin.Context) {
 
 	err := new(model.SysMenu).AddMenuAuthority(addMenuAuthorityInfo.Menus, addMenuAuthorityInfo.AuthorityId)
 	if err != nil {
-		servers.ReportFormat(c, false, fmt.Sprintf("添加失败，%v", err), gin.H{})
+		response.Result(response.ERROR, gin.H{}, fmt.Sprintf("添加失败，%v", err), c)
 	} else {
-		servers.ReportFormat(c, true, fmt.Sprintf("添加成功，%v", err), gin.H{})
+		response.Result(response.SUCCESS, gin.H{}, "添加成功", c)
 	}
 }
 
@@ -126,9 +128,9 @@ func GetMenuAuthority(c *gin.Context) {
 	_ = c.ShouldBindJSON(&authorityIdInfo)
 	err, menus := new(model.SysMenu).GetMenuAuthority(authorityIdInfo.AuthorityId)
 	if err != nil {
-		servers.ReportFormat(c, false, fmt.Sprintf("获取失败：%v", err), gin.H{"menus": menus})
+		response.Result(response.ERROR, gin.H{"menus": menus}, fmt.Sprintf("添加失败，%v", err), c)
 	} else {
-		servers.ReportFormat(c, true, "获取成功", gin.H{"menus": menus})
+		response.Result(response.SUCCESS, gin.H{"menus": menus}, "获取成功", c)
 	}
 }
 
@@ -149,9 +151,10 @@ func DeleteBaseMenu(c *gin.Context) {
 	_ = c.ShouldBindJSON(&idInfo)
 	err := new(model.SysBaseMenu).DeleteBaseMenu(idInfo.Id)
 	if err != nil {
-		servers.ReportFormat(c, false, fmt.Sprintf("删除失败：%v", err), gin.H{})
+		response.Result(response.ERROR, gin.H{}, fmt.Sprintf("删除失败：%v", err), c)
 	} else {
-		servers.ReportFormat(c, true, "删除成功", gin.H{})
+		response.Result(response.SUCCESS, gin.H{}, "删除成功", c)
+
 	}
 }
 
@@ -168,9 +171,9 @@ func UpdateBaseMenu(c *gin.Context) {
 	_ = c.ShouldBindJSON(&menu)
 	err := menu.UpdateBaseMenu()
 	if err != nil {
-		servers.ReportFormat(c, false, fmt.Sprintf("修改失败：%v", err), gin.H{})
+		response.Result(response.ERROR, gin.H{}, fmt.Sprintf("修改失败：%v", err), c)
 	} else {
-		servers.ReportFormat(c, true, "修改成功", gin.H{})
+		response.Result(response.SUCCESS, gin.H{}, "修改成功", c)
 	}
 }
 
@@ -191,8 +194,8 @@ func GetBaseMenuById(c *gin.Context) {
 	_ = c.ShouldBindJSON(&idInfo)
 	err, menu := new(model.SysBaseMenu).GetBaseMenuById(idInfo.Id)
 	if err != nil {
-		servers.ReportFormat(c, false, fmt.Sprintf("查询失败：%v", err), gin.H{})
+		response.Result(response.ERROR, gin.H{}, fmt.Sprintf("查询失败：%v", err), c)
 	} else {
-		servers.ReportFormat(c, true, "查询成功", gin.H{"menu": menu})
+		response.Result(response.SUCCESS, gin.H{"menu": menu}, "查询成功", c)
 	}
 }

server/config.json

@@ -1,11 +1,11 @@
 {
-    "casbinconfig": {
+    "casbin": {
         "modelPath": "./resource/rbac_model.conf"
     },
     "jwt": {
         "signingKey": "qmPlus"
     },
-    "mysqladmin": {
+    "mysql": {
         "username": "root",
         "password": "Aa@6447985",
         "path": "127.0.0.1:3306",
@@ -19,7 +19,7 @@
         "accessKey": "25j8dYBZ2wuiy0yhwShytjZDTX662b8xiFguwxzZ",
         "secretKey": "pgdbqEsf7ooZh7W3xokP833h3dZ_VecFXPDeG5JY"
     },
-    "redisadmin": {
+    "redis": {
         "addr": "127.0.0.1:6379",
         "password": "",
         "db": 0

server/core/config.go

@@ -10,7 +10,7 @@ import (
 func init() {
 	v := viper.New()
 	v.SetConfigName("config") //  设置配置文件名 (不带后缀)
-	v.AddConfigPath("/")      // 第一个搜索路径
+	v.AddConfigPath("./")     // 第一个搜索路径
 	v.SetConfigType("json")
 	err := v.ReadInConfig() // 搜索路径，并读取配置数据
 	if err != nil {

server/core/server.go

@@ -3,7 +3,7 @@ package core
 import (
 	"fmt"
 	"gin-vue-admin/global"
-	"gin-vue-admin/init"
+	"gin-vue-admin/initialize"
 	"net/http"
 	"time"
 )
@@ -11,9 +11,9 @@ import (
 func RunWindowsServer() {
 	if global.GVA_CONFIG.System.UseMultipoint {
 		// 初始化redis服务
-		init.Redis()
+		initialize.Redis()
 	}
-	Router := init.Routers()
+	Router := initialize.Routers()
 	Router.Static("/form-generator", "./resource/page")
 	address := fmt.Sprintf(":%d", global.GVA_CONFIG.System.Addr)
 	s := &http.Server{

server/global/response/response.go

@@ -5,10 +5,10 @@ import (
 	"net/http"
 )
 
-type response struct {
-	code int
-	data interface{}
-	msg  string
+type Response struct {
+	Code int         `json:"code"`
+	Data interface{} `json:"data"`
+	Msg  string      `json:"msg"`
 }
 
 const (
@@ -18,7 +18,7 @@ const (
 
 func Result(code int, data interface{}, msg string, c *gin.Context) {
 	// 开始时间
-	c.JSON(http.StatusOK, response{
+	c.JSON(http.StatusOK, Response{
 		code,
 		data,
 		msg,

server/init/db_table.go → server/initialize/db_table.go

@@ -1,4 +1,4 @@
-package init
+package initialize
 
 import (
 	"gin-vue-admin/global"

server/init/mysql.go → server/initialize/mysql.go

@@ -1,4 +1,4 @@
-package init
+package initialize
 
 import (
 	"gin-vue-admin/global"
@@ -8,7 +8,7 @@ import (
 
 //初始化数据库并产生数据库全局变量
 func Mysql() {
-	admin := global.GVA_CONFIG.MysqlAdmin
+	admin := global.GVA_CONFIG.Mysql
 	if db, err := gorm.Open("mysql", admin.Username+":"+admin.Password+"@("+admin.Path+")/"+admin.Dbname+"?"+admin.Config); err != nil {
 		global.GVA_LOG.Error("DEFAULTDB数据库启动异常", err)
 	} else {

server/init/redis.go → server/initialize/redis.go

@@ -1,4 +1,4 @@
-package init
+package initialize
 
 import (
 	"gin-vue-admin/global"
@@ -6,7 +6,7 @@ import (
 )
 
 func Redis() {
-	redisCfg := global.GVA_CONFIG.RedisAdmin
+	redisCfg := global.GVA_CONFIG.Redis
 	client := redis.NewClient(&redis.Options{
 		Addr:     redisCfg.Addr,
 		Password: redisCfg.Password, // no password set

server/init/router.go → server/initialize/router.go

@@ -1,4 +1,4 @@
-package init
+package initialize
 
 import (
 	_ "gin-vue-admin/docs"
@@ -35,6 +35,6 @@ func Routers() *gin.Engine {
 	router.InitSystemRouter(ApiGroup)                // system相关路由
 	router.InitCustomerRouter(ApiGroup)              // 客户路由
 	router.InitAutoCodeRouter(ApiGroup)              // 创建自动化代码
-	L.Info("router register success")
+	global.GVA_LOG.Info("router register success")
 	return Router
 }

server/main.go

@@ -3,13 +3,13 @@ package main
 import (
 	"gin-vue-admin/core"
 	"gin-vue-admin/global"
-	"gin-vue-admin/init"
+	"gin-vue-admin/initialize"
 	//"runtime"
 )
 
 func main() {
-	init.Mysql()
-	init.DBTables()
+	initialize.Mysql()
+	initialize.DBTables()
 	// 程序结束前关闭数据库链接
 	defer global.GVA_DB.Close()
 

server/model/sys_casbin.go

@@ -97,8 +97,8 @@ func ParamsMatchFunc(args ...interface{}) (interface{}, error) {
 //持久化到数据库  引入自定义规则
 func Casbin() *casbin.Enforcer {
 	a := gormadapter.NewAdapterByDB(global.GVA_DB)
-	e := casbin.NewEnforcer(global.GVA_CONFIG.CasbinConfig.ModelPath, a)
+	e := casbin.NewEnforcer(global.GVA_CONFIG.Casbin.ModelPath, a)
 	e.AddFunction("ParamsMatch", ParamsMatchFunc)
-	e.LoadPolicy()
+	_ = e.LoadPolicy()
 	return e
 }

server/model/sys_common.go

@@ -0,0 +1,6 @@
+package model
+
+type PageInfo struct {
+	Page     int `json:"page"`
+	PageSize int `json:"pageSize"`
+}

server/resource/template/te/model.go.tpl

@@ -2,8 +2,9 @@
 package {{.PackageName}}
 
 import (
-	"gin-vue-admin/init/qmsql"
-	"github.com/jinzhu/gorm"
+	"gin-vue-admin/global"
+    "github.com/jinzhu/gorm"
+    "github.com/pkg/errors"
 )
 
 type {{.StructName}} struct {
@@ -13,25 +14,25 @@ type {{.StructName}} struct {
 
 // 创建{{.StructName}}
 func ({{.Abbreviation}} *{{.StructName}})Create{{.StructName}}()(err error){
-        err = qmsql.DEFAULTDB.Create({{.Abbreviation}}).Error
+        err = global.GVA_DB.Create({{.Abbreviation}}).Error
         return err
 }
 
 // 删除{{.StructName}}
 func ({{.Abbreviation}} *{{.StructName}})Delete{{.StructName}}()(err error){
-        err = qmsql.DEFAULTDB.Delete({{.Abbreviation}}).Error
+        err = global.GVA_DB.Delete({{.Abbreviation}}).Error
         return err
 }
 
 // 更新{{.StructName}}
 func ({{.Abbreviation}} *{{.StructName}})Update{{.StructName}}()(err error, re{{.Abbreviation}} {{.StructName}}){
-        err = qmsql.DEFAULTDB.Save({{.Abbreviation}}).Error
+        err = global.GVA_DB.Save({{.Abbreviation}}).Error
         return err, *{{.Abbreviation}}
 }
 
 // 根据ID查看单条{{.StructName}}
 func ({{.Abbreviation}} *{{.StructName}})FindById()(err error,re{{.Abbreviation}} {{.StructName}}){
-    err = qmsql.DEFAULTDB.Where("id = ?",{{.Abbreviation}}.ID).First(&re{{.Abbreviation}}).Error
+    err = global.GVA_DB.Where("id = ?",{{.Abbreviation}}.ID).First(&re{{.Abbreviation}}).Error
     return err,re{{.Abbreviation}}
 }
 
@@ -39,7 +40,7 @@ func ({{.Abbreviation}} *{{.StructName}})FindById()(err error,re{{.Abbreviation}
 func ({{.Abbreviation}} *{{.StructName}})GetInfoList(info PageInfo)(err error, list interface{}, total int){
     	limit := info.PageSize
         offset := info.PageSize * (info.Page - 1)
-        db:=qmsql.DEFAULTDB
+        db:=global.GVA_DB
     	if err != nil {
     		return
     	} else {