提交 1fa30b1d 编写于 作者: Mr.奇淼('s avatar Mr.奇淼(

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

上级 1f5edd3a
...@@ -2,6 +2,7 @@ package v1 ...@@ -2,6 +2,7 @@ package v1
import ( import (
"fmt" "fmt"
"gin-vue-admin/global/response"
"gin-vue-admin/middleware" "gin-vue-admin/middleware"
"gin-vue-admin/model" "gin-vue-admin/model"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
...@@ -19,9 +20,9 @@ func GetMenu(c *gin.Context) { ...@@ -19,9 +20,9 @@ func GetMenu(c *gin.Context) {
waitUse := claims.(*middleware.CustomClaims) waitUse := claims.(*middleware.CustomClaims)
err, menus := new(model.SysMenu).GetMenuTree(waitUse.AuthorityId) err, menus := new(model.SysMenu).GetMenuTree(waitUse.AuthorityId)
if err != nil { 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 { } 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) { ...@@ -38,14 +39,14 @@ func GetMenuList(c *gin.Context) {
_ = c.ShouldBindJSON(&pageInfo) _ = c.ShouldBindJSON(&pageInfo)
err, menuList, total := new(model.SysBaseMenu).GetInfoList(pageInfo) err, menuList, total := new(model.SysBaseMenu).GetInfoList(pageInfo)
if err != nil { 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 { } else {
servers.ReportFormat(c, true, "获取数据成功", gin.H{ response.Result(response.SUCCESS, gin.H{
"list": menuList, "list": menuList,
"total": total, "total": total,
"page": pageInfo.Page, "page": pageInfo.Page,
"pageSize": pageInfo.PageSize, "pageSize": pageInfo.PageSize,
}) }, "获取数据成功", c)
} }
} }
...@@ -62,9 +63,9 @@ func AddBaseMenu(c *gin.Context) { ...@@ -62,9 +63,9 @@ func AddBaseMenu(c *gin.Context) {
_ = c.ShouldBindJSON(&addMenu) _ = c.ShouldBindJSON(&addMenu)
err := addMenu.AddBaseMenu() err := addMenu.AddBaseMenu()
if err != nil { 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 { } 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) { ...@@ -78,9 +79,10 @@ func AddBaseMenu(c *gin.Context) {
func GetBaseMenuTree(c *gin.Context) { func GetBaseMenuTree(c *gin.Context) {
err, menus := new(model.SysBaseMenu).GetBaseMenuTree() err, menus := new(model.SysBaseMenu).GetBaseMenuTree()
if err != nil { 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 { } 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) { ...@@ -103,9 +105,9 @@ func AddMenuAuthority(c *gin.Context) {
err := new(model.SysMenu).AddMenuAuthority(addMenuAuthorityInfo.Menus, addMenuAuthorityInfo.AuthorityId) err := new(model.SysMenu).AddMenuAuthority(addMenuAuthorityInfo.Menus, addMenuAuthorityInfo.AuthorityId)
if err != nil { 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 { } 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) { ...@@ -126,9 +128,9 @@ func GetMenuAuthority(c *gin.Context) {
_ = c.ShouldBindJSON(&authorityIdInfo) _ = c.ShouldBindJSON(&authorityIdInfo)
err, menus := new(model.SysMenu).GetMenuAuthority(authorityIdInfo.AuthorityId) err, menus := new(model.SysMenu).GetMenuAuthority(authorityIdInfo.AuthorityId)
if err != nil { 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 { } 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) { ...@@ -149,9 +151,10 @@ func DeleteBaseMenu(c *gin.Context) {
_ = c.ShouldBindJSON(&idInfo) _ = c.ShouldBindJSON(&idInfo)
err := new(model.SysBaseMenu).DeleteBaseMenu(idInfo.Id) err := new(model.SysBaseMenu).DeleteBaseMenu(idInfo.Id)
if err != nil { 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 { } else {
servers.ReportFormat(c, true, "删除成功", gin.H{}) response.Result(response.SUCCESS, gin.H{}, "删除成功", c)
} }
} }
...@@ -168,9 +171,9 @@ func UpdateBaseMenu(c *gin.Context) { ...@@ -168,9 +171,9 @@ func UpdateBaseMenu(c *gin.Context) {
_ = c.ShouldBindJSON(&menu) _ = c.ShouldBindJSON(&menu)
err := menu.UpdateBaseMenu() err := menu.UpdateBaseMenu()
if err != nil { 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 { } else {
servers.ReportFormat(c, true, "修改成功", gin.H{}) response.Result(response.SUCCESS, gin.H{}, "修改成功", c)
} }
} }
...@@ -191,8 +194,8 @@ func GetBaseMenuById(c *gin.Context) { ...@@ -191,8 +194,8 @@ func GetBaseMenuById(c *gin.Context) {
_ = c.ShouldBindJSON(&idInfo) _ = c.ShouldBindJSON(&idInfo)
err, menu := new(model.SysBaseMenu).GetBaseMenuById(idInfo.Id) err, menu := new(model.SysBaseMenu).GetBaseMenuById(idInfo.Id)
if err != nil { 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 { } else {
servers.ReportFormat(c, true, "查询成功", gin.H{"menu": menu}) response.Result(response.SUCCESS, gin.H{"menu": menu}, "查询成功", c)
} }
} }
{ {
"casbinconfig": { "casbin": {
"modelPath": "./resource/rbac_model.conf" "modelPath": "./resource/rbac_model.conf"
}, },
"jwt": { "jwt": {
"signingKey": "qmPlus" "signingKey": "qmPlus"
}, },
"mysqladmin": { "mysql": {
"username": "root", "username": "root",
"password": "Aa@6447985", "password": "Aa@6447985",
"path": "127.0.0.1:3306", "path": "127.0.0.1:3306",
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
"accessKey": "25j8dYBZ2wuiy0yhwShytjZDTX662b8xiFguwxzZ", "accessKey": "25j8dYBZ2wuiy0yhwShytjZDTX662b8xiFguwxzZ",
"secretKey": "pgdbqEsf7ooZh7W3xokP833h3dZ_VecFXPDeG5JY" "secretKey": "pgdbqEsf7ooZh7W3xokP833h3dZ_VecFXPDeG5JY"
}, },
"redisadmin": { "redis": {
"addr": "127.0.0.1:6379", "addr": "127.0.0.1:6379",
"password": "", "password": "",
"db": 0 "db": 0
......
...@@ -10,7 +10,7 @@ import ( ...@@ -10,7 +10,7 @@ import (
func init() { func init() {
v := viper.New() v := viper.New()
v.SetConfigName("config") // 设置配置文件名 (不带后缀) v.SetConfigName("config") // 设置配置文件名 (不带后缀)
v.AddConfigPath("/") // 第一个搜索路径 v.AddConfigPath("./") // 第一个搜索路径
v.SetConfigType("json") v.SetConfigType("json")
err := v.ReadInConfig() // 搜索路径,并读取配置数据 err := v.ReadInConfig() // 搜索路径,并读取配置数据
if err != nil { if err != nil {
......
...@@ -3,7 +3,7 @@ package core ...@@ -3,7 +3,7 @@ package core
import ( import (
"fmt" "fmt"
"gin-vue-admin/global" "gin-vue-admin/global"
"gin-vue-admin/init" "gin-vue-admin/initialize"
"net/http" "net/http"
"time" "time"
) )
...@@ -11,9 +11,9 @@ import ( ...@@ -11,9 +11,9 @@ import (
func RunWindowsServer() { func RunWindowsServer() {
if global.GVA_CONFIG.System.UseMultipoint { if global.GVA_CONFIG.System.UseMultipoint {
// 初始化redis服务 // 初始化redis服务
init.Redis() initialize.Redis()
} }
Router := init.Routers() Router := initialize.Routers()
Router.Static("/form-generator", "./resource/page") Router.Static("/form-generator", "./resource/page")
address := fmt.Sprintf(":%d", global.GVA_CONFIG.System.Addr) address := fmt.Sprintf(":%d", global.GVA_CONFIG.System.Addr)
s := &http.Server{ s := &http.Server{
......
...@@ -5,10 +5,10 @@ import ( ...@@ -5,10 +5,10 @@ import (
"net/http" "net/http"
) )
type response struct { type Response struct {
code int Code int `json:"code"`
data interface{} Data interface{} `json:"data"`
msg string Msg string `json:"msg"`
} }
const ( const (
...@@ -18,7 +18,7 @@ const ( ...@@ -18,7 +18,7 @@ const (
func Result(code int, data interface{}, msg string, c *gin.Context) { func Result(code int, data interface{}, msg string, c *gin.Context) {
// 开始时间 // 开始时间
c.JSON(http.StatusOK, response{ c.JSON(http.StatusOK, Response{
code, code,
data, data,
msg, msg,
......
package init package initialize
import ( import (
"gin-vue-admin/global" "gin-vue-admin/global"
......
package init package initialize
import ( import (
"gin-vue-admin/global" "gin-vue-admin/global"
...@@ -8,7 +8,7 @@ import ( ...@@ -8,7 +8,7 @@ import (
//初始化数据库并产生数据库全局变量 //初始化数据库并产生数据库全局变量
func Mysql() { 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 { if db, err := gorm.Open("mysql", admin.Username+":"+admin.Password+"@("+admin.Path+")/"+admin.Dbname+"?"+admin.Config); err != nil {
global.GVA_LOG.Error("DEFAULTDB数据库启动异常", err) global.GVA_LOG.Error("DEFAULTDB数据库启动异常", err)
} else { } else {
......
package init package initialize
import ( import (
"gin-vue-admin/global" "gin-vue-admin/global"
...@@ -6,7 +6,7 @@ import ( ...@@ -6,7 +6,7 @@ import (
) )
func Redis() { func Redis() {
redisCfg := global.GVA_CONFIG.RedisAdmin redisCfg := global.GVA_CONFIG.Redis
client := redis.NewClient(&redis.Options{ client := redis.NewClient(&redis.Options{
Addr: redisCfg.Addr, Addr: redisCfg.Addr,
Password: redisCfg.Password, // no password set Password: redisCfg.Password, // no password set
......
package init package initialize
import ( import (
_ "gin-vue-admin/docs" _ "gin-vue-admin/docs"
...@@ -35,6 +35,6 @@ func Routers() *gin.Engine { ...@@ -35,6 +35,6 @@ func Routers() *gin.Engine {
router.InitSystemRouter(ApiGroup) // system相关路由 router.InitSystemRouter(ApiGroup) // system相关路由
router.InitCustomerRouter(ApiGroup) // 客户路由 router.InitCustomerRouter(ApiGroup) // 客户路由
router.InitAutoCodeRouter(ApiGroup) // 创建自动化代码 router.InitAutoCodeRouter(ApiGroup) // 创建自动化代码
L.Info("router register success") global.GVA_LOG.Info("router register success")
return Router return Router
} }
...@@ -3,13 +3,13 @@ package main ...@@ -3,13 +3,13 @@ package main
import ( import (
"gin-vue-admin/core" "gin-vue-admin/core"
"gin-vue-admin/global" "gin-vue-admin/global"
"gin-vue-admin/init" "gin-vue-admin/initialize"
//"runtime" //"runtime"
) )
func main() { func main() {
init.Mysql() initialize.Mysql()
init.DBTables() initialize.DBTables()
// 程序结束前关闭数据库链接 // 程序结束前关闭数据库链接
defer global.GVA_DB.Close() defer global.GVA_DB.Close()
......
...@@ -97,8 +97,8 @@ func ParamsMatchFunc(args ...interface{}) (interface{}, error) { ...@@ -97,8 +97,8 @@ func ParamsMatchFunc(args ...interface{}) (interface{}, error) {
//持久化到数据库 引入自定义规则 //持久化到数据库 引入自定义规则
func Casbin() *casbin.Enforcer { func Casbin() *casbin.Enforcer {
a := gormadapter.NewAdapterByDB(global.GVA_DB) 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.AddFunction("ParamsMatch", ParamsMatchFunc)
e.LoadPolicy() _ = e.LoadPolicy()
return e return e
} }
package model
type PageInfo struct {
Page int `json:"page"`
PageSize int `json:"pageSize"`
}
...@@ -2,8 +2,9 @@ ...@@ -2,8 +2,9 @@
package {{.PackageName}} package {{.PackageName}}
import ( import (
"gin-vue-admin/init/qmsql" "gin-vue-admin/global"
"github.com/jinzhu/gorm" "github.com/jinzhu/gorm"
"github.com/pkg/errors"
) )
type {{.StructName}} struct { type {{.StructName}} struct {
...@@ -13,25 +14,25 @@ type {{.StructName}} struct { ...@@ -13,25 +14,25 @@ type {{.StructName}} struct {
// 创建{{.StructName}} // 创建{{.StructName}}
func ({{.Abbreviation}} *{{.StructName}})Create{{.StructName}}()(err error){ func ({{.Abbreviation}} *{{.StructName}})Create{{.StructName}}()(err error){
err = qmsql.DEFAULTDB.Create({{.Abbreviation}}).Error err = global.GVA_DB.Create({{.Abbreviation}}).Error
return err return err
} }
// 删除{{.StructName}} // 删除{{.StructName}}
func ({{.Abbreviation}} *{{.StructName}})Delete{{.StructName}}()(err error){ func ({{.Abbreviation}} *{{.StructName}})Delete{{.StructName}}()(err error){
err = qmsql.DEFAULTDB.Delete({{.Abbreviation}}).Error err = global.GVA_DB.Delete({{.Abbreviation}}).Error
return err return err
} }
// 更新{{.StructName}} // 更新{{.StructName}}
func ({{.Abbreviation}} *{{.StructName}})Update{{.StructName}}()(err error, re{{.Abbreviation}} {{.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}} return err, *{{.Abbreviation}}
} }
// 根据ID查看单条{{.StructName}} // 根据ID查看单条{{.StructName}}
func ({{.Abbreviation}} *{{.StructName}})FindById()(err error,re{{.Abbreviation}} {{.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}} return err,re{{.Abbreviation}}
} }
...@@ -39,7 +40,7 @@ func ({{.Abbreviation}} *{{.StructName}})FindById()(err error,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){ func ({{.Abbreviation}} *{{.StructName}})GetInfoList(info PageInfo)(err error, list interface{}, total int){
limit := info.PageSize limit := info.PageSize
offset := info.PageSize * (info.Page - 1) offset := info.PageSize * (info.Page - 1)
db:=qmsql.DEFAULTDB db:=global.GVA_DB
if err != nil { if err != nil {
return return
} else { } else {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册