Merge pull request #371 from go-admin-team/dev

1.3.0rc.0

.github/workflows/go.yml

@@ -13,10 +13,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - name: Set up Go 1.13
+    - name: Set up Go 1.14
       uses: actions/setup-go@v1
       with:
-        go-version: 1.13
+        go-version: 1.14
       id: go
 
     - name: Check out code into the Go module directory

.gitignore

@@ -1,4 +1,6 @@
 .idea
+.vscode
+*/.DS_Store
 static/uploadfile
 main.exe
 go-admin
@@ -7,6 +9,15 @@ temp/
 vendor
 config/settings.dev.yml
 go-admin
-middleware/demo.go
-config/settings.dev.b.yml
+common/middleware/demo.go
+config/settings.dev.*.yml
+config/settings.dev.*.yml.log
 temp/logs
+config/settings.dev.yml.log
+config/settings.b.dev.yml
+cmd/migrate/migration/version-local/*
+!cmd/migrate/migration/version-local/doc.go
+*/.DS_Store
+
+# go sum
+go.sum

Dockerfile

@@ -0,0 +1,26 @@
+FROM golang:alpine as builder
+
+MAINTAINER lwnmengjing
+
+ENV GOPROXY https://goproxy.cn/
+
+WORKDIR /go/release
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+RUN apk update && apk add tzdata
+
+COPY go.mod ./go.mod
+RUN go mod download
+COPY . .
+RUN pwd && ls
+
+RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-w -s" -a -installsuffix cgo -o go-admin .
+
+FROM alpine
+
+COPY --from=builder /go/release/go-admin /
+
+COPY --from=builder /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+
+EXPOSE 8000
+
+CMD ["/go-admin","server","-c", "/config/settings.yml"]

README.md

@@ -16,8 +16,8 @@
 </p>
 
 
-  [English](https://github.com/wenjianzhang/go-admin/blob/master/README.en.md) | 简体中文
-  
+  [English](https://github.com/go-admin-team/go-admin/blob/master/README.en.md) | 简体中文
+
 
 ##### 基于Gin + Vue + Element UI的前后端分离权限管理系统 
 
@@ -27,7 +27,7 @@
 
 [在线文档国内](http://mydearzwj.gitee.io/go-admin-site/)
 
-[前端项目](https://github.com/wenjianzhang/go-admin-ui)
+[前端项目](https://github.com/go-admin-team/go-admin-ui)
 
 [视频教程](https://space.bilibili.com/565616721/channel/detail?cid=125737)
 
@@ -128,10 +128,10 @@ cd goadmin
 
 ```bash
 # 获取后端代码
-git clone https://github.com/wenjianzhang/go-admin.git
+git clone https://github.com/go-admin-team/go-admin.git
 
 # 获取前端代码
-git clone https://github.com/wenjianzhang/go-admin-ui.git
+git clone https://github.com/go-admin-team/go-admin-ui.git
 
 ```
 
@@ -159,15 +159,28 @@ vi ./config/setting.yml
 #### 初始化数据库，以及服务启动
 ```
 # 首次配置需要初始化数据库资源信息
-./go-admin init -c config/settings.yml -m dev
+./go-admin migrate -c config/settings.yml
 
 
 # 启动项目，也可以用IDE进行调试
-./go-admin server -c config/settings.yml -p 8000 -m dev
+./go-admin server -c config/settings.yml -p 8000
 
 ```
 
+#### 使用docker 编译启动
+
+```shell
+# 编译镜像
+docker build -t go-admin .
+
+# 启动容器，第一个go-admin是容器名字，第二个go-admin是镜像名称
+docker run --name go-admin -p 8000:8000 -d go-admin
+```
+
+
+
 #### 文档生成
+
 ```bash
 swag init  
 
@@ -200,7 +213,7 @@ npm run dev
 ## 🎬 在线体验
 > admin  /  123456
 
-演示地址：[http://www.zhangwj.com](http://www.zhangwj.com/#/login)
+演示地址：[http://www.go-admin.dev](http://www.go-admin.dev/#/login)
 
 
 ## 📨 互动
@@ -217,18 +230,33 @@ npm run dev
     <td><a target="_blank" href="https://shang.qq.com/wpa/qunwpa?idkey=0f2bf59f5f2edec6a4550c364242c0641f870aa328e468c4ee4b7dbfb392627b"><img border="0" src="https://pub.idqqimg.com/wpa/images/group.png" alt="go-admin技术交流乙号" title="go-admin技术交流乙号"></a></td>
   </tr>
 </table>
-  
+
+## 💎 主要成员
+
+<a href="https://github.com/wenjianzhang"> <img src="https://avatars.githubusercontent.com/u/3890175?s=460&u=20eac63daef81588fbac611da676b99859319251&v=4" width="80px"></a>
+<a href="https://github.com/lwnmengjing"> <img src="https://avatars.githubusercontent.com/u/12806223?s=400&u=a89272dce50100b77b4c0d5c81c718bf78ebb580&v=4" width="80px"></a>
+<a href="https://github.com/chengxiao"> <img src="https://avatars.githubusercontent.com/u/1379545?s=460&u=557da5503d0ac4a8628df6b4075b17853d5edcd9&v=4" width="80px"></a>
+<a href="https://github.com/bing127"> <img src="https://avatars.githubusercontent.com/u/31166183?s=460&u=c085bff88df10bb7676c8c0351ba9dcd031d1fb3&v=4" width="80px"></a>
+
+
+
+## JetBrains 开源证书支持
+
+`go-admin` 项目一直以来都是在 JetBrains 公司旗下的 GoLand 集成开发环境中进行开发，基于 **free JetBrains Open Source license(s)** 正版免费授权，在此表达我的谢意。
+
+<a href="https://www.jetbrains.com/?from=kubeadm-ha" target="_blank"><img src="https://raw.githubusercontent.com/panjf2000/illustrations/master/jetbrains/jetbrains-variant-4.png" width="250" align="middle"/></a>
+
 
 ## 🤝 特别感谢
-[chengxiao](https://github.com/chengxiao)
-[gin](https://github.com/gin-gonic/gin)
-[casbin](https://github.com/casbin/casbin)
-[spf13/viper](https://github.com/spf13/viper)
-[gorm](https://github.com/jinzhu/gorm)
-[gin-swagger](https://github.com/swaggo/gin-swagger)
-[jwt-go](https://github.com/dgrijalva/jwt-go)
-[vue-element-admin](https://github.com/PanJiaChen/vue-element-admin)
-[ruoyi-vue](https://gitee.com/y_project/RuoYi-Vue)
+1. [chengxiao](https://github.com/chengxiao)
+2. [gin](https://github.com/gin-gonic/gin)
+2. [casbin](https://github.com/casbin/casbin)
+2. [spf13/viper](https://github.com/spf13/viper)
+2. [gorm](https://github.com/jinzhu/gorm)
+2. [gin-swagger](https://github.com/swaggo/gin-swagger)
+2. [jwt-go](https://github.com/dgrijalva/jwt-go)
+2. [vue-element-admin](https://github.com/PanJiaChen/vue-element-admin)
+2. [ruoyi-vue](https://gitee.com/y_project/RuoYi-Vue)
 
 ## 🤟 打赏
 
@@ -243,9 +271,11 @@ npm run dev
 
 zhuqiyun LLL狐 星星之火 cjj770 Sam 唐*i 晓聪 aLong *渊 海马 魏镇坪 + 111 *哥 我的宇哥哥 *声 *节
 
+## 🤝 链接
+[Go开发者成长线路图](http://www.golangroadmap.com/)
+
 ## 🔑 License
 
-[MIT](https://github.com/wenjianzhang/go-admin/blob/master/LICENSE.md)
-
-Copyright (c) 2020 wenjianzhang
+[MIT](https://github.com/go-admin-team/go-admin/blob/master/LICENSE.md)
 
+Copyright (c) 2020 wenjianzhang

apis/log/loginlog.go

@@ -1,132 +0,0 @@
-package log
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/gin-gonic/gin/binding"
-	"go-admin/models"
-	"go-admin/tools"
-	"go-admin/tools/app"
-	"net/http"
-)
-
-// @Summary 登录日志列表
-// @Description 获取JSON
-// @Tags 登录日志
-// @Param status query string false "status"
-// @Param dictCode query string false "dictCode"
-// @Param dictType query string false "dictType"
-// @Param pageSize query int false "页条数"
-// @Param pageIndex query int false "页码"
-// @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/loginloglist [get]
-// @Security Bearer
-func GetLoginLogList(c *gin.Context) {
-	var data models.LoginLog
-	var err error
-	var pageSize = 10
-	var pageIndex = 1
-
-	size := c.Request.FormValue("pageSize")
-	if size != "" {
-		pageSize = tools.StrToInt(err, size)
-	}
-
-	index := c.Request.FormValue("pageIndex")
-	if index != "" {
-		pageIndex = tools.StrToInt(err, index)
-	}
-
-	data.Username = c.Request.FormValue("username")
-	data.Status = c.Request.FormValue("status")
-	data.Ipaddr = c.Request.FormValue("ipaddr")
-	result, count, err := data.GetPage(pageSize, pageIndex)
-	tools.HasError(err, "", -1)
-
-	var mp = make(map[string]interface{}, 3)
-	mp["list"] = result
-	mp["count"] = count
-	mp["pageIndex"] = pageIndex
-	mp["pageSize"] = pageSize
-
-	var res app.Response
-	res.Data = mp
-	c.JSON(http.StatusOK, res.ReturnOK())
-}
-
-// @Summary 通过编码获取登录日志
-// @Description 获取JSON
-// @Tags 登录日志
-// @Param infoId path int true "infoId"
-// @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/loginlog/{infoId} [get]
-// @Security Bearer
-func GetLoginLog(c *gin.Context) {
-	var LoginLog models.LoginLog
-	LoginLog.InfoId, _ = tools.StringToInt(c.Param("infoId"))
-	result, err := LoginLog.Get()
-	tools.HasError(err, "抱歉未找到相关信息", -1)
-
-	var res app.Response
-	res.Data = result
-	c.JSON(http.StatusOK, res.ReturnOK())
-}
-
-// @Summary 添加登录日志
-// @Description 获取JSON
-// @Tags 登录日志
-// @Accept  application/json
-// @Product application/json
-// @Param data body models.LoginLog true "data"
-// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
-// @Router /api/v1/loginlog [post]
-// @Security Bearer
-func InsertLoginLog(c *gin.Context) {
-	var data models.LoginLog
-	err := c.BindWith(&data, binding.JSON)
-	tools.HasError(err, "", 500)
-	result, err := data.Create()
-	tools.HasError(err, "", -1)
-	var res app.Response
-	res.Data = result
-	c.JSON(http.StatusOK, res.ReturnOK())
-}
-
-// @Summary 修改登录日志
-// @Description 获取JSON
-// @Tags 登录日志
-// @Accept  application/json
-// @Product application/json
-// @Param data body models.LoginLog true "body"
-// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
-// @Router /api/v1/loginlog [put]
-// @Security Bearer
-func UpdateLoginLog(c *gin.Context) {
-	var data models.LoginLog
-	err := c.BindWith(&data, binding.JSON)
-	tools.HasError(err, "", -1)
-	result, err := data.Update(data.InfoId)
-	tools.HasError(err, "", -1)
-	var res app.Response
-	res.Data = result
-	c.JSON(http.StatusOK, res.ReturnOK())
-}
-
-// @Summary 批量删除登录日志
-// @Description 删除数据
-// @Tags 登录日志
-// @Param infoId path string true "以逗号（,）分割的infoId"
-// @Success 200 {string} string	"{"code": 200, "message": "删除成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "删除失败"}"
-// @Router /api/v1/loginlog/{infoId} [delete]
-func DeleteLoginLog(c *gin.Context) {
-	var data models.LoginLog
-	data.UpdateBy = tools.GetUserIdStr(c)
-	IDS := tools.IdsStrToIdsIntGroup("infoId", c)
-	_, err := data.BatchDelete(IDS)
-	tools.HasError(err, "修改失败", 500)
-	var res app.Response
-	res.Msg = "删除成功"
-	c.JSON(http.StatusOK, res.ReturnOK())
-}

apis/log/operlog.go

@@ -1,111 +0,0 @@
-package log
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/gin-gonic/gin/binding"
-	"go-admin/models"
-	"go-admin/tools"
-	"go-admin/tools/app"
-	"net/http"
-)
-
-// @Summary 登录日志列表
-// @Description 获取JSON
-// @Tags 登录日志
-// @Param status query string false "status"
-// @Param dictCode query string false "dictCode"
-// @Param dictType query string false "dictType"
-// @Param pageSize query int false "页条数"
-// @Param pageIndex query int false "页码"
-// @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/operloglist [get]
-// @Security Bearer
-func GetOperLogList(c *gin.Context) {
-	var data models.SysOperLog
-	var err error
-	var pageSize = 10
-	var pageIndex = 1
-
-	size := c.Request.FormValue("pageSize")
-	if size != "" {
-		pageSize = tools.StrToInt(err, size)
-	}
-
-	index := c.Request.FormValue("pageIndex")
-	if index != "" {
-		pageIndex = tools.StrToInt(err, index)
-	}
-
-	data.OperName = c.Request.FormValue("operName")
-	data.Status = c.Request.FormValue("status")
-	data.OperIp = c.Request.FormValue("operIp")
-	result, count, err := data.GetPage(pageSize, pageIndex)
-	tools.HasError(err, "", -1)
-
-	var mp = make(map[string]interface{}, 3)
-	mp["list"] = result
-	mp["count"] = count
-	mp["pageIndex"] = pageIndex
-	mp["pageSize"] = pageSize
-
-	var res app.Response
-	res.Data = mp
-
-	c.JSON(http.StatusOK, res.ReturnOK())
-}
-
-// @Summary 通过编码获取登录日志
-// @Description 获取JSON
-// @Tags 登录日志
-// @Param infoId path int true "infoId"
-// @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/operlog/{infoId} [get]
-// @Security Bearer
-func GetOperLog(c *gin.Context) {
-	var OperLog models.SysOperLog
-	OperLog.OperId, _ = tools.StringToInt(c.Param("operId"))
-	result, err := OperLog.Get()
-	tools.HasError(err, "抱歉未找到相关信息", -1)
-	var res app.Response
-	res.Data = result
-	c.JSON(http.StatusOK, res.ReturnOK())
-}
-
-// @Summary 添加操作日志
-// @Description 获取JSON
-// @Tags 操作日志
-// @Accept  application/json
-// @Product application/json
-// @Param data body models.SysOperLog true "data"
-// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
-// @Router /api/v1/operlog [post]
-// @Security Bearer
-func InsertOperLog(c *gin.Context) {
-	var data models.SysOperLog
-	err := c.BindWith(&data, binding.JSON)
-	tools.HasError(err, "", 500)
-	result, err := data.Create()
-	tools.HasError(err, "", -1)
-	var res app.Response
-	res.Data = result
-	c.JSON(http.StatusOK, res.ReturnOK())
-}
-
-// @Summary 批量删除操作日志
-// @Description 删除数据
-// @Tags 操作日志
-// @Param operId path string true "以逗号（,）分割的operId"
-// @Success 200 {string} string	"{"code": 200, "message": "删除成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "删除失败"}"
-// @Router /api/v1/operlog/{operId} [delete]
-func DeleteOperLog(c *gin.Context) {
-	var data models.SysOperLog
-	data.UpdateBy = tools.GetUserIdStr(c)
-	IDS := tools.IdsStrToIdsIntGroup("operId", c)
-	_, err := data.BatchDelete(IDS)
-	tools.HasError(err, "删除失败", 500)
-	var res app.Response
-	res.Msg = "删除成功"
-	c.JSON(http.StatusOK, res.ReturnOK())
-}

apis/system/config.go

@@ -1,147 +0,0 @@
-package system
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/gin-gonic/gin/binding"
-	"go-admin/models"
-	"go-admin/tools"
-	"go-admin/tools/app"
-	"go-admin/tools/app/msg"
-	"net/http"
-)
-
-// @Summary 配置列表数据
-// @Description 获取JSON
-// @Tags 配置
-// @Param configKey query string false "configKey"
-// @Param configName query string false "configName"
-// @Param configType query string false "configType"
-// @Param pageSize query int false "页条数"
-// @Param pageIndex query int false "页码"
-// @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/configList [get]
-// @Security Bearer
-func GetConfigList(c *gin.Context) {
-	var data models.SysConfig
-	var err error
-	var pageSize = 10
-	var pageIndex = 1
-
-	if size := c.Request.FormValue("pageSize"); size != "" {
-		pageSize = tools.StrToInt(err, size)
-	}
-
-	if index := c.Request.FormValue("pageIndex"); index != "" {
-		pageIndex = tools.StrToInt(err, index)
-	}
-
-	data.ConfigKey = c.Request.FormValue("configKey")
-	data.ConfigName = c.Request.FormValue("configName")
-	data.ConfigType = c.Request.FormValue("configType")
-	data.DataScope = tools.GetUserIdStr(c)
-	result, count, err := data.GetPage(pageSize, pageIndex)
-	tools.HasError(err, "", -1)
-
-	var mp = make(map[string]interface{}, 3)
-	mp["list"] = result
-	mp["count"] = count
-	mp["pageIndex"] = pageIndex
-	mp["pageSize"] = pageSize
-
-	var res app.Response
-	res.Data = mp
-
-	c.JSON(http.StatusOK, res.ReturnOK())
-}
-
-// @Summary 获取配置
-// @Description 获取JSON
-// @Tags 配置
-// @Param configId path int true "配置编码"
-// @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/config/{configId} [get]
-// @Security Bearer
-func GetConfig(c *gin.Context) {
-	var Config models.SysConfig
-	Config.ConfigId, _ = tools.StringToInt(c.Param("configId"))
-	result, err := Config.Get()
-	tools.HasError(err, "抱歉未找到相关信息", -1)
-
-	var res app.Response
-	res.Data = result
-
-	c.JSON(http.StatusOK, res.ReturnOK())
-}
-
-// @Summary 获取配置
-// @Description 获取JSON
-// @Tags 配置
-// @Param configKey path int true "configKey"
-// @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/configKey/{configKey} [get]
-// @Security Bearer
-func GetConfigByConfigKey(c *gin.Context) {
-	var Config models.SysConfig
-	Config.ConfigKey = c.Param("configKey")
-	result, err := Config.Get()
-	tools.HasError(err, "抱歉未找到相关信息", -1)
-
-	app.OK(c, result, result.ConfigValue)
-}
-
-// @Summary 添加配置
-// @Description 获取JSON
-// @Tags 配置
-// @Accept  application/json
-// @Product application/json
-// @Param data body models.SysConfig true "data"
-// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
-// @Router /api/v1/dict/data [post]
-// @Security Bearer
-func InsertConfig(c *gin.Context) {
-	var data models.SysConfig
-	err := c.BindWith(&data, binding.JSON)
-	data.CreateBy = tools.GetUserIdStr(c)
-	tools.HasError(err, "", 500)
-	result, err := data.Create()
-	tools.HasError(err, "", -1)
-
-	app.OK(c, result, "")
-}
-
-// @Summary 修改配置
-// @Description 获取JSON
-// @Tags 配置
-// @Accept  application/json
-// @Product application/json
-// @Param data body models.SysConfig true "body"
-// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
-// @Router /api/v1/config [put]
-// @Security Bearer
-func UpdateConfig(c *gin.Context) {
-	var data models.SysConfig
-	err := c.BindWith(&data, binding.JSON)
-	tools.HasError(err, "数据解析失败", -1)
-	data.UpdateBy = tools.GetUserIdStr(c)
-	result, err := data.Update(data.ConfigId)
-	tools.HasError(err, "", -1)
-	app.OK(c, result, "")
-}
-
-// @Summary 删除配置
-// @Description 删除数据
-// @Tags 配置
-// @Param configId path int true "configId"
-// @Success 200 {string} string	"{"code": 200, "message": "删除成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "删除失败"}"
-// @Router /api/v1/config/{configId} [delete]
-func DeleteConfig(c *gin.Context) {
-	var data models.SysConfig
-	data.UpdateBy = tools.GetUserIdStr(c)
-	IDS := tools.IdsStrToIdsIntGroup("configId", c)
-	result, err := data.BatchDelete(IDS)
-	tools.HasError(err, "修改失败", 500)
-	app.OK(c, result, msg.DeletedSuccess)
-}

apis/system/dept.go

@@ -1,132 +0,0 @@
-package system
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/gin-gonic/gin/binding"
-	"go-admin/models"
-	"go-admin/tools"
-	"go-admin/tools/app"
-	"go-admin/tools/app/msg"
-)
-
-// @Summary 分页部门列表数据
-// @Description 分页列表
-// @Tags 部门
-// @Param name query string false "name"
-// @Param id query string false "id"
-// @Param position query string false "position"
-// @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/deptList [get]
-// @Security Bearer
-func GetDeptList(c *gin.Context) {
-	var Dept models.SysDept
-	Dept.DeptName = c.Request.FormValue("deptName")
-	Dept.Status = c.Request.FormValue("status")
-	Dept.DeptId, _ = tools.StringToInt(c.Request.FormValue("deptId"))
-	Dept.DataScope = tools.GetUserIdStr(c)
-	result, err := Dept.SetDept(true)
-	tools.HasError(err, "抱歉未找到相关信息", -1)
-	app.OK(c, result, "")
-}
-
-func GetDeptTree(c *gin.Context) {
-	var Dept models.SysDept
-	Dept.DeptName = c.Request.FormValue("deptName")
-	Dept.Status = c.Request.FormValue("status")
-	Dept.DeptId, _ = tools.StringToInt(c.Request.FormValue("deptId"))
-	result, err := Dept.SetDept(false)
-	tools.HasError(err, "抱歉未找到相关信息", -1)
-	app.OK(c, result, "")
-}
-
-// @Summary 部门列表数据
-// @Description 获取JSON
-// @Tags 部门
-// @Param deptId path string false "deptId"
-// @Param position query string false "position"
-// @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/dept/{deptId} [get]
-// @Security Bearer
-func GetDept(c *gin.Context) {
-	var Dept models.SysDept
-	Dept.DeptId, _ = tools.StringToInt(c.Param("deptId"))
-	Dept.DataScope = tools.GetUserIdStr(c)
-	result, err := Dept.Get()
-	tools.HasError(err, msg.NotFound, 404)
-	app.OK(c, result, msg.GetSuccess)
-}
-
-// @Summary 添加部门
-// @Description 获取JSON
-// @Tags 部门
-// @Accept  application/json
-// @Product application/json
-// @Param data body models.SysDept true "data"
-// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
-// @Router /api/v1/dept [post]
-// @Security Bearer
-func InsertDept(c *gin.Context) {
-	var data models.SysDept
-	err := c.BindWith(&data, binding.JSON)
-	tools.HasError(err, "", 500)
-	data.CreateBy = tools.GetUserIdStr(c)
-	result, err := data.Create()
-	tools.HasError(err, "", -1)
-	app.OK(c, result, msg.CreatedSuccess)
-}
-
-// @Summary 修改部门
-// @Description 获取JSON
-// @Tags 部门
-// @Accept  application/json
-// @Product application/json
-// @Param id path int true "id"
-// @Param data body models.SysDept true "body"
-// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
-// @Router /api/v1/dept [put]
-// @Security Bearer
-func UpdateDept(c *gin.Context) {
-	var data models.SysDept
-	err := c.BindJSON(&data)
-	tools.HasError(err, "", -1)
-	data.UpdateBy = tools.GetUserIdStr(c)
-	result, err := data.Update(data.DeptId)
-	tools.HasError(err, "", -1)
-	app.OK(c, result, msg.UpdatedSuccess)
-}
-
-// @Summary 删除部门
-// @Description 删除数据
-// @Tags 部门
-// @Param id path int true "id"
-// @Success 200 {string} string	"{"code": 200, "message": "删除成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "删除失败"}"
-// @Router /api/v1/dept/{id} [delete]
-func DeleteDept(c *gin.Context) {
-	var data models.SysDept
-	id, err := tools.StringToInt(c.Param("id"))
-	_, err = data.Delete(id)
-	tools.HasError(err, "删除失败", 500)
-	app.OK(c, "", msg.DeletedSuccess)
-}
-
-func GetDeptTreeRoleselect(c *gin.Context) {
-	var Dept models.SysDept
-	var SysRole models.SysRole
-	id, err := tools.StringToInt(c.Param("roleId"))
-	SysRole.RoleId = id
-	result, err := Dept.SetDeptLable()
-	tools.HasError(err, msg.NotFound, -1)
-	menuIds := make([]int, 0)
-	if id != 0 {
-		menuIds, err = SysRole.GetRoleDeptId()
-		tools.HasError(err, "抱歉未找到相关信息", -1)
-	}
-	app.Custum(c, gin.H{
-		"code":        200,
-		"depts":       result,
-		"checkedKeys": menuIds,
-	})
-}

apis/system/dict/dictdata.go

@@ -1,152 +0,0 @@
-package dict
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/gin-gonic/gin/binding"
-	"go-admin/models"
-	"go-admin/tools"
-	"go-admin/tools/app"
-	"net/http"
-)
-
-// @Summary 字典数据列表
-// @Description 获取JSON
-// @Tags 字典数据
-// @Param status query string false "status"
-// @Param dictCode query string false "dictCode"
-// @Param dictType query string false "dictType"
-// @Param pageSize query int false "页条数"
-// @Param pageIndex query int false "页码"
-// @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/dict/data/list [get]
-// @Security Bearer
-func GetDictDataList(c *gin.Context) {
-	var data models.DictData
-	var err error
-	var pageSize = 10
-	var pageIndex = 1
-
-	if size := c.Request.FormValue("pageSize"); size != "" {
-		pageSize = tools.StrToInt(err, size)
-	}
-
-	if index := c.Request.FormValue("pageIndex"); index != "" {
-		pageIndex = tools.StrToInt(err, index)
-	}
-
-	data.DictLabel = c.Request.FormValue("dictLabel")
-	data.Status = c.Request.FormValue("status")
-	data.DictType = c.Request.FormValue("dictType")
-	id := c.Request.FormValue("dictCode")
-	data.DictCode, _ = tools.StringToInt(id)
-	data.DataScope = tools.GetUserIdStr(c)
-	result, count, err := data.GetPage(pageSize, pageIndex)
-	tools.HasError(err, "", -1)
-
-	var mp = make(map[string]interface{}, 3)
-	mp["list"] = result
-	mp["count"] = count
-	mp["pageIndex"] = pageIndex
-	mp["pageSize"] = pageSize
-
-	var res app.Response
-	res.Data = mp
-
-	c.JSON(http.StatusOK, res.ReturnOK())
-}
-
-// @Summary 通过编码获取字典数据
-// @Description 获取JSON
-// @Tags 字典数据
-// @Param dictCode path int true "字典编码"
-// @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/dict/data/{dictCode} [get]
-// @Security Bearer
-func GetDictData(c *gin.Context) {
-	var DictData models.DictData
-	DictData.DictLabel = c.Request.FormValue("dictLabel")
-	DictData.DictCode, _ = tools.StringToInt(c.Param("dictCode"))
-	result, err := DictData.GetByCode()
-	tools.HasError(err, "抱歉未找到相关信息", -1)
-	var res app.Response
-	res.Data = result
-	c.JSON(http.StatusOK, res.ReturnOK())
-}
-
-// @Summary 通过字典类型获取字典数据
-// @Description 获取JSON
-// @Tags 字典数据
-// @Param dictType path int true "dictType"
-// @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/dict/databyType/{dictType} [get]
-// @Security Bearer
-func GetDictDataByDictType(c *gin.Context) {
-	var DictData models.DictData
-	DictData.DictType = c.Param("dictType")
-	result, err := DictData.Get()
-	tools.HasError(err, "抱歉未找到相关信息", -1)
-
-	var res app.Response
-	res.Data = result
-	c.JSON(http.StatusOK, res.ReturnOK())
-}
-
-// @Summary 添加字典数据
-// @Description 获取JSON
-// @Tags 字典数据
-// @Accept  application/json
-// @Product application/json
-// @Param data body models.DictType true "data"
-// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
-// @Router /api/v1/dict/data [post]
-// @Security Bearer
-func InsertDictData(c *gin.Context) {
-	var data models.DictData
-	err := c.BindWith(&data, binding.JSON)
-	data.CreateBy = tools.GetUserIdStr(c)
-	tools.HasError(err, "", 500)
-	result, err := data.Create()
-	tools.HasError(err, "", -1)
-	var res app.Response
-	res.Data = result
-	c.JSON(http.StatusOK, res.ReturnOK())
-}
-
-// @Summary 修改字典数据
-// @Description 获取JSON
-// @Tags 字典数据
-// @Accept  application/json
-// @Product application/json
-// @Param data body models.DictType true "body"
-// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
-// @Router /api/v1/dict/data [put]
-// @Security Bearer
-func UpdateDictData(c *gin.Context) {
-	var data models.DictData
-	err := c.BindWith(&data, binding.JSON)
-	data.UpdateBy = tools.GetUserIdStr(c)
-	tools.HasError(err, "", -1)
-	result, err := data.Update(data.DictCode)
-	tools.HasError(err, "", -1)
-	var res app.Response
-	res.Data = result
-	c.JSON(http.StatusOK, res.ReturnOK())
-}
-
-// @Summary 删除字典数据
-// @Description 删除数据
-// @Tags 字典数据
-// @Param dictCode path int true "dictCode"
-// @Success 200 {string} string	"{"code": 200, "message": "删除成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "删除失败"}"
-// @Router /api/v1/dict/data/{dictCode} [delete]
-func DeleteDictData(c *gin.Context) {
-	var data models.DictData
-	data.UpdateBy = tools.GetUserIdStr(c)
-	IDS := tools.IdsStrToIdsIntGroup("dictCode", c)
-	result, err := data.BatchDelete(IDS)
-	tools.HasError(err, "修改失败", 500)
-	app.OK(c, result, "删除成功")
-}

apis/system/dict/dicttype.go

@@ -1,143 +0,0 @@
-package dict
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/gin-gonic/gin/binding"
-	"go-admin/models"
-	"go-admin/tools"
-	"go-admin/tools/app"
-	"net/http"
-)
-
-// @Summary 字典类型列表数据
-// @Description 获取JSON
-// @Tags 字典类型
-// @Param dictName query string false "dictName"
-// @Param dictId query string false "dictId"
-// @Param dictType query string false "dictType"
-// @Param pageSize query int false "页条数"
-// @Param pageIndex query int false "页码"
-// @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/dict/type/list [get]
-// @Security Bearer
-func GetDictTypeList(c *gin.Context) {
-	var data models.DictType
-	var err error
-	var pageSize = 10
-	var pageIndex = 1
-
-	if size := c.Request.FormValue("pageSize"); size != "" {
-		pageSize = tools.StrToInt(err, size)
-	}
-
-	if index := c.Request.FormValue("pageIndex"); index != "" {
-		pageIndex = tools.StrToInt(err, index)
-	}
-
-	data.DictName = c.Request.FormValue("dictName")
-	id := c.Request.FormValue("dictId")
-	data.DictId, _ = tools.StringToInt(id)
-	data.DictType = c.Request.FormValue("dictType")
-	data.DataScope = tools.GetUserIdStr(c)
-	result, count, err := data.GetPage(pageSize, pageIndex)
-	tools.HasError(err, "", -1)
-
-	var mp = make(map[string]interface{}, 3)
-	mp["list"] = result
-	mp["count"] = count
-	mp["pageIndex"] = pageIndex
-	mp["pageSize"] = pageSize
-
-	var res app.Response
-	res.Data = mp
-	c.JSON(http.StatusOK, res.ReturnOK())
-}
-
-// @Summary 通过字典id获取字典类型
-// @Description 获取JSON
-// @Tags 字典类型
-// @Param dictId path int true "字典类型编码"
-// @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/dict/type/{dictId} [get]
-// @Security Bearer
-func GetDictType(c *gin.Context) {
-	var DictType models.DictType
-	DictType.DictName = c.Request.FormValue("dictName")
-	DictType.DictId, _ = tools.StringToInt(c.Param("dictId"))
-	result, err := DictType.Get()
-	tools.HasError(err, "抱歉未找到相关信息", -1)
-	var res app.Response
-	res.Data = result
-	c.JSON(http.StatusOK, res.ReturnOK())
-}
-
-func GetDictTypeOptionSelect(c *gin.Context) {
-	var DictType models.DictType
-	DictType.DictName = c.Request.FormValue("dictName")
-	DictType.DictId, _ = tools.StringToInt(c.Param("dictId"))
-	result, err := DictType.GetList()
-	tools.HasError(err, "抱歉未找到相关信息", -1)
-	var res app.Response
-	res.Data = result
-	c.JSON(http.StatusOK, res.ReturnOK())
-}
-
-// @Summary 添加字典类型
-// @Description 获取JSON
-// @Tags 字典类型
-// @Accept  application/json
-// @Product application/json
-// @Param data body models.DictType true "data"
-// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
-// @Router /api/v1/dict/type [post]
-// @Security Bearer
-func InsertDictType(c *gin.Context) {
-	var data models.DictType
-	err := c.BindWith(&data, binding.JSON)
-	data.CreateBy = tools.GetUserIdStr(c)
-	tools.HasError(err, "", 500)
-	result, err := data.Create()
-	tools.HasError(err, "", -1)
-	var res app.Response
-	res.Data = result
-	c.JSON(http.StatusOK, res.ReturnOK())
-}
-
-// @Summary 修改字典类型
-// @Description 获取JSON
-// @Tags 字典类型
-// @Accept  application/json
-// @Product application/json
-// @Param data body models.DictType true "body"
-// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
-// @Router /api/v1/dict/type [put]
-// @Security Bearer
-func UpdateDictType(c *gin.Context) {
-	var data models.DictType
-	err := c.BindWith(&data, binding.JSON)
-	data.UpdateBy = tools.GetUserIdStr(c)
-	tools.HasError(err, "", -1)
-	result, err := data.Update(data.DictId)
-	tools.HasError(err, "", -1)
-	var res app.Response
-	res.Data = result
-	c.JSON(http.StatusOK, res.ReturnOK())
-}
-
-// @Summary 删除字典类型
-// @Description 删除数据
-// @Tags 字典类型
-// @Param dictId path int true "dictId"
-// @Success 200 {string} string	"{"code": 200, "message": "删除成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "删除失败"}"
-// @Router /api/v1/dict/type/{dictId} [delete]
-func DeleteDictType(c *gin.Context) {
-	var data models.DictType
-	data.UpdateBy = tools.GetUserIdStr(c)
-	IDS := tools.IdsStrToIdsIntGroup("dictId", c)
-	result, err := data.BatchDelete(IDS)
-	tools.HasError(err, "修改失败", 500)
-	app.OK(c, result, "删除成功")
-}

apis/system/info.go

@@ -1,52 +0,0 @@
-package system
-
-import (
-	"github.com/gin-gonic/gin"
-	"go-admin/models"
-	"go-admin/tools"
-	"go-admin/tools/app"
-)
-
-func GetInfo(c *gin.Context) {
-
-	var roles = make([]string, 1)
-	roles[0] = tools.GetRoleName(c)
-
-	var permissions = make([]string, 1)
-	permissions[0] = "*:*:*"
-
-	var buttons = make([]string, 1)
-	buttons[0] = "*:*:*"
-
-	RoleMenu := models.RoleMenu{}
-	RoleMenu.RoleId = tools.GetRoleId(c)
-
-	var mp = make(map[string]interface{})
-	mp["roles"] = roles
-	if tools.GetRoleName(c) == "admin" || tools.GetRoleName(c) == "系统管理员" {
-		mp["permissions"] = permissions
-		mp["buttons"] = buttons
-	} else {
-		list, _ := RoleMenu.GetPermis()
-		mp["permissions"] = list
-		mp["buttons"] = list
-	}
-
-	sysuser := models.SysUser{}
-	sysuser.UserId = tools.GetUserId(c)
-	user, err := sysuser.Get()
-	tools.HasError(err, "", 500)
-
-	mp["introduction"] = " am a super administrator"
-
-	mp["avatar"] = "https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif"
-	if user.Avatar != "" {
-		mp["avatar"] = user.Avatar
-	}
-	mp["userName"] = user.NickName
-	mp["userId"] = user.UserId
-	mp["deptId"] = user.DeptId
-	mp["name"] = user.NickName
-
-	app.OK(c, mp, "")
-}

apis/system/menu.go

@@ -1,176 +0,0 @@
-package system
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/gin-gonic/gin/binding"
-	"go-admin/models"
-	"go-admin/tools"
-	"go-admin/tools/app"
-)
-
-// @Summary Menu列表数据
-// @Description 获取JSON
-// @Tags 菜单
-// @Param menuName query string false "menuName"
-// @Success 200 {string} string "{"code": 200, "data": [...]}"
-// @Success 200 {string} string "{"code": -1, "message": "抱歉未找到相关信息"}"
-// @Router /api/v1/menulist [get]
-// @Security Bearer
-func GetMenuList(c *gin.Context) {
-	var Menu models.Menu
-	Menu.MenuName = c.Request.FormValue("menuName")
-	Menu.Visible = c.Request.FormValue("visible")
-	Menu.Title = c.Request.FormValue("title")
-	Menu.DataScope = tools.GetUserIdStr(c)
-	result, err := Menu.SetMenu()
-	tools.HasError(err, "抱歉未找到相关信息", -1)
-
-	app.OK(c, result, "")
-}
-
-// @Summary Menu列表数据
-// @Description 获取JSON
-// @Tags 菜单
-// @Param menuName query string false "menuName"
-// @Success 200 {string} string "{"code": 200, "data": [...]}"
-// @Success 200 {string} string "{"code": -1, "message": "抱歉未找到相关信息"}"
-// @Router /api/v1/menu [get]
-// @Security Bearer
-func GetMenu(c *gin.Context) {
-	var data models.Menu
-	id, err := tools.StringToInt(c.Param("id"))
-	data.MenuId = id
-	result, err := data.GetByMenuId()
-	tools.HasError(err, "抱歉未找到相关信息", -1)
-	app.OK(c, result, "")
-}
-
-func GetMenuTreeRoleselect(c *gin.Context) {
-	var Menu models.Menu
-	var SysRole models.SysRole
-	id, err := tools.StringToInt(c.Param("roleId"))
-	SysRole.RoleId = id
-	result, err := Menu.SetMenuLable()
-	tools.HasError(err, "抱歉未找到相关信息", -1)
-	menuIds := make([]int, 0)
-	if id != 0 {
-		menuIds, err = SysRole.GetRoleMeunId()
-		tools.HasError(err, "抱歉未找到相关信息", -1)
-	}
-	app.Custum(c, gin.H{
-		"code":        200,
-		"menus":       result,
-		"checkedKeys": menuIds,
-	})
-}
-
-// @Summary 获取菜单树
-// @Description 获取JSON
-// @Tags 菜单
-// @Accept  application/x-www-form-urlencoded
-// @Product application/x-www-form-urlencoded
-// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
-// @Router /api/v1/menuTreeselect [get]
-// @Security Bearer
-func GetMenuTreeelect(c *gin.Context) {
-	var data models.Menu
-	result, err := data.SetMenuLable()
-	tools.HasError(err, "抱歉未找到相关信息", -1)
-	app.OK(c, result, "")
-}
-
-// @Summary 创建菜单
-// @Description 获取JSON
-// @Tags 菜单
-// @Accept  application/x-www-form-urlencoded
-// @Product application/x-www-form-urlencoded
-// @Param menuName formData string true "menuName"
-// @Param Path formData string false "Path"
-// @Param Action formData string true "Action"
-// @Param Permission formData string true "Permission"
-// @Param ParentId formData string true "ParentId"
-// @Param IsDel formData string true "IsDel"
-// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
-// @Router /api/v1/menu [post]
-// @Security Bearer
-func InsertMenu(c *gin.Context) {
-	var data models.Menu
-	err := c.BindWith(&data, binding.JSON)
-	tools.HasError(err, "抱歉未找到相关信息", -1)
-	data.CreateBy = tools.GetUserIdStr(c)
-	result, err := data.Create()
-	tools.HasError(err, "抱歉未找到相关信息", -1)
-	app.OK(c, result, "")
-}
-
-// @Summary 修改菜单
-// @Description 获取JSON
-// @Tags 菜单
-// @Accept  application/x-www-form-urlencoded
-// @Product application/x-www-form-urlencoded
-// @Param id path int true "id"
-// @Param data body models.Menu true "body"
-// @Success 200 {string} string	"{"code": 200, "message": "修改成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "修改失败"}"
-// @Router /api/v1/menu/{id} [put]
-// @Security Bearer
-func UpdateMenu(c *gin.Context) {
-	var data models.Menu
-	err2 := c.BindWith(&data, binding.JSON)
-	data.UpdateBy = tools.GetUserIdStr(c)
-	tools.HasError(err2, "修改失败", -1)
-	_, err := data.Update(data.MenuId)
-	tools.HasError(err, "", 501)
-	app.OK(c, "", "修改成功")
-
-}
-
-// @Summary 删除菜单
-// @Description 删除数据
-// @Tags 菜单
-// @Param id path int true "id"
-// @Success 200 {string} string	"{"code": 200, "message": "删除成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "删除失败"}"
-// @Router /api/v1/menu/{id} [delete]
-func DeleteMenu(c *gin.Context) {
-	var data models.Menu
-	id, err := tools.StringToInt(c.Param("id"))
-	data.UpdateBy = tools.GetUserIdStr(c)
-	_, err = data.Delete(id)
-	tools.HasError(err, "删除失败", 500)
-	app.OK(c, "", "删除成功")
-}
-
-// @Summary 根据角色名称获取菜单列表数据（左菜单使用）
-// @Description 获取JSON
-// @Tags 菜单
-// @Param id path int true "id"
-// @Success 200 {string} string "{"code": 200, "data": [...]}"
-// @Success 200 {string} string "{"code": -1, "message": "抱歉未找到相关信息"}"
-// @Router /api/v1/menurole [get]
-// @Security Bearer
-func GetMenuRole(c *gin.Context) {
-	var Menu models.Menu
-	result, err := Menu.SetMenuRole(tools.GetRoleName(c))
-	tools.HasError(err, "获取失败", 500)
-	app.OK(c, result, "")
-}
-
-// @Summary 获取角色对应的菜单id数组
-// @Description 获取JSON
-// @Tags 菜单
-// @Param id path int true "id"
-// @Success 200 {string} string "{"code": 200, "data": [...]}"
-// @Success 200 {string} string "{"code": -1, "message": "抱歉未找到相关信息"}"
-// @Router /api/v1/menuids/{id} [get]
-// @Security Bearer
-func GetMenuIDS(c *gin.Context) {
-	var data models.RoleMenu
-	data.RoleName = c.GetString("role")
-	data.UpdateBy = tools.GetUserIdStr(c)
-	result, err := data.GetIDS()
-	tools.HasError(err, "获取失败", 500)
-	app.OK(c, result, "")
-}

apis/system/post.go

@@ -1,117 +0,0 @@
-package system
-
-import (
-	"github.com/gin-gonic/gin"
-	"go-admin/models"
-	"go-admin/tools"
-	"go-admin/tools/app"
-)
-
-// @Summary 岗位列表数据
-// @Description 获取JSON
-// @Tags 岗位
-// @Param postName query string false "postName"
-// @Param postCode query string false "postCode"
-// @Param postId query string false "postId"
-// @Param status query string false "status"
-// @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/post [get]
-// @Security Bearer
-func GetPostList(c *gin.Context) {
-	var data models.Post
-	var err error
-	var pageSize = 10
-	var pageIndex = 1
-
-	if size := c.Request.FormValue("pageSize"); size != "" {
-		pageSize = tools.StrToInt(err, size)
-	}
-
-	if index := c.Request.FormValue("pageIndex"); index != "" {
-		pageIndex = tools.StrToInt(err, index)
-	}
-
-	id := c.Request.FormValue("postId")
-	data.PostId, _ = tools.StringToInt(id)
-
-	data.PostCode = c.Request.FormValue("postCode")
-	data.PostName = c.Request.FormValue("postName")
-	data.Status = c.Request.FormValue("status")
-
-	data.DataScope = tools.GetUserIdStr(c)
-	result, count, err := data.GetPage(pageSize, pageIndex)
-	tools.HasError(err, "", -1)
-	app.PageOK(c, result, count, pageIndex, pageSize, "")
-}
-
-// @Summary 获取岗位信息
-// @Description 获取JSON
-// @Tags 岗位
-// @Param postId path int true "postId"
-// @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/post/{postId} [get]
-// @Security Bearer
-func GetPost(c *gin.Context) {
-	var Post models.Post
-	Post.PostId, _ = tools.StringToInt(c.Param("postId"))
-	result, err := Post.Get()
-	tools.HasError(err, "抱歉未找到相关信息", -1)
-	app.OK(c, result, "")
-}
-
-// @Summary 添加岗位
-// @Description 获取JSON
-// @Tags 岗位
-// @Accept  application/json
-// @Product application/json
-// @Param data body models.Post true "data"
-// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
-// @Router /api/v1/post [post]
-// @Security Bearer
-func InsertPost(c *gin.Context) {
-	var data models.Post
-	err := c.Bind(&data)
-	data.CreateBy = tools.GetUserIdStr(c)
-	tools.HasError(err, "", 500)
-	result, err := data.Create()
-	tools.HasError(err, "", -1)
-	app.OK(c, result, "")
-}
-
-// @Summary 修改岗位
-// @Description 获取JSON
-// @Tags 岗位
-// @Accept  application/json
-// @Product application/json
-// @Param data body models.Post true "body"
-// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
-// @Router /api/v1/post/ [put]
-// @Security Bearer
-func UpdatePost(c *gin.Context) {
-	var data models.Post
-
-	err := c.Bind(&data)
-	data.UpdateBy = tools.GetUserIdStr(c)
-	tools.HasError(err, "", -1)
-	result, err := data.Update(data.PostId)
-	tools.HasError(err, "", -1)
-	app.OK(c, result, "修改成功")
-}
-
-// @Summary 删除岗位
-// @Description 删除数据
-// @Tags 岗位
-// @Param id path int true "id"
-// @Success 200 {string} string	"{"code": 200, "message": "删除成功"}"
-// @Success 500 {string} string	"{"code": 500, "message": "删除失败"}"
-// @Router /api/v1/post/{postId} [delete]
-func DeletePost(c *gin.Context) {
-	var data models.Post
-	data.UpdateBy = tools.GetUserIdStr(c)
-	IDS := tools.IdsStrToIdsIntGroup("postId", c)
-	result, err := data.BatchDelete(IDS)
-	tools.HasError(err, "删除失败", 500)
-	app.OK(c, result, "删除成功")
-}

apis/system/role.go

@@ -1,149 +0,0 @@
-package system
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/gin-gonic/gin/binding"
-	"go-admin/models"
-	"go-admin/tools"
-	"go-admin/tools/app"
-)
-
-// @Summary 角色列表数据
-// @Description Get JSON
-// @Tags 角色/Role
-// @Param roleName query string false "roleName"
-// @Param status query string false "status"
-// @Param roleKey query string false "roleKey"
-// @Param pageSize query int false "页条数"
-// @Param pageIndex query int false "页码"
-// @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/rolelist [get]
-// @Security Bearer
-func GetRoleList(c *gin.Context) {
-	var data models.SysRole
-	var err error
-	var pageSize = 10
-	var pageIndex = 1
-
-	if size := c.Request.FormValue("pageSize"); size != "" {
-		pageSize = tools.StrToInt(err, size)
-	}
-
-	if index := c.Request.FormValue("pageIndex"); index != "" {
-		pageIndex = tools.StrToInt(err, index)
-	}
-
-	data.RoleKey = c.Request.FormValue("roleKey")
-	data.RoleName = c.Request.FormValue("roleName")
-	data.Status = c.Request.FormValue("status")
-	data.DataScope = tools.GetUserIdStr(c)
-	result, count, err := data.GetPage(pageSize, pageIndex)
-	tools.HasError(err, "", -1)
-
-	app.PageOK(c, result, count, pageIndex, pageSize, "")
-}
-
-// @Summary 获取Role数据
-// @Description 获取JSON
-// @Tags 角色/Role
-// @Param roleId path string false "roleId"
-// @Success 200 {string} string "{"code": 200, "data": [...]}"
-// @Success 200 {string} string "{"code": -1, "message": "抱歉未找到相关信息"}"
-// @Router /api/v1/role [get]
-// @Security Bearer
-func GetRole(c *gin.Context) {
-	var Role models.SysRole
-	Role.RoleId, _ = tools.StringToInt(c.Param("roleId"))
-	result, err := Role.Get()
-	menuIds := make([]int, 0)
-	menuIds, err = Role.GetRoleMeunId()
-	tools.HasError(err, "抱歉未找到相关信息", -1)
-	result.MenuIds = menuIds
-	app.OK(c, result, "")
-
-}
-
-// @Summary 创建角色
-// @Description 获取JSON
-// @Tags 角色/Role
-// @Accept  application/json
-// @Product application/json
-// @Param data body models.SysRole true "data"
-// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
-// @Router /api/v1/role [post]
-func InsertRole(c *gin.Context) {
-	var data models.SysRole
-	data.CreateBy = tools.GetUserIdStr(c)
-	err := c.BindWith(&data, binding.JSON)
-	tools.HasError(err, "", 500)
-	id, err := data.Insert()
-	data.RoleId = id
-	tools.HasError(err, "", -1)
-	var t models.RoleMenu
-	_, err = t.Insert(id, data.MenuIds)
-	tools.HasError(err, "", -1)
-	app.OK(c, data, "添加成功")
-}
-
-// @Summary 修改用户角色
-// @Description 获取JSON
-// @Tags 角色/Role
-// @Accept  application/json
-// @Product application/json
-// @Param data body models.SysRole true "body"
-// @Success 200 {string} string	"{"code": 200, "message": "修改成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "修改失败"}"
-// @Router /api/v1/role [put]
-func UpdateRole(c *gin.Context) {
-	var data models.SysRole
-	data.UpdateBy = tools.GetUserIdStr(c)
-	err := c.Bind(&data)
-	tools.HasError(err, "数据解析失败", -1)
-	result, err := data.Update(data.RoleId)
-	tools.HasError(err, "", -1)
-	var t models.RoleMenu
-	_, err = t.DeleteRoleMenu(data.RoleId)
-	tools.HasError(err, "添加失败1", -1)
-	_, err2 := t.Insert(data.RoleId, data.MenuIds)
-	tools.HasError(err2, "添加失败2", -1)
-
-	app.OK(c, result, "修改成功")
-}
-
-func UpdateRoleDataScope(c *gin.Context) {
-	var data models.SysRole
-	data.UpdateBy = tools.GetUserIdStr(c)
-	err := c.Bind(&data)
-	tools.HasError(err, "数据解析失败", -1)
-	result, err := data.Update(data.RoleId)
-
-	var t models.SysRoleDept
-	_, err = t.DeleteRoleDept(data.RoleId)
-	tools.HasError(err, "添加失败1", -1)
-	if data.DataScope == "2" {
-		_, err2 := t.Insert(data.RoleId, data.DeptIds)
-		tools.HasError(err2, "添加失败2", -1)
-	}
-	app.OK(c, result, "修改成功")
-}
-
-// @Summary 删除用户角色
-// @Description 删除数据
-// @Tags 角色/Role
-// @Param roleId path int true "roleId"
-// @Success 200 {string} string	"{"code": 200, "message": "删除成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "删除失败"}"
-// @Router /api/v1/role/{roleId} [delete]
-func DeleteRole(c *gin.Context) {
-	var Role models.SysRole
-	Role.UpdateBy = tools.GetUserIdStr(c)
-
-	IDS := tools.IdsStrToIdsIntGroup("roleId", c)
-	_, err := Role.BatchDelete(IDS)
-	tools.HasError(err, "删除失败1", -1)
-	var t models.RoleMenu
-	_, err = t.BatchDeleteRoleMenu(IDS)
-	tools.HasError(err, "删除失败1", -1)
-	app.OK(c, "", "删除成功")
-}

apis/system/rolemenu.go

@@ -1,71 +0,0 @@
-package system
-
-import (
-	"fmt"
-	"github.com/gin-gonic/gin"
-	"go-admin/models"
-	"go-admin/tools/app"
-	"net/http"
-)
-
-// @Summary RoleMenu列表数据
-// @Description 获取JSON
-// @Tags 角色菜单
-// @Param RoleId query string false "RoleId"
-// @Success 200 {string} string "{"code": 200, "data": [...]}"
-// @Success 200 {string} string "{"code": -1, "message": "抱歉未找到相关信息"}"
-// @Router /api/v1/rolemenu [get]
-// @Security Bearer
-func GetRoleMenu(c *gin.Context) {
-	var Rm models.RoleMenu
-	err := c.ShouldBind(&Rm)
-	result, err := Rm.Get()
-	var res app.Response
-	if err != nil {
-		res.Msg = "抱歉未找到相关信息"
-		c.JSON(http.StatusOK, res.ReturnError(200))
-		return
-	}
-	res.Data = result
-	c.JSON(http.StatusOK, res.ReturnOK())
-}
-
-type RoleMenuPost struct {
-	RoleId   string
-	RoleMenu []models.RoleMenu
-}
-
-func InsertRoleMenu(c *gin.Context) {
-
-	var res app.Response
-	res.Msg = "添加成功"
-	c.JSON(http.StatusOK, res.ReturnOK())
-	return
-
-}
-
-// @Summary 删除用户菜单数据
-// @Description 删除数据
-// @Tags 角色菜单
-// @Param id path string true "id"
-// @Param menu_id query string false "menu_id"
-// @Success 200 {string} string	"{"code": 200, "message": "删除成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "删除失败"}"
-// @Router /api/v1/rolemenu/{id} [delete]
-func DeleteRoleMenu(c *gin.Context) {
-	var t models.RoleMenu
-	id := c.Param("id")
-	menuId := c.Request.FormValue("menu_id")
-	fmt.Println(menuId)
-	_, err := t.Delete(id, menuId)
-	if err != nil {
-		var res app.Response
-		res.Msg = "删除失败"
-		c.JSON(http.StatusOK, res.ReturnError(200))
-		return
-	}
-	var res app.Response
-	res.Msg = "删除成功"
-	c.JSON(http.StatusOK, res.ReturnOK())
-	return
-}

apis/system/sysuser.go

@@ -1,233 +0,0 @@
-package system
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/gin-gonic/gin/binding"
-	"github.com/google/uuid"
-	"go-admin/global"
-	"go-admin/models"
-	"go-admin/tools"
-	"go-admin/tools/app"
-)
-
-// @Summary 列表用户信息数据
-// @Description 获取JSON
-// @Tags 用户
-// @Param username query string false "username"
-// @Success 200 {string} string "{"code": 200, "data": [...]}"
-// @Success 200 {string} string "{"code": -1, "message": "抱歉未找到相关信息"}"
-// @Router /api/v1/sysUserList [get]
-// @Security Bearer
-func GetSysUserList(c *gin.Context) {
-	var data models.SysUser
-	var err error
-	var pageSize = 10
-	var pageIndex = 1
-
-	size := c.Request.FormValue("pageSize")
-	if size != "" {
-		pageSize = tools.StrToInt(err, size)
-	}
-
-	index := c.Request.FormValue("pageIndex")
-	if index != "" {
-		pageIndex = tools.StrToInt(err, index)
-	}
-
-	data.Username = c.Request.FormValue("username")
-	data.Status = c.Request.FormValue("status")
-	data.Phone = c.Request.FormValue("phone")
-
-	postId := c.Request.FormValue("postId")
-	data.PostId, _ = tools.StringToInt(postId)
-
-	deptId := c.Request.FormValue("deptId")
-	data.DeptId, _ = tools.StringToInt(deptId)
-
-	data.DataScope = tools.GetUserIdStr(c)
-	result, count, err := data.GetPage(pageSize, pageIndex)
-	tools.HasError(err, "", -1)
-
-	app.PageOK(c, result, count, pageIndex, pageSize, "")
-}
-
-// @Summary 获取用户
-// @Description 获取JSON
-// @Tags 用户
-// @Param userId path int true "用户编码"
-// @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/sysUser/{userId} [get]
-// @Security Bearer
-func GetSysUser(c *gin.Context) {
-	var SysUser models.SysUser
-	SysUser.UserId, _ = tools.StringToInt(c.Param("userId"))
-	result, err := SysUser.Get()
-	tools.HasError(err, "抱歉未找到相关信息", -1)
-	var SysRole models.SysRole
-	var Post models.Post
-	roles, err := SysRole.GetList()
-	posts, err := Post.GetList()
-
-	postIds := make([]int, 0)
-	postIds = append(postIds, result.PostId)
-
-	roleIds := make([]int, 0)
-	roleIds = append(roleIds, result.RoleId)
-	app.Custum(c, gin.H{
-		"code":    200,
-		"data":    result,
-		"postIds": postIds,
-		"roleIds": roleIds,
-		"roles":   roles,
-		"posts":   posts,
-	})
-}
-
-// @Summary 获取个人中心用户
-// @Description 获取JSON
-// @Tags 个人中心
-// @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/user/profile [get]
-// @Security Bearer
-func GetSysUserProfile(c *gin.Context) {
-	var SysUser models.SysUser
-	userId := tools.GetUserIdStr(c)
-	SysUser.UserId, _ = tools.StringToInt(userId)
-	result, err := SysUser.Get()
-	tools.HasError(err, "抱歉未找到相关信息", -1)
-	var SysRole models.SysRole
-	var Post models.Post
-	var Dept models.SysDept
-	//获取角色列表
-	roles, err := SysRole.GetList()
-	//获取职位列表
-	posts, err := Post.GetList()
-	//获取部门列表
-	Dept.DeptId = result.DeptId
-	dept, err := Dept.Get()
-
-	postIds := make([]int, 0)
-	postIds = append(postIds, result.PostId)
-
-	roleIds := make([]int, 0)
-	roleIds = append(roleIds, result.RoleId)
-
-	app.Custum(c, gin.H{
-		"code":    200,
-		"data":    result,
-		"postIds": postIds,
-		"roleIds": roleIds,
-		"roles":   roles,
-		"posts":   posts,
-		"dept":    dept,
-	})
-}
-
-// @Summary 获取用户角色和职位
-// @Description 获取JSON
-// @Tags 用户
-// @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/sysUser [get]
-// @Security Bearer
-func GetSysUserInit(c *gin.Context) {
-	var SysRole models.SysRole
-	var Post models.Post
-	roles, err := SysRole.GetList()
-	posts, err := Post.GetList()
-	tools.HasError(err, "抱歉未找到相关信息", -1)
-	mp := make(map[string]interface{}, 2)
-	mp["roles"] = roles
-	mp["posts"] = posts
-	app.OK(c, mp, "")
-}
-
-// @Summary 创建用户
-// @Description 获取JSON
-// @Tags 用户
-// @Accept  application/json
-// @Product application/json
-// @Param data body models.SysUser true "用户数据"
-// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
-// @Router /api/v1/sysUser [post]
-func InsertSysUser(c *gin.Context) {
-	var sysuser models.SysUser
-	err := c.BindWith(&sysuser, binding.JSON)
-	tools.HasError(err, "非法数据格式", 500)
-
-	sysuser.CreateBy = tools.GetUserIdStr(c)
-	id, err := sysuser.Insert()
-	tools.HasError(err, "添加失败", 500)
-	app.OK(c, id, "添加成功")
-}
-
-// @Summary 修改用户数据
-// @Description 获取JSON
-// @Tags 用户
-// @Accept  application/json
-// @Product application/json
-// @Param data body models.SysUser true "body"
-// @Success 200 {string} string	"{"code": 200, "message": "修改成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "修改失败"}"
-// @Router /api/v1/sysuser/{userId} [put]
-func UpdateSysUser(c *gin.Context) {
-	var data models.SysUser
-	err := c.Bind(&data)
-	tools.HasError(err, "数据解析失败", -1)
-	data.UpdateBy = tools.GetUserIdStr(c)
-	result, err := data.Update(data.UserId)
-	tools.HasError(err, "修改失败", 500)
-	app.OK(c, result, "修改成功")
-}
-
-// @Summary 删除用户数据
-// @Description 删除数据
-// @Tags 用户
-// @Param userId path int true "userId"
-// @Success 200 {string} string	"{"code": 200, "message": "删除成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "删除失败"}"
-// @Router /api/v1/sysuser/{userId} [delete]
-func DeleteSysUser(c *gin.Context) {
-	var data models.SysUser
-	data.UpdateBy = tools.GetUserIdStr(c)
-	IDS := tools.IdsStrToIdsIntGroup("userId", c)
-	result, err := data.BatchDelete(IDS)
-	tools.HasError(err, "删除失败", 500)
-	app.OK(c, result, "删除成功")
-}
-
-// @Summary 修改头像
-// @Description 获取JSON
-// @Tags 用户
-// @Accept multipart/form-data
-// @Param file formData file true "file"
-// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
-// @Router /api/v1/user/profileAvatar [post]
-func InsetSysUserAvatar(c *gin.Context) {
-	form, _ := c.MultipartForm()
-	files := form.File["upload[]"]
-	guid := uuid.New().String()
-	filPath := "static/uploadfile/" + guid + ".jpg"
-	for _, file := range files {
-		global.Logger.Debug(file.Filename)
-		// 上传文件至指定目录
-		_ = c.SaveUploadedFile(file, filPath)
-	}
-	sysuser := models.SysUser{}
-	sysuser.UserId = tools.GetUserId(c)
-	sysuser.Avatar = "/" + filPath
-	sysuser.UpdateBy = tools.GetUserIdStr(c)
-	sysuser.Update(sysuser.UserId)
-	app.OK(c, filPath, "修改成功")
-}
-
-func SysUserUpdatePwd(c *gin.Context) {
-	var pwd models.SysUserPwd
-	err := c.Bind(&pwd)
-	tools.HasError(err, "数据解析失败", 500)
-	sysuser := models.SysUser{}
-	sysuser.UserId = tools.GetUserId(c)
-	sysuser.SetPwd(pwd)
-	app.OK(c, "", "密码修改成功")
-}

apis/tools/gen.go

@@ -1,366 +0,0 @@
-package tools
-
-import (
-	"bytes"
-	"github.com/gin-gonic/gin"
-	"go-admin/global"
-	"go-admin/models"
-	"go-admin/models/tools"
-	tools2 "go-admin/tools"
-	"go-admin/tools/app"
-	"go-admin/tools/config"
-	"net/http"
-	"text/template"
-)
-
-func Preview(c *gin.Context) {
-	table := tools.SysTables{}
-	id, err := tools2.StringToInt(c.Param("tableId"))
-	tools2.HasError(err, "", -1)
-	table.TableId = id
-	t1, err := template.ParseFiles("template/model.go.template")
-	tools2.HasError(err, "", -1)
-	t2, err := template.ParseFiles("template/api.go.template")
-	tools2.HasError(err, "", -1)
-	t3, err := template.ParseFiles("template/js.go.template")
-	tools2.HasError(err, "", -1)
-	t4, err := template.ParseFiles("template/vue.go.template")
-	tools2.HasError(err, "", -1)
-	t5, err := template.ParseFiles("template/router.go.template")
-	tools2.HasError(err, "", -1)
-	tab, _ := table.Get()
-	var b1 bytes.Buffer
-	err = t1.Execute(&b1, tab)
-	var b2 bytes.Buffer
-	err = t2.Execute(&b2, tab)
-	var b3 bytes.Buffer
-	err = t3.Execute(&b3, tab)
-	var b4 bytes.Buffer
-	err = t4.Execute(&b4, tab)
-	var b5 bytes.Buffer
-	err = t5.Execute(&b5, tab)
-
-	mp := make(map[string]interface{})
-	mp["template/model.go.template"] = b1.String()
-	mp["template/api.go.template"] = b2.String()
-	mp["template/js.go.template"] = b3.String()
-	mp["template/vue.go.template"] = b4.String()
-	mp["template/router.go.template"] = b5.String()
-	var res app.Response
-	res.Data = mp
-
-	c.JSON(http.StatusOK, res.ReturnOK())
-}
-
-func GenCode(c *gin.Context) {
-	table := tools.SysTables{}
-	id, err := tools2.StringToInt(c.Param("tableId"))
-	tools2.HasError(err, "", -1)
-	table.TableId = id
-	tab, _ := table.Get()
-	ischeckrole := true
-
-	routerfile := "template/routercheckrole.go.template"
-
-	if c.Request.FormValue("ischeckrole") != "" {
-		ischeckrole, err = tools2.StringToBool(c.Request.FormValue("ischeckrole"))
-		if err != nil {
-			ischeckrole = true
-		}
-	}
-
-	oldTest := "// {{认证路由自动补充在此处请勿删除}}"
-	newText := "// {{认证路由自动补充在此处请勿删除}} \r\n register" + tab.ClassName + "Router(v1,authMiddleware)"
-
-	if !ischeckrole {
-		oldTest = "// {{无需认证路由自动补充在此处请勿删除}}"
-		newText = "// {{无需认证路由自动补充在此处请勿删除}} \r\n register" + tab.ClassName + "Router(v1)"
-		routerfile = "template/routernocheckrole.go.template"
-	}
-
-	t1, err := template.ParseFiles("template/model.go.template")
-	tools2.HasError(err, "", -1)
-	t2, err := template.ParseFiles("template/api.go.template")
-	tools2.HasError(err, "", -1)
-	t3, err := template.ParseFiles(routerfile)
-	tools2.HasError(err, "", -1)
-	t4, err := template.ParseFiles("template/js.go.template")
-	tools2.HasError(err, "", -1)
-	t5, err := template.ParseFiles("template/vue.go.template")
-	tools2.HasError(err, "", -1)
-
-	_ = tools2.PathCreate("./apis/" + tab.ModuleName + "/")
-	_ = tools2.PathCreate("./models/")
-	_ = tools2.PathCreate("./router/")
-	_ = tools2.PathCreate(config.GenConfig.FrontPath + "/api/")
-	_ = tools2.PathCreate(config.GenConfig.FrontPath + "/views/" + tab.PackageName)
-
-	var b1 bytes.Buffer
-	err = t1.Execute(&b1, tab)
-	var b2 bytes.Buffer
-	err = t2.Execute(&b2, tab)
-	var b3 bytes.Buffer
-	err = t3.Execute(&b3, tab)
-	var b4 bytes.Buffer
-	err = t4.Execute(&b4, tab)
-	var b5 bytes.Buffer
-	err = t5.Execute(&b5, tab)
-	tools2.FileCreate(b1, "./models/"+tab.PackageName+".go")
-	tools2.FileCreate(b2, "./apis/"+tab.ModuleName+"/"+tab.PackageName+".go")
-	tools2.FileCreate(b3, "./router/"+tab.PackageName+".go")
-	tools2.FileCreate(b4, config.GenConfig.FrontPath+"/api/"+tab.PackageName+".js")
-	tools2.FileCreate(b5, config.GenConfig.FrontPath+"/views/"+tab.PackageName+"/index.vue")
-
-	helper := tools2.ReplaceHelper{
-		Root:    "./router/router.go",
-		OldText: oldTest,
-		NewText: newText,
-	}
-	if helper.OldText == helper.NewText {
-		global.Logger.Println("error !! the NewText isEqual the OldText")
-		return
-	}
-	if err := helper.DoWrok(); err != nil {
-		global.Logger.Print("error:", err.Error())
-
-	} else {
-		global.Logger.Print("done!")
-	}
-
-	app.OK(c, "", "Code generated successfully！")
-}
-
-func GenMenuAndApi(c *gin.Context) {
-
-	table := tools.SysTables{}
-	timeNow := tools2.GetCurrentTime()
-	id, err := tools2.StringToInt(c.Param("tableId"))
-	tools2.HasError(err, "", -1)
-	table.TableId = id
-	tab, _ := table.Get()
-	Mmenu := models.Menu{}
-	Mmenu.MenuName = tab.TBName + "管理"
-	Mmenu.Title = tab.TableComment
-	Mmenu.Icon = "pass"
-	Mmenu.Path = "/" + tab.TBName
-	Mmenu.MenuType = "M"
-	Mmenu.Action = "无"
-	Mmenu.ParentId = 0
-	Mmenu.NoCache = false
-	Mmenu.Component = "Layout"
-	Mmenu.Sort = 0
-	Mmenu.Visible = "0"
-	Mmenu.IsFrame = "0"
-	Mmenu.CreateBy = "1"
-	Mmenu.UpdateBy = "1"
-	Mmenu.CreatedAt = timeNow
-	Mmenu.UpdatedAt = timeNow
-	Mmenu.MenuId, err = Mmenu.Create()
-
-	Cmenu := models.Menu{}
-	Cmenu.MenuName = tab.TBName + "管理"
-	Cmenu.Title = tab.TableComment
-	Cmenu.Icon = "pass"
-	Cmenu.Path = tab.TBName
-	Cmenu.MenuType = "C"
-	Cmenu.Action = "无"
-	Cmenu.Permission = tab.PackageName + ":" + tab.ModuleName + ":list"
-	Cmenu.ParentId = Mmenu.MenuId
-	Cmenu.NoCache = false
-	Cmenu.Component = "/" + tab.ModuleName + "/index"
-	Cmenu.Sort = 0
-	Cmenu.Visible = "0"
-	Cmenu.IsFrame = "0"
-	Cmenu.CreateBy = "1"
-	Cmenu.UpdateBy = "1"
-	Cmenu.CreatedAt = timeNow
-	Cmenu.UpdatedAt = timeNow
-	Cmenu.MenuId, err = Cmenu.Create()
-
-	MList := models.Menu{}
-	MList.MenuName = tab.TBName
-	MList.Title = "分页获取" + tab.TableComment
-	MList.Icon = "pass"
-	MList.Path = tab.TBName
-	MList.MenuType = "F"
-	MList.Action = "无"
-	MList.Permission = tab.PackageName + ":" + tab.ModuleName + ":query"
-	MList.ParentId = Cmenu.MenuId
-	MList.NoCache = false
-	MList.Sort = 0
-	MList.Visible = "0"
-	MList.IsFrame = "0"
-	MList.CreateBy = "1"
-	MList.UpdateBy = "1"
-	MList.CreatedAt = timeNow
-	MList.UpdatedAt = timeNow
-	MList.MenuId, err = MList.Create()
-
-	MCreate := models.Menu{}
-	MCreate.MenuName = tab.TBName
-	MCreate.Title = "创建" + tab.TableComment
-	MCreate.Icon = "pass"
-	MCreate.Path = tab.TBName
-	MCreate.MenuType = "F"
-	MCreate.Action = "无"
-	MCreate.Permission = tab.PackageName + ":" + tab.ModuleName + ":add"
-	MCreate.ParentId = Cmenu.MenuId
-	MCreate.NoCache = false
-	MCreate.Sort = 0
-	MCreate.Visible = "0"
-	MCreate.IsFrame = "0"
-	MCreate.CreateBy = "1"
-	MCreate.UpdateBy = "1"
-	MCreate.CreatedAt = timeNow
-	MCreate.UpdatedAt = timeNow
-	MCreate.MenuId, err = MCreate.Create()
-
-	MUpdate := models.Menu{}
-	MUpdate.MenuName = tab.TBName
-	MUpdate.Title = "修改" + tab.TableComment
-	MUpdate.Icon = "pass"
-	MUpdate.Path = tab.TBName
-	MUpdate.MenuType = "F"
-	MUpdate.Action = "无"
-	MUpdate.Permission = tab.PackageName + ":" + tab.ModuleName + ":edit"
-	MUpdate.ParentId = Cmenu.MenuId
-	MUpdate.NoCache = false
-	MUpdate.Sort = 0
-	MUpdate.Visible = "0"
-	MUpdate.IsFrame = "0"
-	MUpdate.CreateBy = "1"
-	MUpdate.UpdateBy = "1"
-	MUpdate.CreatedAt = timeNow
-	MUpdate.UpdatedAt = timeNow
-	MUpdate.MenuId, err = MUpdate.Create()
-
-	MDelete := models.Menu{}
-	MDelete.MenuName = tab.TBName
-	MDelete.Title = "删除" + tab.TableComment
-	MDelete.Icon = "pass"
-	MDelete.Path = tab.TBName
-	MDelete.MenuType = "F"
-	MDelete.Action = "无"
-	MDelete.Permission = tab.PackageName + ":" + tab.ModuleName + ":remove"
-	MDelete.ParentId = Cmenu.MenuId
-	MDelete.NoCache = false
-	MDelete.Sort = 0
-	MDelete.Visible = "0"
-	MDelete.IsFrame = "0"
-	MDelete.CreateBy = "1"
-	MDelete.UpdateBy = "1"
-	MDelete.CreatedAt = timeNow
-	MDelete.UpdatedAt = timeNow
-	MDelete.MenuId, err = MDelete.Create()
-
-	var InterfaceId = 63
-	Amenu := models.Menu{}
-	Amenu.MenuName = tab.TBName
-	Amenu.Title = tab.TableComment
-	Amenu.Icon = "bug"
-	Amenu.Path = tab.TBName
-	Amenu.MenuType = "M"
-	Amenu.Action = "无"
-	Amenu.ParentId = InterfaceId
-	Amenu.NoCache = false
-	Amenu.Sort = 0
-	Amenu.Visible = "1"
-	Amenu.IsFrame = "0"
-	Amenu.CreateBy = "1"
-	Amenu.UpdateBy = "1"
-	Amenu.CreatedAt = timeNow
-	Amenu.UpdatedAt = timeNow
-	Amenu.MenuId, err = Amenu.Create()
-
-	AList := models.Menu{}
-	AList.MenuName = tab.TBName
-	AList.Title = "分页获取" + tab.TableComment
-	AList.Icon = "bug"
-	AList.Path = "/api/v1/" + tab.ModuleName + "List"
-	AList.MenuType = "A"
-	AList.Action = "GET"
-	AList.ParentId = Amenu.MenuId
-	AList.NoCache = false
-	AList.Sort = 0
-	AList.Visible = "1"
-	AList.IsFrame = "0"
-	AList.CreateBy = "1"
-	AList.UpdateBy = "1"
-	AList.CreatedAt = timeNow
-	AList.UpdatedAt = timeNow
-	AList.MenuId, err = AList.Create()
-
-	AGet := models.Menu{}
-	AGet.MenuName = tab.TBName
-	AGet.Title = "根据id获取" + tab.TableComment
-	AGet.Icon = "bug"
-	AGet.Path = "/api/v1/" + tab.ModuleName + "/:id"
-	AGet.MenuType = "A"
-	AGet.Action = "GET"
-	AGet.ParentId = Amenu.MenuId
-	AGet.NoCache = false
-	AGet.Sort = 0
-	AGet.Visible = "1"
-	AGet.IsFrame = "0"
-	AGet.CreateBy = "1"
-	AGet.UpdateBy = "1"
-	AGet.CreatedAt = timeNow
-	AGet.UpdatedAt = timeNow
-	AGet.MenuId, err = AGet.Create()
-
-	ACreate := models.Menu{}
-	ACreate.MenuName = tab.TBName
-	ACreate.Title = "创建" + tab.TableComment
-	ACreate.Icon = "bug"
-	ACreate.Path = "/api/v1/" + tab.ModuleName
-	ACreate.MenuType = "A"
-	ACreate.Action = "POST"
-	ACreate.ParentId = Amenu.MenuId
-	ACreate.NoCache = false
-	ACreate.Sort = 0
-	ACreate.Visible = "1"
-	ACreate.IsFrame = "0"
-	ACreate.CreateBy = "1"
-	ACreate.UpdateBy = "1"
-	ACreate.CreatedAt = timeNow
-	ACreate.UpdatedAt = timeNow
-	ACreate.MenuId, err = ACreate.Create()
-
-	AUpdate := models.Menu{}
-	AUpdate.MenuName = tab.TBName
-	AUpdate.Title = "修改" + tab.TableComment
-	AUpdate.Icon = "bug"
-	AUpdate.Path = "/api/v1/" + tab.ModuleName
-	AUpdate.MenuType = "A"
-	AUpdate.Action = "PUT"
-	AUpdate.ParentId = Amenu.MenuId
-	AUpdate.NoCache = false
-	AUpdate.Sort = 0
-	AUpdate.Visible = "1"
-	AUpdate.IsFrame = "0"
-	AUpdate.CreateBy = "1"
-	AUpdate.UpdateBy = "1"
-	AUpdate.CreatedAt = timeNow
-	AUpdate.UpdatedAt = timeNow
-	AUpdate.MenuId, err = AUpdate.Create()
-
-	ADelete := models.Menu{}
-	ADelete.MenuName = tab.TBName
-	ADelete.Title = "删除" + tab.TableComment
-	ADelete.Icon = "bug"
-	ADelete.Path = "/api/v1/" + tab.ModuleName + "/:id"
-	ADelete.MenuType = "A"
-	ADelete.Action = "DELETE"
-	ADelete.ParentId = Amenu.MenuId
-	ADelete.NoCache = false
-	ADelete.Sort = 0
-	ADelete.Visible = "1"
-	ADelete.IsFrame = "0"
-	ADelete.CreateBy = "1"
-	ADelete.UpdateBy = "1"
-	ADelete.CreatedAt = timeNow
-	ADelete.UpdatedAt = timeNow
-	ADelete.MenuId, err = ADelete.Create()
-
-	app.OK(c, "", "数据生成成功！")
-}

app/admin/apis/monitor/server.go

@@ -1,12 +1,14 @@
 package monitor
 
 import (
+	"runtime"
+
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
 	"github.com/shirou/gopsutil/cpu"
 	"github.com/shirou/gopsutil/disk"
 	"github.com/shirou/gopsutil/mem"
-	"go-admin/tools/app"
-	"runtime"
 )
 
 const (
@@ -16,6 +18,11 @@ const (
 	GB = 1024 * MB
 )
 
+// @Summary 系统信息
+// @Description 获取JSON
+// @Tags 系统信息
+// @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/settings/serverInfo [get]
 func ServerInfo(c *gin.Context) {
 
 	osDic := make(map[string]interface{}, 0)
@@ -25,6 +32,8 @@ func ServerInfo(c *gin.Context) {
 	osDic["compiler"] = runtime.Compiler
 	osDic["version"] = runtime.Version()
 	osDic["numGoroutine"] = runtime.NumGoroutine()
+	osDic["ip"] = pkg.GetLocaHonst()
+	osDic["projectDir"] = pkg.GetCurrentPath()
 
 	dis, _ := disk.Usage("/")
 	diskTotalGB := int(dis.Total) / GB
@@ -45,6 +54,9 @@ func ServerInfo(c *gin.Context) {
 	memDic["usage"] = memUsedPercent
 
 	cpuDic := make(map[string]interface{}, 0)
+	cpuDic["cpuInfo"], _ = cpu.Info()
+	percent, _ := cpu.Percent(0, false)
+	cpuDic["Percent"] = pkg.Round(percent[0], 2)
 	cpuDic["cpuNum"], _ = cpu.Counts(false)
 
 	app.Custum(c, gin.H{

app/admin/apis/public/file.go

@@ -0,0 +1,176 @@
+package public
+
+import (
+	"encoding/base64"
+	"errors"
+	"fmt"
+	"io/ioutil"
+	"strings"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/utils"
+	"github.com/google/uuid"
+
+	"go-admin/common/file_store"
+)
+
+type FileResponse struct {
+	Size     int64  `json:"size"`
+	Path     string `json:"path"`
+	FullPath string `json:"full_path"`
+	Name     string `json:"name"`
+	Type     string `json:"type"`
+}
+
+// @Summary 上传图片
+// @Description 获取JSON
+// @Tags 公共接口
+// @Accept multipart/form-data
+// @Param type query string true "type" (1：单图，2：多图, 3：base64图片)
+// @Param file formData file true "file"
+// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
+// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
+// @Router /api/v1/public/uploadFile [post]
+func UploadFile(c *gin.Context) {
+	tag, _ := c.GetPostForm("type")
+	urlPerfix := fmt.Sprintf("http://%s/", c.Request.Host)
+	var fileResponse FileResponse
+	if tag == "" {
+		app.Error(c, 200, errors.New(""), "缺少标识")
+		return
+	} else {
+		switch tag {
+		case "1": // 单图
+			var done bool
+			fileResponse, done = singleFile(c, fileResponse, urlPerfix)
+			if done {
+				return
+			}
+			app.OK(c, fileResponse, "上传成功")
+			return
+		case "2": // 多图
+			multipartFile := multipleFile(c, urlPerfix)
+			app.OK(c, multipartFile, "上传成功")
+			return
+		case "3": // base64
+			fileResponse = baseImg(c, fileResponse, urlPerfix)
+			app.OK(c, fileResponse, "上传成功")
+		}
+	}
+}
+
+func baseImg(c *gin.Context, fileResponse FileResponse, urlPerfix string) FileResponse {
+	files, _ := c.GetPostForm("file")
+	file2list := strings.Split(files, ",")
+	ddd, _ := base64.StdEncoding.DecodeString(file2list[1])
+	guid := uuid.New().String()
+	fileName := guid + ".jpg"
+	base64File := "static/uploadfile/" + fileName
+	_ = ioutil.WriteFile(base64File, ddd, 0666)
+	typeStr := strings.Replace(strings.Replace(file2list[0], "data:", "", -1), ";base64", "", -1)
+	fileResponse = FileResponse{
+		Size:     pkg.GetFileSize(base64File),
+		Path:     base64File,
+		FullPath: urlPerfix + base64File,
+		Name:     "",
+		Type:     typeStr,
+	}
+	source, _ := c.GetPostForm("source")
+	err := thirdUpload(source, fileName, base64File)
+	if err != nil {
+		app.Error(c, 200, errors.New(""), "上传第三方失败")
+		return fileResponse
+	}
+	if source != "1" {
+		fileResponse.Path = "https://youshikeji.oss-cn-shanghai.aliyuncs.com/img/" + fileName
+		fileResponse.FullPath = "https://youshikeji.oss-cn-shanghai.aliyuncs.com/img/" + fileName
+	}
+	return fileResponse
+}
+
+func multipleFile(c *gin.Context, urlPerfix string) []FileResponse {
+	files := c.Request.MultipartForm.File["file"]
+	source, _ := c.GetPostForm("source")
+	var multipartFile []FileResponse
+	for _, f := range files {
+		guid := uuid.New().String()
+		fileName := guid + utils.GetExt(f.Filename)
+		multipartFileName := "static/uploadfile/" + fileName
+		e := c.SaveUploadedFile(f, multipartFileName)
+		fileType, _ := utils.GetType(multipartFileName)
+		if e == nil {
+			err := thirdUpload(source, fileName, multipartFileName)
+			if err != nil {
+				app.Error(c, 200, errors.New(""), "上传第三方失败")
+			} else {
+				fileResponse := FileResponse{
+					Size:     pkg.GetFileSize(multipartFileName),
+					Path:     multipartFileName,
+					FullPath: urlPerfix + multipartFileName,
+					Name:     f.Filename,
+					Type:     fileType,
+				}
+				if source != "1" {
+					fileResponse.Path = "https://youshikeji.oss-cn-shanghai.aliyuncs.com/img/" + fileName
+					fileResponse.FullPath = "https://youshikeji.oss-cn-shanghai.aliyuncs.com/img/" + fileName
+				}
+				multipartFile = append(multipartFile, fileResponse)
+			}
+		}
+	}
+	return multipartFile
+}
+
+func singleFile(c *gin.Context, fileResponse FileResponse, urlPerfix string) (FileResponse, bool) {
+	files, err := c.FormFile("file")
+
+	if err != nil {
+		app.Error(c, 200, errors.New(""), "图片不能为空")
+		return FileResponse{}, true
+	}
+	// 上传文件至指定目录
+	guid := uuid.New().String()
+
+	fileName := guid + utils.GetExt(files.Filename)
+	singleFile := "static/uploadfile/" + fileName
+	_ = c.SaveUploadedFile(files, singleFile)
+	fileType, _ := utils.GetType(singleFile)
+	fileResponse = FileResponse{
+		Size:     pkg.GetFileSize(singleFile),
+		Path:     singleFile,
+		FullPath: urlPerfix + singleFile,
+		Name:     files.Filename,
+		Type:     fileType,
+	}
+	source, _ := c.GetPostForm("source")
+	err = thirdUpload(source, fileName, singleFile)
+	if err != nil {
+		app.Error(c, 200, errors.New(""), "上传第三方失败")
+		return FileResponse{}, true
+	}
+	fileResponse.Path = "https://youshikeji.oss-cn-shanghai.aliyuncs.com/img/" + fileName
+	fileResponse.FullPath = "https://youshikeji.oss-cn-shanghai.aliyuncs.com/img/" + fileName
+	return fileResponse, false
+}
+
+func thirdUpload(source string, name string, path string) error {
+	switch source {
+	case "2":
+		return ossUpload("img/"+name, path)
+	case "3":
+		return qiniuUpload("img/"+name, path)
+	}
+	return nil
+}
+
+func ossUpload(name string, path string) error {
+	oss := file_store.ALiYunOSS{}
+	return oss.UpLoad(name, path)
+}
+
+func qiniuUpload(name string, path string) error {
+	oss := file_store.ALiYunOSS{}
+	return oss.UpLoad(name, path)
+}

app/admin/apis/sys_china_area_data/sys_china_area_data.go

@@ -0,0 +1,190 @@
+package sys_china_area_data
+
+import (
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
+
+	"go-admin/app/admin/models"
+	"go-admin/app/admin/service"
+	"go-admin/app/admin/service/dto"
+	"go-admin/common/actions"
+	"go-admin/common/apis"
+)
+
+type SysChinaAreaData struct {
+	apis.Api
+}
+
+func (e *SysChinaAreaData) GetSysChinaAreaDataList(c *gin.Context) {
+	log := e.GetLogger(c)
+	d := new(dto.SysChinaAreaDataSearch)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//查询列表
+	err = d.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+
+	//数据权限检查
+	p := actions.GetPermissionFromContext(c)
+
+	list := make([]models.SysChinaAreaData, 0)
+	var count int64
+	serviceStudent := service.SysChinaAreaData{}
+	serviceStudent.Log = log
+	serviceStudent.Orm = db
+	err = serviceStudent.GetSysChinaAreaDataPage(d, p, &list, &count)
+	if err != nil {
+		e.Error(c, http.StatusInternalServerError, err, "查询失败")
+		return
+	}
+
+	e.PageOK(c, list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功")
+}
+
+func (e *SysChinaAreaData) GetSysChinaAreaData(c *gin.Context) {
+	log := e.GetLogger(c)
+	control := new(dto.SysChinaAreaDataById)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//查看详情
+	err = control.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	var object models.SysChinaAreaData
+
+	//数据权限检查
+	p := actions.GetPermissionFromContext(c)
+
+	serviceSysChinaAreaData := service.SysChinaAreaData{}
+	serviceSysChinaAreaData.Log = log
+	serviceSysChinaAreaData.Orm = db
+	err = serviceSysChinaAreaData.GetSysChinaAreaData(control, p, &object)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
+		return
+	}
+
+	e.OK(c, object, "查看成功")
+}
+
+func (e *SysChinaAreaData) InsertSysChinaAreaData(c *gin.Context) {
+	log := e.GetLogger(c)
+	control := new(dto.SysChinaAreaDataControl)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//新增操作
+	err = control.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	object, err := control.Generate()
+	if err != nil {
+		e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
+		return
+	}
+	// 设置创建人
+	object.SetCreateBy(user.GetUserId(c))
+
+	serviceSysChinaAreaData := service.SysChinaAreaData{}
+	serviceSysChinaAreaData.Orm = db
+	serviceSysChinaAreaData.Log = log
+	err = serviceSysChinaAreaData.InsertSysChinaAreaData(object)
+	if err != nil {
+		log.Error(err)
+		e.Error(c, http.StatusInternalServerError, err, "创建失败")
+		return
+	}
+
+	e.OK(c, object.GetId(), "创建成功")
+}
+
+func (e *SysChinaAreaData) UpdateSysChinaAreaData(c *gin.Context) {
+	log := e.GetLogger(c)
+	control := new(dto.SysChinaAreaDataControl)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//更新操作
+	err = control.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	object, err := control.Generate()
+	if err != nil {
+		e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
+		return
+	}
+	object.SetUpdateBy(user.GetUserId(c))
+
+	//数据权限检查
+	p := actions.GetPermissionFromContext(c)
+
+	serviceSysChinaAreaData := service.SysChinaAreaData{}
+	serviceSysChinaAreaData.Orm = db
+	serviceSysChinaAreaData.Log = log
+	err = serviceSysChinaAreaData.UpdateSysChinaAreaData(object, p)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+	e.OK(c, object.GetId(), "更新成功")
+}
+
+func (e *SysChinaAreaData) DeleteSysChinaAreaData(c *gin.Context) {
+	log := e.GetLogger(c)
+	control := new(dto.SysChinaAreaDataById)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//删除操作
+	err = control.Bind(c)
+	if err != nil {
+		log.Errorf("Bind error: %s", err)
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+
+	// 设置编辑人
+	control.SetUpdateBy(user.GetUserId(c))
+
+	// 数据权限检查
+	p := actions.GetPermissionFromContext(c)
+
+	serviceSysChinaAreaData := service.SysChinaAreaData{}
+	serviceSysChinaAreaData.Orm = db
+	serviceSysChinaAreaData.Log = log
+	err = serviceSysChinaAreaData.RemoveSysChinaAreaData(control, p)
+	if err != nil {
+		log.Errorf("RemoveSysChinaAreaData error, %s", err)
+		e.Error(c, http.StatusInternalServerError, err, "删除失败")
+		return
+	}
+	e.OK(c, control.GetId(), "删除成功")
+}

app/admin/apis/sys_content/sys_content.go

@@ -0,0 +1,84 @@
+package sys_content
+
+//import (
+//	"github.com/gin-gonic/gin"
+//	"github.com/gin-gonic/gin/binding"
+//
+//	"go-admin/app/admin/models"
+//	"go-admin/tools"
+//	"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
+//	"github.com/go-admin-team/go-admin-core/sdk/pkg/response/msg"
+//)
+//
+//func GetSysContentList(c *gin.Context) {
+//	var data models.SysContent
+//	var err error
+//	var pageSize = 10
+//	var pageIndex = 1
+//
+//	if size := c.Request.FormValue("pageSize"); size != "" {
+//		pageSize, err = tools.StringToInt(size)
+//	}
+//	if index := c.Request.FormValue("pageIndex"); index != "" {
+//		pageIndex, err = tools.StringToInt(index)
+//	}
+//
+//	data.CateId = c.Request.FormValue("cateId")
+//	data.Name = c.Request.FormValue("name")
+//	data.Status = c.Request.FormValue("status")
+//
+//	data.DataScope = tools.GetUserIdStr(c)
+//	result, count, err := data.GetPage(pageSize, pageIndex)
+//	tools.HasError(err, "", -1)
+//
+//	app.PageOK(c, result, count, pageIndex, pageSize, "")
+//}
+//
+//func GetSysContent(c *gin.Context) {
+//	var data models.SysContent
+//	data.Id, _ = tools.StringToInt(c.Param("id"))
+//	result, err := data.Get()
+//	tools.HasError(err, "抱歉未找到相关信息", -1)
+//
+//	app.OK(c, result, "")
+//}
+//
+//// @Summary 添加内容管理
+//// @Description 获取JSON
+//// @Tags 内容管理
+//// @Accept  application/json
+//// @Product application/json
+//// @Param data body models.SysContent true "data"
+//// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
+//// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
+//// @Router /api/v1/syscontent [post]
+//func InsertSysContent(c *gin.Context) {
+//	var data models.SysContent
+//	err := c.ShouldBindJSON(&data)
+//	data.CreateBy = tools.GetUserIdStr(c)
+//	tools.HasError(err, "", 500)
+//	result, err := data.Create()
+//	tools.HasError(err, "", -1)
+//	app.OK(c, result, "")
+//}
+//
+//func UpdateSysContent(c *gin.Context) {
+//	var data models.SysContent
+//	err := c.BindWith(&data, binding.JSON)
+//	tools.HasError(err, "数据解析失败", -1)
+//	data.UpdateBy = tools.GetUserIdStr(c)
+//	result, err := data.Update(data.Id)
+//	tools.HasError(err, "", -1)
+//
+//	app.OK(c, result, "")
+//}
+//
+//func DeleteSysContent(c *gin.Context) {
+//	var data models.SysContent
+//	data.UpdateBy = tools.GetUserIdStr(c)
+//
+//	IDS := tools.IdsStrToIdsIntGroup("id", c)
+//	_, err := data.BatchDelete(IDS)
+//	tools.HasError(err, msg.DeletedFail, 500)
+//	app.OK(c, nil, msg.DeletedSuccess)
+//}

app/admin/apis/sys_file/sys_file_dir.go

@@ -0,0 +1,193 @@
+package sys_file
+
+import (
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
+
+	"go-admin/app/admin/models"
+	"go-admin/app/admin/service"
+	"go-admin/app/admin/service/dto"
+	"go-admin/common/actions"
+	"go-admin/common/apis"
+)
+
+type SysFileDir struct {
+	apis.Api
+}
+
+func (e *SysFileDir) GetSysFileDirList(c *gin.Context) {
+	log := e.GetLogger(c)
+	search := new(dto.SysFileDirSearch)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	err = c.ShouldBind(search)
+	if err != nil {
+		log.Debugf("ShouldBind error: %s", err.Error())
+	}
+
+	var list *[]models.SysFileDirL
+	serviceStudent := service.SysFileDir{}
+	serviceStudent.Log = log
+	serviceStudent.Orm = db
+	list, err = serviceStudent.SetSysFileDir(search)
+	if err != nil {
+		log.Errorf("SetSysFileDir error, %s", err)
+		e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
+		return
+	}
+
+	e.OK(c, list, "查询成功")
+}
+
+func (e *SysFileDir) GetSysFileDir(c *gin.Context) {
+	control := new(dto.SysFileDirById)
+	log := e.GetLogger(c)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//查看详情
+	err = c.ShouldBindUri(control)
+	if err != nil {
+		log.Warnf("ShouldBindUri error: %s", err.Error())
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+	}
+
+	var object models.SysFileDir
+
+	serviceSysFileDir := service.SysFileDir{}
+	serviceSysFileDir.Log = log
+	serviceSysFileDir.Orm = db
+	err = serviceSysFileDir.GetSysFileDir(control, &object)
+	if err != nil {
+		log.Errorf("GetSysFileDir error, %s", err)
+		e.Error(c, http.StatusInternalServerError, err, "查询失败")
+		return
+	}
+
+	e.OK(c, object, "查看成功")
+}
+
+func (e *SysFileDir) InsertSysFileDir(c *gin.Context) {
+	control := new(dto.SysFileDirControl)
+	log := e.GetLogger(c)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//新增操作
+	err = c.ShouldBindUri(control)
+	if err != nil {
+		log.Warnf("ShouldBindUri error: %s", err.Error())
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	err = c.ShouldBind(control)
+	if err != nil {
+		log.Warnf("ShouldBind error: %s", err.Error())
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	// 设置创建人
+	control.CreateBy = user.GetUserId(c)
+
+	serviceSysFileDir := service.SysFileDir{}
+	serviceSysFileDir.Orm = db
+	serviceSysFileDir.Log = log
+	err = serviceSysFileDir.InsertSysFileDir(control)
+	if err != nil {
+		log.Errorf("InsertSysFileDir error, %s", err)
+		e.Error(c, http.StatusInternalServerError, err, "创建失败")
+		return
+	}
+
+	e.OK(c, control.ID, "创建成功")
+}
+
+func (e *SysFileDir) UpdateSysFileDir(c *gin.Context) {
+	control := new(dto.SysFileDirControl)
+	log := e.GetLogger(c)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	err = c.ShouldBindUri(control)
+	if err != nil {
+		log.Warnf("ShouldBindUri error: %s", err.Error())
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+	}
+	err = c.ShouldBind(control)
+	if err != nil {
+		log.Warnf("ShouldBind error: %#v", err.Error())
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+	}
+	// 设置创建人
+	control.UpdateBy = user.GetUserId(c)
+
+	//数据权限检查
+	p := actions.GetPermissionFromContext(c)
+
+	serviceSysFileDir := service.SysFileDir{}
+	serviceSysFileDir.Orm = db
+	serviceSysFileDir.Log = log
+	err = serviceSysFileDir.UpdateSysFileDir(control, p)
+	if err != nil {
+		log.Errorf("UpdateSysFileDir error, %s", err)
+		e.Error(c, http.StatusInternalServerError, err, "更新失败")
+		return
+	}
+	e.OK(c, control.ID, "更新成功")
+}
+
+func (e *SysFileDir) DeleteSysFileDir(c *gin.Context) {
+	control := new(dto.SysFileDirById)
+	log := e.GetLogger(c)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	msgID := pkg.GenerateMsgIDFromContext(c)
+	//删除操作
+	err = c.ShouldBindUri(control)
+	if err != nil {
+		log.Warnf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+	}
+	err = c.ShouldBind(control)
+	if err != nil {
+		log.Warnf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+	}
+
+	// 设置编辑人
+	control.UpdateBy = user.GetUserId(c)
+
+	// 数据权限检查
+	p := actions.GetPermissionFromContext(c)
+
+	serviceSysFileDir := service.SysFileDir{}
+	serviceSysFileDir.Orm = db
+	serviceSysFileDir.MsgID = msgID
+	err = serviceSysFileDir.RemoveSysFileDir(control, p)
+	if err != nil {
+		log.Errorf("RemoveSysFileDir error, %s", err)
+		e.Error(c, http.StatusInternalServerError, err, "删除失败")
+		return
+	}
+	e.OK(c, control.Id, "删除成功")
+}

app/admin/apis/sys_file/sys_file_info.go

@@ -0,0 +1,204 @@
+package sys_file
+
+import (
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
+
+	"go-admin/app/admin/models"
+	"go-admin/app/admin/service"
+	"go-admin/app/admin/service/dto"
+	"go-admin/common/actions"
+	"go-admin/common/apis"
+)
+
+type SysFileInfo struct {
+	apis.Api
+}
+
+func (e *SysFileInfo) GetSysFileInfoList(c *gin.Context) {
+	log := e.GetLogger(c)
+	search := new(dto.SysFileInfoSearch)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+	err = c.ShouldBind(search)
+	if err != nil {
+		log.Warnf("参数验证错误, error: %s", err)
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+
+	//数据权限检查
+	p := actions.GetPermissionFromContext(c)
+
+	list := make([]models.SysFileInfo, 0)
+	var count int64
+	serviceStudent := service.SysFileInfo{}
+	serviceStudent.Log = log
+	serviceStudent.Orm = db
+	err = serviceStudent.GetSysFileInfoPage(search, p, &list, &count)
+	if err != nil {
+		log.Errorf("GetSysFileInfoPage error, %s", err.Error())
+		e.Error(c, http.StatusInternalServerError, err, "查询失败")
+		return
+	}
+
+	e.PageOK(c, list, int(count), search.PageIndex, search.PageSize, "查询成功")
+}
+
+func (e *SysFileInfo) GetSysFileInfo(c *gin.Context) {
+	control := new(dto.SysFileInfoById)
+	log := e.GetLogger(c)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//查看详情
+	err = c.ShouldBindUri(control)
+	if err != nil {
+		log.Warnf("参数验证错误, error:%s", err)
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+
+	var object models.SysFileInfo
+
+	//数据权限检查
+	p := actions.GetPermissionFromContext(c)
+
+	serviceSysFileInfo := service.SysFileInfo{}
+	serviceSysFileInfo.Log = log
+	serviceSysFileInfo.Orm = db
+	err = serviceSysFileInfo.GetSysFileInfo(control, p, &object)
+	if err != nil {
+		log.Errorf("GetSysFileInfo error, %s", err.Error())
+		e.Error(c, http.StatusInternalServerError, err, "查询失败")
+		return
+	}
+
+	e.OK(c, object, "查看成功")
+}
+
+func (e *SysFileInfo) InsertSysFileInfo(c *gin.Context) {
+	control := new(dto.SysFileInfoControl)
+	log := e.GetLogger(c)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//新增操作
+	err = c.ShouldBindUri(control)
+	if err != nil {
+		log.Warnf("参数验证错误, error: %s", err)
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	err = c.ShouldBind(control)
+	if err != nil {
+		log.Warnf("参数验证错误, error: %s", err)
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	// 设置创建人
+	control.CreateBy = user.GetUserId(c)
+
+	serviceSysFileInfo := service.SysFileInfo{}
+	serviceSysFileInfo.Orm = db
+	serviceSysFileInfo.Log = log
+	err = serviceSysFileInfo.InsertSysFileInfo(control)
+	if err != nil {
+		log.Errorf("InsertSysFileInfo error: %s", err)
+		e.Error(c, http.StatusInternalServerError, err, "创建失败")
+		return
+	}
+
+	e.OK(c, control.ID, "创建成功")
+}
+
+func (e *SysFileInfo) UpdateSysFileInfo(c *gin.Context) {
+	control := new(dto.SysFileInfoControl)
+	log := e.GetLogger(c)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	err = c.ShouldBindUri(control)
+	if err != nil {
+		log.Warnf("参数验证错误, error: %s", err)
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	err = c.ShouldBind(control)
+	if err != nil {
+		log.Warnf("参数验证错误, error:%s", err)
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	// 设置创建人
+	control.UpdateBy = user.GetUserId(c)
+
+	//数据权限检查
+	p := actions.GetPermissionFromContext(c)
+
+	serviceSysFileInfo := service.SysFileInfo{}
+	serviceSysFileInfo.Orm = db
+	serviceSysFileInfo.Log = log
+	err = serviceSysFileInfo.UpdateSysFileInfo(control, p)
+	if err != nil {
+		log.Errorf("UpdateSysFileInfo error: %s", err)
+		e.Error(c, http.StatusInternalServerError, err, "创建失败")
+		return
+	}
+	e.OK(c, control.ID, "更新成功")
+}
+
+func (e *SysFileInfo) DeleteSysFileInfo(c *gin.Context) {
+	control := new(dto.SysFileInfoById)
+	log := e.GetLogger(c)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//删除操作
+	err = c.ShouldBindUri(control)
+	if err != nil {
+		log.Warnf("参数验证错误, error: %s", err)
+		e.Error(c, 422, err, "参数验证失败")
+		return
+	}
+	err = c.ShouldBind(control)
+	if err != nil {
+		log.Warnf("参数验证错误, error: %s", err)
+		e.Error(c, 422, err, "参数验证失败")
+		return
+	}
+
+	// 设置编辑人
+	control.UpdateBy = user.GetUserId(c)
+
+	// 数据权限检查
+	p := actions.GetPermissionFromContext(c)
+
+	serviceSysFileInfo := service.SysFileInfo{}
+	serviceSysFileInfo.Orm = db
+	serviceSysFileInfo.Log = log
+	err = serviceSysFileInfo.RemoveSysFileInfo(control, p)
+	if err != nil {
+		log.Errorf("RemoveSysFileInfo error: %s", err)
+		e.Error(c, http.StatusInternalServerError, err, "创建失败")
+		return
+	}
+	e.OK(c, control.Id, "删除成功")
+}

app/admin/apis/sys_job/sys_job.go

@@ -0,0 +1,73 @@
+package sys_job
+
+import (
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
+
+	"go-admin/app/admin/service"
+	"go-admin/common/apis"
+	"go-admin/common/dto"
+)
+
+type SysJob struct {
+	apis.Api
+}
+
+// RemoveJobForService 调用service实现
+func (e *SysJob) RemoveJobForService(c *gin.Context) {
+	log := e.GetLogger(c)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+	var v dto.GeneralDelDto
+	err = c.BindUri(&v)
+	if err != nil {
+		log.Warnf("参数验证错误, error: %s", err)
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	s := service.SysJob{}
+	s.Log = log
+	s.Orm = db
+	s.Cron = sdk.Runtime.GetCrontabKey(c.Request.Host)
+	err = s.RemoveJob(&v)
+	if err != nil {
+		log.Errorf("RemoveJob error, %s", err.Error())
+		e.Error(c, http.StatusInternalServerError, err, "")
+		return
+	}
+	app.OK(c, nil, s.Msg)
+}
+
+// StartJobForService 启动job service实现
+func (e *SysJob) StartJobForService(c *gin.Context) {
+	log := e.GetLogger(c)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+	var v dto.GeneralGetDto
+	err = c.BindUri(&v)
+	if err != nil {
+		log.Warnf("参数验证错误, error: %s", err)
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	s := service.SysJob{}
+	s.Orm = db
+	s.Log = log
+	s.Cron = sdk.Runtime.GetCrontabKey(c.Request.Host)
+	err = s.StartJob(&v)
+	if err != nil {
+		log.Errorf("GetCrontabKey error, %s", err.Error())
+		e.Error(c, http.StatusInternalServerError, err, "")
+		return
+	}
+	app.OK(c, nil, s.Msg)
+}

app/admin/apis/sys_user/sys_user.go

@@ -0,0 +1,466 @@
+package sys_user
+
+import (
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
+	"github.com/google/uuid"
+
+	"go-admin/app/admin/models"
+	"go-admin/app/admin/models/system"
+	"go-admin/app/admin/service"
+	"go-admin/app/admin/service/dto"
+	"go-admin/common/actions"
+	"go-admin/common/apis"
+	common "go-admin/common/models"
+)
+
+type SysUser struct {
+	apis.Api
+}
+
+// @Summary 列表用户信息数据
+// @Description 获取JSON
+// @Tags 用户
+// @Param username query string false "username"
+// @Success 200 {string} string "{"code": 200, "data": [...]}"
+// @Success 200 {string} string "{"code": -1, "message": "抱歉未找到相关信息"}"
+// @Router /api/v1/sysUser [get]
+// @Security Bearer
+func (e *SysUser) GetSysUserList(c *gin.Context) {
+	log := e.GetLogger(c)
+	d := new(dto.SysUserSearch)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	req := d.Generate()
+
+	//查询列表
+	err = req.Bind(c)
+	if err != nil {
+		log.Warnf("Bind error: %s", err.Error())
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+
+	//数据权限检查
+	p := actions.GetPermissionFromContext(c)
+
+	list := make([]system.SysUser, 0)
+	var count int64
+	serviceStudent := service.SysUser{}
+	serviceStudent.Log = log
+	serviceStudent.Orm = db
+	err = serviceStudent.GetSysUserPage(req, p, &list, &count)
+	if err != nil {
+		e.Error(c, http.StatusInternalServerError, err, "查询失败")
+		return
+	}
+
+	e.PageOK(c, list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
+}
+
+// @Summary 获取用户
+// @Description 获取JSON
+// @Tags 用户
+// @Param userId path int true "用户编码"
+// @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/sysUser/{userId} [get]
+// @Security Bearer
+func (e *SysUser) GetSysUser(c *gin.Context) {
+	log := e.GetLogger(c)
+	control := new(dto.SysUserById)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//查看详情
+	req := control.Generate()
+	err = req.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	var object system.SysUser
+
+	//数据权限检查
+	p := actions.GetPermissionFromContext(c)
+
+	serviceSysUser := service.SysUser{}
+	serviceSysUser.Log = log
+	serviceSysUser.Orm = db
+	err = serviceSysUser.GetSysUser(req, p, &object)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
+		return
+	}
+
+	e.OK(c, object, "查看成功")
+}
+
+// @Summary 创建用户
+// @Description 获取JSON
+// @Tags 用户
+// @Accept  application/json
+// @Product application/json
+// @Param data body models.SysUser true "用户数据"
+// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
+// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
+// @Router /api/v1/sysUser [post]
+func (e *SysUser) InsertSysUser(c *gin.Context) {
+	log := e.GetLogger(c)
+	control := new(dto.SysUserControl)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//新增操作
+	req := control.Generate()
+	err = req.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	var object common.ActiveRecord
+	object, err = req.GenerateM()
+	if err != nil {
+		e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
+		return
+	}
+	// 设置创建人
+	object.SetCreateBy(user.GetUserId(c))
+
+	serviceSysUser := service.SysUser{}
+	serviceSysUser.Orm = db
+	serviceSysUser.Log = log
+	err = serviceSysUser.InsertSysUser(object)
+	if err != nil {
+		log.Error(err)
+		e.Error(c, http.StatusInternalServerError, err, "创建失败")
+		return
+	}
+
+	e.OK(c, object.GetId(), "创建成功")
+}
+
+// @Summary 修改用户数据
+// @Description 获取JSON
+// @Tags 用户
+// @Accept  application/json
+// @Product application/json
+// @Param data body models.SysUser true "body"
+// @Success 200 {string} string	"{"code": 200, "message": "修改成功"}"
+// @Success 200 {string} string	"{"code": -1, "message": "修改失败"}"
+// @Router /api/v1/sysuser/{userId} [put]
+func (e *SysUser) UpdateSysUser(c *gin.Context) {
+	control := new(dto.SysUserControl)
+
+	log := e.GetLogger(c)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	req := control.Generate()
+	//更新操作
+	err = req.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	var object common.ActiveRecord
+	object, err = req.GenerateM()
+	if err != nil {
+		e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
+		return
+	}
+	object.SetUpdateBy(user.GetUserId(c))
+
+	//数据权限检查
+	p := actions.GetPermissionFromContext(c)
+
+	serviceSysUser := service.SysUser{}
+	serviceSysUser.Orm = db
+	serviceSysUser.Log = log
+	err = serviceSysUser.UpdateSysUser(object, p)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+	e.OK(c, object.GetId(), "更新成功")
+}
+
+// @Summary 删除用户数据
+// @Description 删除数据
+// @Tags 用户
+// @Param userId path int true "userId"
+// @Success 200 {string} string	"{"code": 200, "message": "删除成功"}"
+// @Success 200 {string} string	"{"code": -1, "message": "删除失败"}"
+// @Router /api/v1/sysuser/{userId} [delete]
+func (e *SysUser) DeleteSysUser(c *gin.Context) {
+	log := e.GetLogger(c)
+	control := new(dto.SysUserById)
+
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//删除操作
+	req := control.Generate()
+	err = req.Bind(c)
+	if err != nil {
+		log.Errorf("Bind error: %s", err)
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	var object common.ActiveRecord
+	object, err = req.GenerateM()
+	if err != nil {
+		e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
+		return
+	}
+
+	// 设置编辑人
+	object.SetUpdateBy(user.GetUserId(c))
+
+	// 数据权限检查
+	p := actions.GetPermissionFromContext(c)
+
+	serviceSysUser := service.SysUser{}
+	serviceSysUser.Orm = db
+	serviceSysUser.Log = log
+	err = serviceSysUser.RemoveSysUser(req, object, p)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+	e.OK(c, object.GetId(), "删除成功")
+}
+
+// @Summary 修改头像
+// @Description 获取JSON
+// @Tags 用户
+// @Accept multipart/form-data
+// @Param file formData file true "file"
+// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
+// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
+// @Router /api/v1/user/avatar [post]
+func (e *SysUser) InsetSysUserAvatar(c *gin.Context) {
+	log := e.GetLogger(c)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	// 数据权限检查
+	p := actions.GetPermissionFromContext(c)
+
+	form, _ := c.MultipartForm()
+	files := form.File["upload[]"]
+	guid := uuid.New().String()
+	filPath := "static/uploadfile/" + guid + ".jpg"
+	for _, file := range files {
+		log.Debugf("upload avatar file: %s", file.Filename)
+		// 上传文件至指定目录
+		err = c.SaveUploadedFile(file, filPath)
+		if err != nil {
+			log.Errorf("save file error, %s", err.Error())
+			e.Error(c, http.StatusInternalServerError, err, "")
+			return
+		}
+	}
+
+	object := &system.SysUser{
+		UserId: p.UserId,
+		Avatar: "/" + filPath,
+	}
+	serviceSysUser := service.SysUser{}
+	serviceSysUser.Orm = db
+	serviceSysUser.Log = log
+	err = serviceSysUser.UpdateSysUser(object, p)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+	e.OK(c, filPath, "修改成功")
+}
+
+// @Summary 重置密码
+// @Description 获取JSON
+// @Tags 用户
+// @Accept  application/json
+// @Product application/json
+// @Param data body dto.PassWord true "body"
+// @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/user/pwd [post]
+// @Security Bearer
+func (e *SysUser) SysUserUpdatePwd(c *gin.Context) {
+	log := e.GetLogger(c)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	var pwd dto.PassWord
+	err = c.Bind(&pwd)
+	if err != nil {
+		log.Errorf("Bind error: %s", err)
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+
+	// 数据权限检查
+	p := actions.GetPermissionFromContext(c)
+
+	object := &system.SysUser{
+		UserId:   p.UserId,
+		Password: pwd.Password,
+	}
+	serviceSysUser := service.SysUser{}
+	serviceSysUser.Orm = db
+	serviceSysUser.Log = log
+	err = serviceSysUser.UpdateSysUser(object, p)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+	e.OK(c, nil, "密码修改成功")
+}
+
+// @Summary 获取个人中心用户
+// @Description 获取JSON
+// @Tags 个人中心
+// @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/user/profile [get]
+// @Security Bearer
+func (e *SysUser) GetSysUserProfile(c *gin.Context) {
+	log := e.GetLogger(c)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	id := user.GetUserId(c)
+	serviceSysUser := service.SysUser{}
+	serviceSysUser.Log = log
+	serviceSysUser.Orm = db
+	user := new(system.SysUser)
+	roles := make([]system.SysRole, 0)
+	posts := make([]system.SysPost, 0)
+	err = serviceSysUser.GetSysUserProfile(id, user, &roles, &posts)
+	if err != nil {
+		log.Errorf("get user profile error, %s", err.Error())
+		e.Error(c, http.StatusInternalServerError, err, "获取用户信息失败")
+		return
+	}
+	e.OK(c, gin.H{
+		"user":  user,
+		"roles": roles,
+		"posts": posts,
+	}, "查询成功")
+	//var SysUser models.SysUser
+	//userId := tools.GetUserIdStr(c)
+	//SysUser.UserId, _ = tools.StringToInt(userId)
+	//result, err := SysUser.Get()
+	//tools.HasError(err, "抱歉未找到相关信息", -1)
+	//var SysRole models.SysRole
+	//var Post models.Post
+	//var Dept models.SysDepts
+	////获取角色列表
+	//roles, err := SysRole.GetList()
+	////获取职位列表
+	//posts, err := Post.GetList()
+	////获取部门列表
+	//Dept.DeptId = result.DeptId
+	//dept, err := Dept.Get()
+	//
+	//postIds := make([]int, 0)
+	//postIds = append(postIds, result.PostId)
+	//
+	//roleIds := make([]int, 0)
+	//roleIds = append(roleIds, result.RoleId)
+	//
+	//app.Custum(c, gin.H{
+	//	"code":    200,
+	//	"data":    result,
+	//	"postIds": postIds,
+	//	"roleIds": roleIds,
+	//	"roles":   roles,
+	//	"posts":   posts,
+	//	"dept":    dept,
+	//})
+}
+
+func (e *SysUser) GetInfo(c *gin.Context) {
+	log := e.GetLogger(c)
+
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//数据权限检查
+	p := actions.GetPermissionFromContext(c)
+
+	var roles = make([]string, 1)
+	roles[0] = user.GetRoleName(c)
+
+	var permissions = make([]string, 1)
+	permissions[0] = "*:*:*"
+
+	var buttons = make([]string, 1)
+	buttons[0] = "*:*:*"
+
+	RoleMenu := models.RoleMenu{}
+	RoleMenu.RoleId = user.GetRoleId(c)
+
+	var mp = make(map[string]interface{})
+	mp["roles"] = roles
+	if user.GetRoleName(c) == "admin" || user.GetRoleName(c) == "系统管理员" {
+		mp["permissions"] = permissions
+		mp["buttons"] = buttons
+	} else {
+		list, _ := RoleMenu.GetPermis(db)
+		mp["permissions"] = list
+		mp["buttons"] = list
+	}
+
+	var sysUser system.SysUser
+	req := new(dto.SysUserById)
+	req.Id = user.GetUserId(c)
+	serviceSysUser := service.SysUser{}
+	serviceSysUser.Log = log
+	serviceSysUser.Orm = db
+	err = serviceSysUser.GetSysUser(req, p, &sysUser)
+	if err != nil {
+		e.Error(c, http.StatusUnauthorized, err, "登录失败")
+		return
+	}
+
+	mp["introduction"] = " am a super administrator"
+
+	mp["avatar"] = "https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif"
+	if sysUser.Avatar != "" {
+		mp["avatar"] = sysUser.Avatar
+	}
+	mp["userName"] = sysUser.NickName
+	mp["userId"] = sysUser.UserId
+	mp["deptId"] = sysUser.DeptId
+	mp["name"] = sysUser.NickName
+	e.OK(c, mp, "")
+}

app/admin/apis/system/captcha.go

@@ -2,14 +2,14 @@ package system
 
 import (
 	"github.com/gin-gonic/gin"
-	"go-admin/tools"
-	"go-admin/tools/app"
-	"go-admin/tools/captcha"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/captcha"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
 )
 
 func GenerateCaptchaHandler(c *gin.Context) {
 	id, b64s, err := captcha.DriverDigitFunc()
-	tools.HasError(err, "验证码获取失败", 500)
+	pkg.HasError(err, "验证码获取失败", 500)
 	app.Custum(c, gin.H{
 		"code": 200,
 		"data": b64s,

app/admin/apis/system/dict/sys_dict_data.go

@@ -0,0 +1,262 @@
+package dict
+
+import (
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
+
+	"go-admin/app/admin/models/system"
+	"go-admin/app/admin/service"
+	"go-admin/app/admin/service/dto"
+	"go-admin/common/apis"
+	common "go-admin/common/models"
+)
+
+type SysDictData struct {
+	apis.Api
+}
+
+// @Summary 字典数据列表
+// @Description 获取JSON
+// @Tags 字典数据
+// @Param status query string false "status"
+// @Param dictCode query string false "dictCode"
+// @Param dictType query string false "dictType"
+// @Param pageSize query int false "页条数"
+// @Param pageIndex query int false "页码"
+// @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/dict/data [get]
+// @Security Bearer
+func (e *SysDictData) GetSysDictDataList(c *gin.Context) {
+	log := e.GetLogger(c)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	req := &dto.SysDictDataSearch{}
+
+	//查询列表
+	err = req.Bind(c)
+	if err != nil {
+		log.Warnf("Bind error: %s", err.Error())
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+
+	list := make([]system.SysDictData, 0)
+	var count int64
+	s := service.SysDictData{}
+	s.Log = log
+	s.Orm = db.Debug()
+	err = s.GetPage(req, &list, &count)
+	if err != nil {
+		log.Errorf("GetPage error, %s", err.Error())
+		e.Error(c, http.StatusInternalServerError, err, "查询失败")
+		return
+	}
+
+	e.PageOK(c, list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
+}
+
+// @Summary 通过编码获取字典数据
+// @Description 获取JSON
+// @Tags 字典数据
+// @Param dictCode path int true "字典编码"
+// @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/dict/data/{dictCode} [get]
+// @Security Bearer
+func (e *SysDictData) GetSysDictData(c *gin.Context) {
+	log := e.GetLogger(c)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//查看详情
+	req := &dto.SysDictDataById{}
+	err = req.Bind(c)
+	if err != nil {
+		log.Warnf("Bind error: %s", err.Error())
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	var object system.SysDictData
+
+	s := service.SysDictData{}
+	s.Log = log
+	s.Orm = db
+	err = s.Get(req, &object)
+	if err != nil {
+		log.Warnf("Get error: %s", err.Error())
+		e.Error(c, http.StatusInternalServerError, err, "查询失败")
+		return
+	}
+
+	e.OK(c, object, "查看成功")
+}
+
+// @Summary 添加字典数据
+// @Description 获取JSON
+// @Tags 字典数据
+// @Accept  application/json
+// @Product application/json
+// @Param data body system.DictType true "data"
+// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
+// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
+// @Router /api/v1/dict/data [post]
+// @Security Bearer
+func (e *SysDictData) InsertSysDictData(c *gin.Context) {
+	log := e.GetLogger(c)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//新增操作
+	req := &dto.SysDictDataControl{}
+	err = req.Bind(c)
+	if err != nil {
+		log.Warnf("Bind error: %s", err.Error())
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	object, _ := req.GenerateM()
+	// 设置创建人
+	object.SetCreateBy(user.GetUserId(c))
+
+	s := service.SysDictData{}
+	s.Orm = db
+	s.Log = log
+	err = s.Insert(object.(*system.SysDictData))
+	if err != nil {
+		log.Errorf("Insert error, %s", err)
+		e.Error(c, http.StatusInternalServerError, err, "创建失败")
+		return
+	}
+
+	e.OK(c, object.GetId(), "创建成功")
+}
+
+// @Summary 修改字典数据
+// @Description 获取JSON
+// @Tags 字典数据
+// @Accept  application/json
+// @Product application/json
+// @Param data body models.DictType true "body"
+// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
+// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
+// @Router /api/v1/dict/data/{dictCode} [put]
+// @Security Bearer
+func (e *SysDictData) UpdateSysDictData(c *gin.Context) {
+	log := e.GetLogger(c)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	req := &dto.SysDictDataControl{}
+	//更新操作
+	err = req.Bind(c)
+	if err != nil {
+		log.Warnf("request validate error, %s", err.Error())
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	object, _ := req.GenerateM()
+	object.SetUpdateBy(user.GetUserId(c))
+
+	s := service.SysDictData{}
+	s.Orm = db
+	s.Log = log
+	err = s.Update(object.(*system.SysDictData))
+	if err != nil {
+		log.Errorf("Update error, %s", err)
+		e.Error(c, http.StatusInternalServerError, err, "更新失败")
+		return
+	}
+	e.OK(c, object.GetId(), "更新成功")
+}
+
+// @Summary 删除字典数据
+// @Description 删除数据
+// @Tags 字典数据
+// @Param dictCode path int true "dictCode"
+// @Success 200 {string} string	"{"code": 200, "message": "删除成功"}"
+// @Success 200 {string} string	"{"code": -1, "message": "删除失败"}"
+// @Router /api/v1/dict/data/{dictCode} [delete]
+func (e *SysDictData) DeleteSysDictData(c *gin.Context) {
+	log := e.GetLogger(c)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//删除操作
+	req := new(dto.SysDictDataById)
+	err = req.Bind(c)
+	if err != nil {
+		log.Warnf("Bind error: %s", err)
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	var object common.ActiveRecord
+	object, err = req.GenerateM()
+	if err != nil {
+		log.Errorf("GenerateM error, %s", err.Error())
+		e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
+		return
+	}
+
+	// 设置编辑人
+	object.SetUpdateBy(user.GetUserId(c))
+
+	s := service.SysDictData{}
+	s.Orm = db
+	s.Log = log
+	err = s.Remove(req, object.(*system.SysDictData))
+	if err != nil {
+		log.Errorf("Remove error, %s", err)
+		e.Error(c, http.StatusInternalServerError, err, "删除失败")
+		return
+	}
+	e.OK(c, object.GetId(), "删除成功")
+}
+
+func (e *SysDictData) GetSysDictDataAll(c *gin.Context) {
+	log := e.GetLogger(c)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	req := &dto.SysDictDataSearch{}
+
+	//查询列表
+	err = req.Bind(c)
+	if err != nil {
+		log.Warnf("Bind error: %s", err)
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+
+	list := make([]system.SysDictData, 0)
+	s := service.SysDictData{}
+	s.Log = log
+	s.Orm = db
+	err = s.GetAll(req, &list)
+	if err != nil {
+		log.Errorf("GetAll error, %s", err.Error())
+		e.Error(c, http.StatusInternalServerError, err, "查询失败")
+		return
+	}
+
+	e.OK(c, list, "查询成功")
+}

app/admin/apis/system/dict/sys_dict_type.go

@@ -0,0 +1,260 @@
+package dict
+
+import (
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
+
+	"go-admin/app/admin/models/system"
+	"go-admin/app/admin/service"
+	"go-admin/app/admin/service/dto"
+	"go-admin/common/apis"
+	common "go-admin/common/models"
+)
+
+type SysDictType struct {
+	apis.Api
+}
+
+// @Summary 字典类型列表数据
+// @Description 获取JSON
+// @Tags 字典类型
+// @Param dictName query string false "dictName"
+// @Param dictId query string false "dictId"
+// @Param dictType query string false "dictType"
+// @Param pageSize query int false "页条数"
+// @Param pageIndex query int false "页码"
+// @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/dict/type [get]
+// @Security Bearer
+func (e *SysDictType) GetSysDictTypeList(c *gin.Context) {
+	log := e.GetLogger(c)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	req := &dto.SysDictTypeSearch{}
+
+	//查询列表
+	err = req.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+
+	list := make([]system.SysDictType, 0)
+	var count int64
+	s := service.SysDictType{}
+	s.Log = log
+	s.Orm = db.Debug()
+	err = s.GetPage(req, &list, &count)
+	if err != nil {
+		e.Error(c, http.StatusInternalServerError, err, "查询失败")
+		return
+	}
+
+	e.PageOK(c, list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
+}
+
+// @Summary 通过字典id获取字典类型
+// @Description 获取JSON
+// @Tags 字典类型
+// @Param dictId path int true "字典类型编码"
+// @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/dict/type/{dictId} [get]
+// @Security Bearer
+func (e *SysDictType) GetSysDictType(c *gin.Context) {
+	log := e.GetLogger(c)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//查看详情
+	req := &dto.SysDictTypeById{}
+	err = req.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	var object system.SysDictType
+
+	s := service.SysDictType{}
+	s.Log = log
+	s.Orm = db
+	err = s.Get(req, &object)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
+		return
+	}
+
+	e.OK(c, object, "查看成功")
+}
+
+// @Summary 添加字典类型
+// @Description 获取JSON
+// @Tags 字典类型
+// @Accept  application/json
+// @Product application/json
+// @Param data body models.DictType true "data"
+// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
+// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
+// @Router /api/v1/dict/type [post]
+// @Security Bearer
+func (e *SysDictType) InsertSysDictType(c *gin.Context) {
+	log := e.GetLogger(c)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//新增操作
+	req := &dto.SysDictTypeControl{}
+	err = req.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	object, _ := req.GenerateM()
+	// 设置创建人
+	object.SetCreateBy(user.GetUserId(c))
+
+	s := service.SysDictType{}
+	s.Orm = db
+	s.Log = log
+	err = s.Insert(object.(*system.SysDictType))
+	if err != nil {
+		log.Error(err)
+		e.Error(c, http.StatusInternalServerError, err, "创建失败")
+		return
+	}
+
+	e.OK(c, object.GetId(), "创建成功")
+}
+
+// @Summary 修改字典类型
+// @Description 获取JSON
+// @Tags 字典类型
+// @Accept  application/json
+// @Product application/json
+// @Param data body models.DictType true "body"
+// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
+// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
+// @Router /api/v1/dict/type/{dictId} [put]
+// @Security Bearer
+func (e *SysDictType) UpdateSysDictType(c *gin.Context) {
+	log := e.GetLogger(c)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	req := &dto.SysDictTypeControl{}
+	//更新操作
+	err = req.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	object, _ := req.GenerateM()
+	object.SetUpdateBy(user.GetUserId(c))
+
+	s := service.SysDictType{}
+	s.Orm = db
+	s.Log = log
+	err = s.Update(object.(*system.SysDictType))
+	if err != nil {
+		log.Error(err)
+		return
+	}
+	e.OK(c, object.GetId(), "更新成功")
+}
+
+// @Summary 删除字典类型
+// @Description 删除数据
+// @Tags 字典类型
+// @Param dictId path int true "dictId"
+// @Success 200 {string} string	"{"code": 200, "message": "删除成功"}"
+// @Success 200 {string} string	"{"code": -1, "message": "删除失败"}"
+// @Router /api/v1/dict/type/{dictId} [delete]
+func (e *SysDictType) DeleteSysDictType(c *gin.Context) {
+	log := e.GetLogger(c)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//删除操作
+	req := new(dto.SysDictTypeById)
+	err = req.Bind(c)
+	if err != nil {
+		log.Errorf("Bind error: %s", err)
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	var object common.ActiveRecord
+	object, err = req.GenerateM()
+	if err != nil {
+		e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
+		return
+	}
+
+	// 设置编辑人
+	object.SetUpdateBy(user.GetUserId(c))
+
+	s := service.SysDictType{}
+	s.Orm = db
+	s.Log = log
+	err = s.Remove(req, object.(*system.SysDictType))
+	if err != nil {
+		log.Error(err)
+		return
+	}
+	e.OK(c, object.GetId(), "删除成功")
+}
+
+// @Summary 字典类型全部数据
+// @Description 获取JSON
+// @Tags 字典类型
+// @Param dictName query string false "dictName"
+// @Param dictId query string false "dictId"
+// @Param dictType query string false "dictType"
+// @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/dict/type-option-select [get]
+// @Security Bearer
+func (e *SysDictType) GetSysDictTypeAll(c *gin.Context) {
+	log := e.GetLogger(c)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	req := &dto.SysDictTypeSearch{}
+
+	//查询列表
+	err = req.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+
+	list := make([]system.SysDictType, 0)
+	s := service.SysDictType{}
+	s.Log = log
+	s.Orm = db
+	err = s.GetAll(req, &list)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
+		return
+	}
+
+	e.OK(c, list, "查询成功")
+}

app/admin/apis/system/rolemenu.go

@@ -0,0 +1,67 @@
+package system
+
+import (
+	"go-admin/app/admin/models"
+)
+
+// @Summary RoleMenu列表数据
+// @Description 获取JSON
+// @Tags 角色菜单
+// @Param RoleId query string false "RoleId"
+// @Success 200 {string} string "{"code": 200, "data": [...]}"
+// @Success 200 {string} string "{"code": -1, "message": "抱歉未找到相关信息"}"
+// @Router /api/v1/rolemenu [get]
+// @Security Bearer
+//func GetRoleMenu(c *gin.Context) {
+//	var Rm models.RoleMenu
+//	err := c.ShouldBind(&Rm)
+//	result, err := Rm.Get()
+//	var res app.Response
+//	if err != nil {
+//		res.Msg = "抱歉未找到相关信息"
+//		c.JSON(http.StatusOK, res.ReturnError(200))
+//		return
+//	}
+//	res.Data = result
+//	c.JSON(http.StatusOK, res.ReturnOK())
+//}
+
+type RoleMenuPost struct {
+	RoleId   string
+	RoleMenu []models.RoleMenu
+}
+
+//func InsertRoleMenu(c *gin.Context) {
+//
+//	var res app.Response
+//	res.Msg = "添加成功"
+//	c.JSON(http.StatusOK, res.ReturnOK())
+//	return
+//
+//}
+
+// @Summary 删除用户菜单数据
+// @Description 删除数据
+// @Tags 角色菜单
+// @Param id path string true "id"
+// @Param menu_id query string false "menu_id"
+// @Success 200 {string} string	"{"code": 200, "message": "删除成功"}"
+// @Success 200 {string} string	"{"code": -1, "message": "删除失败"}"
+// @Router /api/v1/rolemenu/{id} [delete]
+//func DeleteRoleMenu(c *gin.Context) {
+//	var t models.RoleMenu
+//	id := c.Param("id")
+//	menuId := c.Request.FormValue("menu_id")
+//	fmt.Println(menuId)
+//	_, err := t.Delete(id, menuId)
+//	if err != nil {
+//		var res app.Response
+//		res.Msg = "删除失败"
+//		c.JSON(http.StatusOK, res.ReturnError(200))
+//		return
+//	}
+//	var res app.Response
+//	res.Msg = "删除成功"
+//	c.JSON(http.StatusOK, res.ReturnOK())
+//	return
+//}

app/admin/apis/system/settings.go

@@ -0,0 +1,96 @@
+package system
+
+import (
+	"fmt"
+	"net/http"
+	"strings"
+
+	"github.com/gin-gonic/gin"
+
+	"go-admin/app/admin/models"
+	"go-admin/app/admin/service"
+	"go-admin/app/admin/service/dto"
+	"go-admin/common/apis"
+)
+
+type SysSetting struct {
+	apis.Api
+}
+
+// @Summary 查询系统信息
+// @Description 获取JSON
+// @Tags 系统信息
+// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
+// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
+// @Router /api/v1/setting [get]
+func (e *SysSetting) GetSetting(c *gin.Context) {
+	log := e.GetLogger(c)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	sysSettingService := service.SysSetting{}
+	sysSettingService.Log = log
+	sysSettingService.Orm = db
+	var model = models.SysSetting{}
+	err = sysSettingService.GetSysSetting(&model)
+	if err != nil {
+		e.Error(c, http.StatusInternalServerError, err, "查询失败")
+		return
+	}
+
+	if model.Logo != "" {
+		if !strings.HasPrefix(model.Logo, "http") {
+			model.Logo = fmt.Sprintf("http://%s/%s", c.Request.Host, model.Logo)
+		}
+	}
+
+	e.OK(c, model, "查询成功")
+}
+
+// @Summary 更新或提交系统信息
+// @Description 获取JSON
+// @Tags 系统信息
+// @Param data body models.SysUser true "body"
+// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
+// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
+// @Router /api/v1/system/setting [post]
+func (e *SysSetting) CreateOrUpdateSetting(c *gin.Context) {
+	control := new(dto.SysSettingControl)
+	log := e.GetLogger(c)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//更新操作
+	err = control.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	object, err := control.Generate()
+	if err != nil {
+		e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
+		return
+	}
+
+	sysSettingService := service.SysSetting{}
+	sysSettingService.Log = log
+	sysSettingService.Orm = db
+	err = sysSettingService.UpdateSysSetting(object)
+	if err != nil {
+		e.Error(c, http.StatusInternalServerError, err, "更新失败")
+		return
+	}
+
+	if object.Logo != "" {
+		if !strings.HasPrefix(object.Logo, "http") {
+			object.Logo = fmt.Sprintf("http://%s/%s", c.Request.Host, object.Logo)
+		}
+	}
+	e.OK(c, object, "提交成功")
+}

app/admin/apis/system/sys_config/sys_config.go

@@ -0,0 +1,232 @@
+package sys_config
+
+import (
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
+
+	"go-admin/app/admin/models/system"
+	"go-admin/app/admin/service"
+	"go-admin/app/admin/service/dto"
+	"go-admin/common/apis"
+)
+
+type SysConfig struct {
+	apis.Api
+}
+
+func (e *SysConfig) GetSysConfigList(c *gin.Context) {
+	log := e.GetLogger(c)
+	d := new(dto.SysConfigSearch)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//查询列表
+	err = d.Bind(c)
+	if err != nil {
+		log.Errorf("参数验证失败, error:%s", err)
+		app.Error(c, 500, err, "参数验证失败")
+		return
+	}
+
+	list := make([]system.SysConfig, 0)
+	var count int64
+	s := service.SysConfig{}
+	s.Log = log
+	s.Orm = db
+	err = s.GetSysConfigPage(d, &list, &count)
+	if err != nil {
+		log.Errorf("GetSysConfigPage 查询失败, error:%s", err)
+		app.Error(c, 500, err, "查询失败")
+		return
+	}
+	e.PageOK(c, list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功")
+}
+
+func (e *SysConfig) GetSysConfig(c *gin.Context) {
+	log := e.GetLogger(c)
+	control := new(dto.SysConfigById)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+	//查看详情
+	err = control.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		log.Errorf("Orm获取失败, error:%s", err)
+		app.Error(c, 500, err, "Orm获取失败")
+		return
+	}
+	var object system.SysConfig
+
+	serviceSysLoginLog := service.SysConfig{}
+	serviceSysLoginLog.Log = log
+	serviceSysLoginLog.Orm = db
+	err = serviceSysLoginLog.GetSysConfig(control, &object)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
+		log.Errorf("Orm获取失败, error:%s", err)
+		app.Error(c, 500, err, "Orm获取失败")
+		return
+	}
+
+	e.OK(c, object, "查看成功")
+}
+
+func (e *SysConfig) InsertSysConfig(c *gin.Context) {
+	log := e.GetLogger(c)
+	control := new(dto.SysConfigControl)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//新增操作
+	err = control.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		log.Errorf("Orm获取失败, error:%s", err)
+		app.Error(c, 500, err, "Orm获取失败")
+		return
+	}
+	object, err := control.Generate()
+	if err != nil {
+		e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
+		log.Errorf("Orm获取失败, error:%s", err)
+		app.Error(c, 500, err, "Orm获取失败")
+		return
+	}
+	// 设置创建人
+	object.SetCreateBy(user.GetUserId(c))
+
+	serviceSysLoginLog := service.SysConfig{}
+	serviceSysLoginLog.Orm = db
+	serviceSysLoginLog.Log = log
+	err = serviceSysLoginLog.InsertSysConfig(object)
+	if err != nil {
+		log.Error(err)
+		e.Error(c, http.StatusInternalServerError, err, "创建失败")
+		log.Errorf("Orm获取失败, error:%s", err)
+		app.Error(c, 500, err, "Orm获取失败")
+		return
+	}
+
+	e.OK(c, object.GetId(), "创建成功")
+}
+
+func (e *SysConfig) UpdateSysConfig(c *gin.Context) {
+	log := e.GetLogger(c)
+	control := new(dto.SysConfigControl)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//更新操作
+	err = control.Bind(c)
+
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		log.Errorf("Orm获取失败, error:%s", err)
+		app.Error(c, 500, err, "Orm获取失败")
+		return
+	}
+	object, err := control.Generate()
+	if err != nil {
+		e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
+		log.Errorf("Orm获取失败, error:%s", err)
+		app.Error(c, 500, err, "Orm获取失败")
+		return
+	}
+	object.SetUpdateBy(user.GetUserId(c))
+
+	serviceSysLoginLog := service.SysConfig{}
+	serviceSysLoginLog.Orm = db
+	serviceSysLoginLog.Log = log
+	err = serviceSysLoginLog.UpdateSysConfig(object)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "更新失败")
+		log.Errorf("Orm获取失败, error:%s", err)
+		app.Error(c, 500, err, "Orm获取失败")
+		return
+	}
+	e.OK(c, object.GetId(), "更新成功")
+}
+
+func (e *SysConfig) DeleteSysConfig(c *gin.Context) {
+	log := e.GetLogger(c)
+	control := new(dto.SysConfigById)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//删除操作
+	err = control.Bind(c)
+	if err != nil {
+		log.Errorf("Bind error: %s", err)
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		log.Errorf("Orm获取失败, error:%s", err)
+		app.Error(c, 500, err, "Orm获取失败")
+		return
+	}
+	object, err := control.GenerateM()
+	if err != nil {
+		e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
+		log.Errorf("Orm获取失败, error:%s", err)
+		app.Error(c, 500, err, "Orm获取失败")
+		return
+	}
+
+	// 设置编辑人
+	object.SetUpdateBy(user.GetUserId(c))
+
+	serviceSysLoginLog := service.SysConfig{}
+	serviceSysLoginLog.Orm = db
+	serviceSysLoginLog.Log = log
+	err = serviceSysLoginLog.RemoveSysConfig(control, object)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "删除失败")
+		log.Errorf("Orm获取失败, error:%s", err)
+		app.Error(c, 500, err, "Orm获取失败")
+		return
+	}
+	e.OK(c, object.GetId(), "删除成功")
+}
+
+// GetSysConfigByKEYForService 根据Key获取SysConfig的Service
+func (e *SysConfig) GetSysConfigByKEYForService(c *gin.Context) {
+	log := e.GetLogger(c)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+	var v dto.SysConfigControl
+	err = v.Bind(c)
+	if err != nil {
+		log.Errorf("参数验证错误, error:%s", err)
+		app.Error(c, 422, err, "参数验证失败")
+		return
+	}
+	s := service.SysConfig{}
+	s.Log = log
+	s.Orm = db
+	err = s.GetSysConfigByKEY(&v)
+	if err != nil {
+		log.Errorf("通过Key获取配置失败, error:%s", err)
+		app.Error(c, 500, err, "")
+		return
+	}
+	app.OK(c, v, s.Msg)
+}

app/admin/apis/system/sys_dept/sys_dept.go

@@ -0,0 +1,282 @@
+package sys_dept
+
+import (
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
+
+	"go-admin/app/admin/models/system"
+	"go-admin/app/admin/service"
+	"go-admin/app/admin/service/dto"
+	"go-admin/common/apis"
+)
+
+type SysDept struct {
+	apis.Api
+}
+
+// @Summary 分页部门列表数据
+// @Description 分页列表
+// @Tags 部门
+// @Param name query string false "name"
+// @Param id query string false "id"
+// @Param position query string false "position"
+// @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/dept [get]
+// @Security Bearer
+func (e *SysDept) GetSysDeptList(c *gin.Context) {
+	log := e.GetLogger(c)
+	d := new(dto.SysDeptSearch)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//查询列表
+	err = d.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+
+	list := make([]system.SysDept, 0)
+	serviceStudent := service.SysDept{}
+	serviceStudent.Log = log
+	serviceStudent.Orm = db
+	list, err = serviceStudent.SetDeptPage(d)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
+		return
+	}
+
+	e.OK(c, list, "查询成功")
+}
+
+// @Summary 部门列表数据
+// @Description 获取JSON
+// @Tags 部门
+// @Param deptId path string false "deptId"
+// @Param position query string false "position"
+// @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/dept/{deptId} [get]
+// @Security Bearer
+func (e *SysDept) GetSysDept(c *gin.Context) {
+	log := e.GetLogger(c)
+	control := new(dto.SysDeptById)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//查看详情
+	err = control.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	var object system.SysDept
+
+	serviceSysOperlog := service.SysDept{}
+	serviceSysOperlog.Log = log
+	serviceSysOperlog.Orm = db
+	err = serviceSysOperlog.GetSysDept(control, &object)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
+		return
+	}
+
+	e.OK(c, object, "查看成功")
+}
+
+// @Summary 添加部门
+// @Description 获取JSON
+// @Tags 部门
+// @Accept  application/json
+// @Product application/json
+// @Param data body models.SysDept true "data"
+// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
+// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
+// @Router /api/v1/dept [post]
+// @Security Bearer
+func (e *SysDept) InsertSysDept(c *gin.Context) {
+	log := e.GetLogger(c)
+	control := new(dto.SysDeptControl)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//新增操作
+	err = control.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	object, err := control.Generate()
+	if err != nil {
+		e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
+		return
+	}
+	// 设置创建人
+	object.SetCreateBy(user.GetUserId(c))
+
+	serviceSysDept := service.SysDept{}
+	serviceSysDept.Orm = db
+	serviceSysDept.Log = log
+	err = serviceSysDept.InsertSysDept(object)
+	if err != nil {
+		log.Error(err)
+		e.Error(c, http.StatusInternalServerError, err, "创建失败")
+		return
+	}
+
+	e.OK(c, object.GetId(), "创建成功")
+}
+
+// @Summary 修改部门
+// @Description 获取JSON
+// @Tags 部门
+// @Accept  application/json
+// @Product application/json
+// @Param id path int true "id"
+// @Param data body models.SysDept true "body"
+// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
+// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
+// @Router /api/v1/dept/{deptId} [put]
+// @Security Bearer
+func (e *SysDept) UpdateSysDept(c *gin.Context) {
+	log := e.GetLogger(c)
+	control := new(dto.SysDeptControl)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//更新操作
+	err = control.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	object, err := control.Generate()
+	if err != nil {
+		e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
+		return
+	}
+	object.SetUpdateBy(user.GetUserId(c))
+
+	serviceSysDept := service.SysDept{}
+	serviceSysDept.Orm = db
+	serviceSysDept.Log = log
+	err = serviceSysDept.UpdateSysDept(object)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+	e.OK(c, object.GetId(), "更新成功")
+}
+
+// @Summary 删除部门
+// @Description 删除数据
+// @Tags 部门
+// @Param data body []int true "body"
+// @Success 200 {string} string	"{"code": 200, "message": "删除成功"}"
+// @Success 200 {string} string	"{"code": -1, "message": "删除失败"}"
+// @Router /api/v1/dept [delete]
+func (e *SysDept) DeleteSysDept(c *gin.Context) {
+	log := e.GetLogger(c)
+	control := new(dto.SysDeptById)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//删除操作
+	err = control.Bind(c)
+	if err != nil {
+		log.Errorf("Bind error: %s", err)
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+
+	serviceSysDept := service.SysDept{}
+	serviceSysDept.Orm = db
+	serviceSysDept.Log = log
+	err = serviceSysDept.RemoveSysDept(control)
+	if err != nil {
+		log.Errorf("RemoveSysDept error, %s", err.Error())
+		e.Error(c, http.StatusInternalServerError, err, "删除失败")
+		return
+	}
+	e.OK(c, control.GetId(), "删除成功")
+}
+
+// GetDeptTree 用户管理 左侧部门树
+func (e *SysDept) GetDeptTree(c *gin.Context) {
+	log := e.GetLogger(c)
+	d := new(dto.SysDeptSearch)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//查询列表
+	err = d.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+
+	list := make([]dto.DeptLabel, 0)
+	serviceStudent := service.SysDept{}
+	serviceStudent.Log = log
+	serviceStudent.Orm = db
+	list, err = serviceStudent.SetDeptTree(d)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
+		return
+	}
+
+	//var Dept models.SysDepts
+	//Dept.DeptName = c.Request.FormValue("deptName")
+	//Dept.Status = c.Request.FormValue("status")
+	//Dept.DeptId, _ = tools.StringToInt(c.Request.FormValue("deptId"))
+	//result, err := Dept.SetDept(false)
+	//tools.HasError(err, "抱歉未找到相关信息", -1)
+	e.OK(c, list, "")
+}
+
+//func (e *SysDept) GetDeptTreeRoleSelect(c *gin.Context) {
+//	log := e.GetLogger(c)
+//	db, err := tools.GetOrm(c)
+//	if err != nil {
+//		log.Error(err)
+//		return
+//	}
+//
+//	s := service.SysDept{}
+//	s.Orm = db
+//	s.MsgID = msgID
+//	id, err := tools.StringToInt(c.Param("roleId"))
+//	result, err := s.SetDeptLabel()
+//	if err != nil {
+//		log.Errorf("SetDeptLabel error, %s", msgID, err.Error())
+//		e.Error(c, http.StatusInternalServerError, err, "")
+//	}
+//	menuIds := make([]int, 0)
+//	if id != 0 {
+//		menuIds, err = s.GetRoleDeptId(id)
+//		tools.HasError(err, "抱歉未找到相关信息", -1)
+//	}
+//	e.OK(c, gin.H{
+//		"depts":       result,
+//		"checkedKeys": menuIds,
+//	}, "")
+//}

app/admin/apis/system/sys_login_log/sys_login_log.go

@@ -0,0 +1,183 @@
+package sys_login_log
+
+import (
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
+
+	"go-admin/app/admin/models/system"
+	"go-admin/app/admin/service"
+	"go-admin/app/admin/service/dto"
+	"go-admin/common/apis"
+)
+
+type SysLoginLog struct {
+	apis.Api
+}
+
+func (e *SysLoginLog) GetSysLoginLogList(c *gin.Context) {
+	log := e.GetLogger(c)
+	d := new(dto.SysLoginLogSearch)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//查询列表
+	err = d.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+
+	list := make([]system.SysLoginLog, 0)
+	var count int64
+	serviceStudent := service.SysLoginLog{}
+	serviceStudent.Log = log
+	serviceStudent.Orm = db
+	err = serviceStudent.GetSysLoginLogPage(d, &list, &count)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
+		return
+	}
+
+	e.PageOK(c, list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功")
+}
+
+func (e *SysLoginLog) GetSysLoginLog(c *gin.Context) {
+	log := e.GetLogger(c)
+	control := new(dto.SysLoginLogById)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//查看详情
+	err = control.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	var object system.SysLoginLog
+
+	serviceSysLoginLog := service.SysLoginLog{}
+	serviceSysLoginLog.Log = log
+	serviceSysLoginLog.Orm = db
+	err = serviceSysLoginLog.GetSysLoginLog(control, &object)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
+		return
+	}
+
+	e.OK(c, object, "查看成功")
+}
+
+func (e *SysLoginLog) InsertSysLoginLog(c *gin.Context) {
+	log := e.GetLogger(c)
+	control := new(dto.SysLoginLogControl)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//新增操作
+	err = control.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	object, err := control.Generate()
+	if err != nil {
+		e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
+		return
+	}
+	// 设置创建人
+	object.SetCreateBy(user.GetUserId(c))
+
+	serviceSysLoginLog := service.SysLoginLog{}
+	serviceSysLoginLog.Orm = db
+	serviceSysLoginLog.Log = log
+	err = serviceSysLoginLog.InsertSysLoginLog(object)
+	if err != nil {
+		log.Errorf("InsertSysLoginLog error, %s", err)
+		e.Error(c, http.StatusInternalServerError, err, "创建失败")
+		return
+	}
+
+	e.OK(c, object.GetId(), "创建成功")
+}
+
+func (e *SysLoginLog) UpdateSysLoginLog(c *gin.Context) {
+	log := e.GetLogger(c)
+	control := new(dto.SysLoginLogControl)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//更新操作
+	err = control.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	object, err := control.Generate()
+	if err != nil {
+		e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
+		return
+	}
+	object.SetUpdateBy(user.GetUserId(c))
+
+	serviceSysLoginLog := service.SysLoginLog{}
+	serviceSysLoginLog.Orm = db
+	serviceSysLoginLog.Log = log
+	err = serviceSysLoginLog.UpdateSysLoginLog(object)
+	if err != nil {
+		log.Errorf("UpdateSysLoginLog error, %s", err)
+		e.Error(c, http.StatusInternalServerError, err, "更新失败")
+		return
+	}
+	e.OK(c, object.GetId(), "更新成功")
+}
+
+func (e *SysLoginLog) DeleteSysLoginLog(c *gin.Context) {
+	log := e.GetLogger(c)
+	control := new(dto.SysLoginLogById)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//删除操作
+	err = control.Bind(c)
+	if err != nil {
+		log.Errorf("Bind error: %s", err)
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	object, err := control.GenerateM()
+	if err != nil {
+		e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
+		return
+	}
+
+	// 设置编辑人
+	object.SetUpdateBy(user.GetUserId(c))
+
+	serviceSysLoginLog := service.SysLoginLog{}
+	serviceSysLoginLog.Orm = db
+	serviceSysLoginLog.Log = log
+	err = serviceSysLoginLog.RemoveSysLoginLog(control, object)
+	if err != nil {
+		log.Errorf("RemoveSysLoginLog error, %s", err)
+		e.Error(c, http.StatusInternalServerError, err, "删除失败")
+		return
+	}
+	e.OK(c, object.GetId(), "删除成功")
+}

app/admin/apis/system/sys_menu/sys_menu.go

@@ -0,0 +1,362 @@
+package sys_menu
+
+import (
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
+
+	"go-admin/app/admin/models"
+	"go-admin/app/admin/models/system"
+	"go-admin/app/admin/service"
+	"go-admin/app/admin/service/dto"
+	"go-admin/common/apis"
+)
+
+type SysMenu struct {
+	apis.Api
+}
+
+// @Summary Menu列表数据
+// @Description 获取JSON
+// @Tags 菜单
+// @Param menuName query string false "menuName"
+// @Success 200 {string} string "{"code": 200, "data": [...]}"
+// @Success 200 {string} string "{"code": -1, "message": "抱歉未找到相关信息"}"
+// @Router /api/v1/menulist [get]
+// @Security Bearer
+func (e *SysMenu) GetSysMenuList(c *gin.Context) {
+	log := e.GetLogger(c)
+	d := new(dto.SysMenuSearch)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//查询列表
+	err = d.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+
+	var list *[]system.SysMenu
+	serviceSysMenu := service.SysMenu{}
+	serviceSysMenu.Log = log
+	serviceSysMenu.Orm = db
+	list, err = serviceSysMenu.GetSysMenuPage(d)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
+		return
+	}
+
+	e.OK(c, list, "查询成功")
+}
+
+// @Summary Menu详情数据
+// @Description 获取JSON
+// @Tags 菜单
+// @Param menuName query string false "menuName"
+// @Success 200 {string} string "{"code": 200, "data": [...]}"
+// @Success 200 {string} string "{"code": -1, "message": "抱歉未找到相关信息"}"
+// @Router /api/v1/menu/{id} [get]
+// @Security Bearer
+func (e *SysMenu) GetSysMenu(c *gin.Context) {
+	control := new(dto.SysMenuById)
+
+	log := e.GetLogger(c)
+
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//查看详情
+	err = control.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	var object system.SysMenu
+
+	serviceSysMenu := service.SysMenu{}
+	serviceSysMenu.Log = log
+	serviceSysMenu.Orm = db
+	err = serviceSysMenu.GetSysMenu(control, &object)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
+		return
+	}
+
+	e.OK(c, object, "查看成功")
+}
+
+// @Summary 创建菜单
+// @Description 获取JSON
+// @Tags 菜单
+// @Accept  application/x-www-form-urlencoded
+// @Product application/x-www-form-urlencoded
+// @Param menuName formData string true "menuName"
+// @Param Path formData string false "Path"
+// @Param Action formData string true "Action"
+// @Param Permission formData string true "Permission"
+// @Param ParentId formData string true "ParentId"
+// @Param IsDel formData string true "IsDel"
+// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
+// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
+// @Router /api/v1/menu [post]
+// @Security Bearer
+func (e *SysMenu) InsertSysMenu(c *gin.Context) {
+	control := new(dto.SysMenuControl)
+
+	log := e.GetLogger(c)
+
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//新增操作
+	err = control.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	object, err := control.Generate()
+	if err != nil {
+		e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
+		return
+	}
+	// 设置创建人
+	object.SetCreateBy(user.GetUserId(c))
+
+	serviceSysMenu := service.SysMenu{}
+	serviceSysMenu.Orm = db
+	serviceSysMenu.Log = log
+	err = serviceSysMenu.InsertSysMenu(object)
+	if err != nil {
+		log.Error(err)
+		e.Error(c, http.StatusInternalServerError, err, "创建失败")
+		return
+	}
+
+	e.OK(c, object.GetId(), "创建成功")
+}
+
+// @Summary 修改菜单
+// @Description 获取JSON
+// @Tags 菜单
+// @Accept  application/x-www-form-urlencoded
+// @Product application/x-www-form-urlencoded
+// @Param id path int true "id"
+// @Param data body models.Menu true "body"
+// @Success 200 {string} string	"{"code": 200, "message": "修改成功"}"
+// @Success 200 {string} string	"{"code": -1, "message": "修改失败"}"
+// @Router /api/v1/menu/{id} [put]
+// @Security Bearer
+func (e *SysMenu) UpdateSysMenu(c *gin.Context) {
+	control := new(dto.SysMenuControl)
+
+	log := e.GetLogger(c)
+
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//更新操作
+	err = control.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	object, err := control.Generate()
+	if err != nil {
+		e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
+		return
+	}
+	object.SetUpdateBy(user.GetUserId(c))
+
+	serviceSysMenu := service.SysMenu{}
+	serviceSysMenu.Orm = db
+	serviceSysMenu.Log = log
+	err = serviceSysMenu.UpdateSysMenu(object)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+	e.OK(c, object.GetId(), "更新成功")
+}
+
+// @Summary 删除菜单
+// @Description 删除数据
+// @Tags 菜单
+// @Param data body []int true "body"
+// @Success 200 {string} string	"{"code": 200, "message": "删除成功"}"
+// @Success 200 {string} string	"{"code": -1, "message": "删除失败"}"
+// @Router /api/v1/menu/ [delete]
+func (e *SysMenu) DeleteSysMenu(c *gin.Context) {
+	control := new(dto.SysMenuById)
+
+	log := e.GetLogger(c)
+
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//删除操作
+	err = control.Bind(c)
+	if err != nil {
+		log.Errorf("Bind error: %s", err)
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+
+	serviceSysMenu := service.SysMenu{}
+	serviceSysMenu.Orm = db
+	serviceSysMenu.Log = log
+	err = serviceSysMenu.RemoveSysMenu(control)
+	if err != nil {
+		log.Errorf("RemoveSysMenu error, %s", err)
+		e.Error(c, http.StatusInternalServerError, err, "删除失败")
+		return
+	}
+	e.OK(c, control.GetId(), "删除成功")
+}
+
+// @Summary 根据角色名称获取菜单列表数据（左菜单使用）
+// @Description 获取JSON
+// @Tags 菜单
+// @Param id path int true "id"
+// @Success 200 {string} string "{"code": 200, "data": [...]}"
+// @Success 200 {string} string "{"code": -1, "message": "抱歉未找到相关信息"}"
+// @Router /api/v1/menurole [get]
+// @Security Bearer
+func (e *SysMenu) GetMenuRole(c *gin.Context) {
+	log := e.GetLogger(c)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	serviceSysMenu := service.SysMenu{}
+	serviceSysMenu.Log = log
+	serviceSysMenu.Orm = db
+	result, err := serviceSysMenu.SetMenuRole(user.GetRoleName(c))
+
+	if err != nil {
+		e.Error(c, http.StatusInternalServerError, err, "查询失败")
+		return
+	}
+
+	e.OK(c, result, "")
+}
+
+// @Summary 获取角色对应的菜单id数组
+// @Description 获取JSON
+// @Tags 菜单
+// @Param id path int true "id"
+// @Success 200 {string} string "{"code": 200, "data": [...]}"
+// @Success 200 {string} string "{"code": -1, "message": "抱歉未找到相关信息"}"
+// @Router /api/v1/menuids/{id} [get]
+// @Security Bearer
+func (e *SysMenu) GetMenuIDS(c *gin.Context) {
+	log := e.GetLogger(c)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+	var data models.RoleMenu
+	data.RoleName = c.GetString("role")
+	data.UpdateBy = user.GetUserIdStr(c)
+	result, err := data.GetIDS(db)
+	if err != nil {
+		log.Errorf("GetIDS error, %s", err.Error())
+		e.Error(c, http.StatusInternalServerError, err, "获取失败")
+		return
+	}
+	e.OK(c, result, "")
+}
+
+//// GetMenuTreeRoleselect 角色修改中的菜单列表
+//func (e *SysMenu) GetMenuTreeRoleselect(c *gin.Context) {
+//	var Menu models.Menu
+//	var SysRole models.SysRole
+//
+//	id, err := tools.StringToInt(c.Param("roleId"))
+//	SysRole.RoleId = id
+//	//var r *models.SysRole
+//	r, err := SysRole.Get()
+//
+//	var result *[]models.MenuLable
+//	menuIds := make([]int, 0)
+//	if r.RoleKey != "admin" {
+//		result, err = Menu.SetMenuLabel()
+//		tools.HasError(err, "抱歉未找到相关信息", -1)
+//		if id != 0 {
+//			menuIds, err = SysRole.GetRoleMeunId()
+//			tools.HasError(err, "抱歉未找到相关信息", -1)
+//		}
+//	}
+//	app.Custum(c, gin.H{
+//		"code":        200,
+//		"menus":       result,
+//		"checkedKeys": menuIds,
+//	})
+//}
+
+// @Summary 获取菜单树
+// @Description 获取JSON
+// @Tags 菜单
+// @Accept  application/x-www-form-urlencoded
+// @Product application/x-www-form-urlencoded
+// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
+// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
+// @Router /api/v1/menuTreeselect [get]
+// @Security Bearer
+func (e *SysMenu) GetMenuTreeSelect(c *gin.Context) {
+	log := e.GetLogger(c)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	d := new(dto.SelectRole)
+
+	err = c.BindUri(d)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+
+	serviceSysMenu := service.SysMenu{}
+	serviceSysMenu.Log = log
+	serviceSysMenu.Orm = db
+	result, err := serviceSysMenu.SetSysMenuLabel()
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
+		return
+	}
+	s := service.SysRole{}
+	s.Log = log
+	s.Orm = db
+	menuIds, err := s.GetRoleMenuId(db, d.RoleId)
+	if err != nil {
+		log.Errorf("GetIDS error, %s", err.Error())
+		e.Error(c, http.StatusInternalServerError, err, "")
+		return
+	}
+	e.OK(c, gin.H{
+		"menus":       result,
+		"checkedKeys": menuIds,
+	}, "获取成功")
+}

app/admin/apis/system/sys_opera_log/sys_opera_log.go

@@ -0,0 +1,173 @@
+package sys_opera_log
+
+import (
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
+
+	"go-admin/app/admin/models/system"
+	"go-admin/app/admin/service"
+	"go-admin/app/admin/service/dto"
+	"go-admin/common/apis"
+)
+
+type SysOperaLog struct {
+	apis.Api
+}
+
+func (e *SysOperaLog) GetSysOperaLogList(c *gin.Context) {
+	log := e.GetLogger(c)
+	d := new(dto.SysOperaLogSearch)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//查询列表
+	err = d.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+
+	list := make([]system.SysOperaLog, 0)
+	var count int64
+	serviceStudent := service.SysOperaLog{}
+	serviceStudent.Log = log
+	serviceStudent.Orm = db
+	err = serviceStudent.GetSysOperaLogPage(d, &list, &count)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
+		return
+	}
+
+	e.PageOK(c, list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功")
+}
+
+func (e *SysOperaLog) GetSysOperaLog(c *gin.Context) {
+	log := e.GetLogger(c)
+	control := new(dto.SysOperaLogById)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//查看详情
+	err = control.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	var object system.SysOperaLog
+
+	serviceSysOperlog := service.SysOperaLog{}
+	serviceSysOperlog.Log = log
+	serviceSysOperlog.Orm = db
+	err = serviceSysOperlog.GetSysOperaLog(control, &object)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
+		return
+	}
+
+	e.OK(c, object, "查看成功")
+}
+
+func (e *SysOperaLog) InsertSysOperaLog(c *gin.Context) {
+	log := e.GetLogger(c)
+	control := new(dto.SysOperaLogControl)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//新增操作
+	err = control.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	object, err := control.Generate()
+	if err != nil {
+		e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
+		return
+	}
+	// 设置创建人
+	object.SetCreateBy(user.GetUserId(c))
+
+	serviceSysOperaLog := service.SysOperaLog{}
+	serviceSysOperaLog.Orm = db
+	serviceSysOperaLog.Log = log
+	err = serviceSysOperaLog.InsertSysOperaLog(object)
+	if err != nil {
+		log.Error(err)
+		e.Error(c, http.StatusInternalServerError, err, "创建失败")
+		return
+	}
+
+	e.OK(c, object.GetId(), "创建成功")
+}
+
+func (e *SysOperaLog) UpdateSysOperaLog(c *gin.Context) {
+	log := e.GetLogger(c)
+	control := new(dto.SysOperaLogControl)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//更新操作
+	err = control.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	object, err := control.Generate()
+	if err != nil {
+		e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
+		return
+	}
+	object.SetUpdateBy(user.GetUserId(c))
+
+	serviceSysOperaLog := service.SysOperaLog{}
+	serviceSysOperaLog.Orm = db
+	serviceSysOperaLog.Log = log
+	err = serviceSysOperaLog.UpdateSysOperaLog(object)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+	e.OK(c, object.GetId(), "更新成功")
+}
+
+func (e *SysOperaLog) DeleteSysOperaLog(c *gin.Context) {
+	log := e.GetLogger(c)
+	control := new(dto.SysOperaLogById)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//删除操作
+	err = control.Bind(c)
+	if err != nil {
+		log.Errorf("Bind error: %s", err)
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+
+	serviceSysOperaLog := service.SysOperaLog{}
+	serviceSysOperaLog.Orm = db
+	serviceSysOperaLog.Log = log
+	err = serviceSysOperaLog.RemoveSysOperaLog(control)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+	e.OK(c, control.GetId(), "删除成功")
+}

app/admin/apis/system/sys_post/sys_post.go

@@ -0,0 +1,217 @@
+package sys_post
+
+import (
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
+
+	"go-admin/app/admin/models/system"
+	"go-admin/app/admin/service"
+	"go-admin/app/admin/service/dto"
+	"go-admin/common/apis"
+)
+
+type SysPost struct {
+	apis.Api
+}
+
+// @Summary 岗位列表数据
+// @Description 获取JSON
+// @Tags 岗位
+// @Param postName query string false "postName"
+// @Param postCode query string false "postCode"
+// @Param postId query string false "postId"
+// @Param status query string false "status"
+// @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/post [get]
+// @Security Bearer
+func (e *SysPost) GetSysPostList(c *gin.Context) {
+	log := e.GetLogger(c)
+	d := new(dto.SysPostSearch)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//查询列表
+	err = d.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+
+	list := make([]system.SysPost, 0)
+	var count int64
+	serviceStudent := service.SysPost{}
+	serviceStudent.Log = log
+	serviceStudent.Orm = db
+	err = serviceStudent.GetSysPostPage(d, &list, &count)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
+		return
+	}
+
+	e.PageOK(c, list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功")
+}
+
+// @Summary 获取岗位信息
+// @Description 获取JSON
+// @Tags 岗位
+// @Param postId path int true "postId"
+// @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/post/{postId} [get]
+// @Security Bearer
+func (e *SysPost) GetSysPost(c *gin.Context) {
+	log := e.GetLogger(c)
+	control := new(dto.SysPostById)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//查看详情
+	err = control.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	var object system.SysPost
+
+	serviceSysOperlog := service.SysPost{}
+	serviceSysOperlog.Log = log
+	serviceSysOperlog.Orm = db
+	err = serviceSysOperlog.GetSysPost(control, &object)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
+		return
+	}
+
+	e.OK(c, object, "查看成功")
+}
+
+// @Summary 添加岗位
+// @Description 获取JSON
+// @Tags 岗位
+// @Accept  application/json
+// @Product application/json
+// @Param data body models.Post true "data"
+// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
+// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
+// @Router /api/v1/post [post]
+// @Security Bearer
+func (e *SysPost) InsertSysPost(c *gin.Context) {
+	log := e.GetLogger(c)
+	control := new(dto.SysPostControl)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//新增操作
+	err = control.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	object, err := control.Generate()
+	if err != nil {
+		e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
+		return
+	}
+	// 设置创建人
+	object.SetCreateBy(user.GetUserId(c))
+
+	serviceSysPost := service.SysPost{}
+	serviceSysPost.Orm = db
+	serviceSysPost.Log = log
+	err = serviceSysPost.InsertSysPost(object)
+	if err != nil {
+		log.Error(err)
+		e.Error(c, http.StatusInternalServerError, err, "创建失败")
+		return
+	}
+
+	e.OK(c, object.GetId(), "创建成功")
+}
+
+// @Summary 修改岗位
+// @Description 获取JSON
+// @Tags 岗位
+// @Accept  application/json
+// @Product application/json
+// @Param data body models.Post true "body"
+// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
+// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
+// @Router /api/v1/post/ [put]
+// @Security Bearer
+func (e *SysPost) UpdateSysPost(c *gin.Context) {
+	log := e.GetLogger(c)
+	control := new(dto.SysPostControl)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//更新操作
+	err = control.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	object, err := control.Generate()
+	if err != nil {
+		e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
+		return
+	}
+	object.SetUpdateBy(user.GetUserId(c))
+
+	serviceSysPost := service.SysPost{}
+	serviceSysPost.Orm = db
+	serviceSysPost.Log = log
+	err = serviceSysPost.UpdateSysPost(object)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+	e.OK(c, object.GetId(), "更新成功")
+}
+
+// @Summary 删除岗位
+// @Description 删除数据
+// @Tags 岗位
+// @Param id path int true "id"
+// @Success 200 {string} string	"{"code": 200, "message": "删除成功"}"
+// @Success 500 {string} string	"{"code": 500, "message": "删除失败"}"
+// @Router /api/v1/post/{postId} [delete]
+func (e *SysPost) DeleteSysPost(c *gin.Context) {
+	log := e.GetLogger(c)
+	control := new(dto.SysPostById)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//删除操作
+	err = control.Bind(c)
+	if err != nil {
+		log.Errorf("Bind error: %s", err)
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+
+	serviceSysPost := service.SysPost{}
+	serviceSysPost.Orm = db
+	serviceSysPost.Log = log
+	err = serviceSysPost.RemoveSysPost(control)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+	e.OK(c, control.GetId(), "删除成功")
+}

app/admin/apis/system/sys_role/sys_role.go

@@ -0,0 +1,272 @@
+package sys_role
+
+import (
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
+
+	"go-admin/app/admin/models/system"
+	"go-admin/app/admin/service"
+	"go-admin/app/admin/service/dto"
+	"go-admin/common/apis"
+	"go-admin/common/global"
+)
+
+type SysRole struct {
+	apis.Api
+}
+
+// @Summary 角色列表数据
+// @Description Get JSON
+// @Tags 角色/Role
+// @Param roleName query string false "roleName"
+// @Param status query string false "status"
+// @Param roleKey query string false "roleKey"
+// @Param pageSize query int false "页条数"
+// @Param pageIndex query int false "页码"
+// @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/role [get]
+// @Security Bearer
+func (e *SysRole) GetSysRoleList(c *gin.Context) {
+	log := e.GetLogger(c)
+	d := new(dto.SysRoleSearch)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//查询列表
+	err = d.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+
+	list := make([]system.SysRole, 0)
+	var count int64
+	s := service.SysRole{}
+	s.Log = log
+	s.Orm = db
+	err = s.GetSysRolePage(d, &list, &count)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
+		return
+	}
+
+	e.PageOK(c, list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功")
+}
+
+// @Summary 获取Role数据
+// @Description 获取JSON
+// @Tags 角色/Role
+// @Param roleId path string false "roleId"
+// @Success 200 {string} string "{"code": 200, "data": [...]}"
+// @Success 200 {string} string "{"code": -1, "message": "抱歉未找到相关信息"}"
+// @Router /api/v1/role/{id} [get]
+// @Security Bearer
+func (e *SysRole) GetSysRole(c *gin.Context) {
+	log := e.GetLogger(c)
+	control := new(dto.SysRoleById)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//查看详情
+	err = control.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	var object system.SysRole
+
+	s := service.SysRole{}
+	s.Log = log
+	s.Orm = db
+	err = s.GetSysRole(control, &object)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
+		return
+	}
+
+	e.OK(c, object, "查看成功")
+}
+
+// @Summary 创建角色
+// @Description 获取JSON
+// @Tags 角色/Role
+// @Accept  application/json
+// @Product application/json
+// @Param data body models.SysRole true "data"
+// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
+// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
+// @Router /api/v1/role [post]
+// @Security Bearer
+func (e *SysRole) InsertSysRole(c *gin.Context) {
+	log := e.GetLogger(c)
+	control := new(dto.SysRoleControl)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//新增操作
+	err = control.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	object, err := control.Generate()
+	if err != nil {
+		e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
+		return
+	}
+	// 设置创建人
+	object.CreateBy = user.GetUserId(c)
+	if object.Status == "" {
+		object.Status = "2"
+	}
+
+	s := service.SysRole{}
+	s.Orm = db
+	s.Log = log
+	err = s.InsertSysRole(object)
+	if err != nil {
+		log.Error(err)
+		e.Error(c, http.StatusInternalServerError, err, "创建失败")
+		return
+	}
+	_, err = global.LoadPolicy(c)
+	if err != nil {
+		e.Error(c, http.StatusInternalServerError, err, "")
+		return
+	}
+	e.OK(c, object.GetId(), "创建成功")
+}
+
+// @Summary 修改用户角色
+// @Description 获取JSON
+// @Tags 角色/Role
+// @Accept  application/json
+// @Product application/json
+// @Param data body models.SysRole true "body"
+// @Success 200 {string} string	"{"code": 200, "message": "修改成功"}"
+// @Success 200 {string} string	"{"code": -1, "message": "修改失败"}"
+// @Router /api/v1/role/{id} [put]
+// @Security Bearer
+func (e *SysRole) UpdateSysRole(c *gin.Context) {
+	log := e.GetLogger(c)
+	control := new(dto.SysRoleControl)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//更新操作
+	err = control.Bind(c)
+	if err != nil {
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	object, err := control.Generate()
+	if err != nil {
+		e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
+		return
+	}
+	object.UpdateBy = user.GetUserId(c)
+
+	s := service.SysRole{}
+	s.Orm = db
+	s.Log = log
+	err = s.UpdateSysRole(object)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+	_, err = global.LoadPolicy(c)
+	if err != nil {
+		e.Error(c, http.StatusInternalServerError, err, "")
+		return
+	}
+	e.OK(c, object.GetId(), "更新成功")
+}
+
+// @Summary 删除用户角色
+// @Description 删除数据
+// @Tags 角色/Role
+// @Param data body dto.SysRoleById true "body"
+// @Success 200 {string} string	"{"code": 200, "message": "删除成功"}"
+// @Success 200 {string} string	"{"code": -1, "message": "删除失败"}"
+// @Router /api/v1/role [delete]
+// @Security Bearer
+func (e *SysRole) DeleteSysRole(c *gin.Context) {
+	log := e.GetLogger(c)
+	control := new(dto.SysRoleById)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//删除操作
+	err = control.Bind(c)
+	if err != nil {
+		log.Errorf("Bind error: %s", err)
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+
+	s := service.SysRole{}
+	s.Orm = db
+	s.Log = log
+	err = s.RemoveSysRole(control)
+	if err != nil {
+		log.Error(err)
+		e.Error(c, http.StatusInternalServerError, err, "")
+		return
+	}
+	_, err = global.LoadPolicy(c)
+	if err != nil {
+		e.Error(c, http.StatusInternalServerError, err, "")
+		return
+	}
+	e.OK(c, control.GetId(), "删除成功")
+}
+
+func (e *SysRole) UpdateRoleDataScope(c *gin.Context) {
+	log := e.GetLogger(c)
+	control := new(dto.RoleDataScopeReq)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//更新操作
+	err = c.Bind(control)
+	if err != nil {
+		log.Errorf("request bind error, %s", err.Error())
+		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+		return
+	}
+	data := &system.SysRole{
+		RoleId:    control.RoleId,
+		DataScope: control.DataScope,
+		DeptIds:   control.DeptIds,
+	}
+	data.UpdateBy = user.GetUserId(c)
+	s := &service.SysRole{}
+	s.Orm = db
+	s.Log = log
+	err = s.UpdateDataScope(data)
+	if err != nil {
+		e.Error(c, http.StatusInternalServerError, err, "")
+		return
+	}
+	e.OK(c, nil, "操作成功")
+}

app/admin/apis/tools/dbcolumns.go

@@ -1,11 +1,14 @@
 package tools
 
 import (
-	"github.com/gin-gonic/gin"
-	"go-admin/models/tools"
-	tools2 "go-admin/tools"
-	"go-admin/tools/app"
 	"net/http"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
+
+	"go-admin/app/admin/models/tools"
+	"go-admin/common/apis"
 )
 
 // @Summary 分页列表数据 / page list data
@@ -17,23 +20,31 @@ import (
 // @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
 // @Router /api/v1/db/columns/page [get]
 func GetDBColumnList(c *gin.Context) {
+	log := apis.GetRequestLogger(c)
 	var data tools.DBColumns
 	var err error
 	var pageSize = 10
 	var pageIndex = 1
 
 	if size := c.Request.FormValue("pageSize"); size != "" {
-		pageSize = tools2.StrToInt(err, size)
+		pageSize, err = pkg.StringToInt(size)
 	}
 
 	if index := c.Request.FormValue("pageIndex"); index != "" {
-		pageIndex = tools2.StrToInt(err, index)
+		pageIndex, err = pkg.StringToInt(index)
+	}
+
+	db, err := pkg.GetOrm(c)
+	if err != nil {
+		log.Errorf("get db connection error, %s", err.Error())
+		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
+		return
 	}
 
 	data.TableName = c.Request.FormValue("tableName")
-	tools2.Assert(data.TableName == "", "table name cannot be empty！", 500)
-	result, count, err := data.GetPage(pageSize, pageIndex)
-	tools2.HasError(err, "", -1)
+	pkg.Assert(data.TableName == "", "table name cannot be empty！", 500)
+	result, count, err := data.GetPage(db, pageSize, pageIndex)
+	pkg.HasError(err, "", -1)
 
 	var mp = make(map[string]interface{}, 3)
 	mp["list"] = result

app/admin/apis/tools/dbtables.go

@@ -1,12 +1,15 @@
 package tools
 
 import (
-	"github.com/gin-gonic/gin"
-	"go-admin/models/tools"
-	tools2 "go-admin/tools"
-	"go-admin/tools/app"
-	"go-admin/tools/config"
 	"net/http"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/config"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
+
+	"go-admin/app/admin/models/tools"
+	"go-admin/common/apis"
 )
 
 // @Summary 分页列表数据 / page list data
@@ -23,6 +26,7 @@ func GetDBTableList(c *gin.Context) {
 	var err error
 	var pageSize = 10
 	var pageIndex = 1
+	log := apis.GetRequestLogger(c)
 	if config.DatabaseConfig.Driver == "sqlite3" || config.DatabaseConfig.Driver == "postgres" {
 		res.Msg = "对不起，sqlite3 或 postgres 不支持代码生成！"
 		c.JSON(http.StatusOK, res.ReturnError(500))
@@ -30,16 +34,23 @@ func GetDBTableList(c *gin.Context) {
 	}
 
 	if size := c.Request.FormValue("pageSize"); size != "" {
-		pageSize = tools2.StrToInt(err, size)
+		pageSize, err = pkg.StringToInt(size)
 	}
 
 	if index := c.Request.FormValue("pageIndex"); index != "" {
-		pageIndex = tools2.StrToInt(err, index)
+		pageIndex, err = pkg.StringToInt(index)
+	}
+
+	db, err := pkg.GetOrm(c)
+	if err != nil {
+		log.Errorf("get db connection error, %s", err.Error())
+		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
+		return
 	}
 
 	data.TableName = c.Request.FormValue("tableName")
-	result, count, err := data.GetPage(pageSize, pageIndex)
-	tools2.HasError(err, "", -1)
+	result, count, err := data.GetPage(db, pageSize, pageIndex)
+	pkg.HasError(err, "", -1)
 
 	var mp = make(map[string]interface{}, 3)
 	mp["list"] = result

app/admin/apis/tools/gen.go

@@ -0,0 +1,441 @@
+package tools
+
+import (
+	"bytes"
+	"net/http"
+	"text/template"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/config"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
+
+	"go-admin/app/admin/models"
+	"go-admin/app/admin/models/tools"
+	"go-admin/common/apis"
+)
+
+func Preview(c *gin.Context) {
+	log := apis.GetRequestLogger(c)
+	table := tools.SysTables{}
+	id, err := pkg.StringToInt(c.Param("tableId"))
+	pkg.HasError(err, "", -1)
+	table.TableId = id
+	t1, err := template.ParseFiles("template/v4/model.go.template")
+	pkg.HasError(err, "", -1)
+	t2, err := template.ParseFiles("template/v4/no_actions/apis.go.template")
+	pkg.HasError(err, "", -1)
+	t3, err := template.ParseFiles("template/v4/js.go.template")
+	pkg.HasError(err, "", -1)
+	t4, err := template.ParseFiles("template/v4/vue.go.template")
+	pkg.HasError(err, "", -1)
+	t5, err := template.ParseFiles("template/v4/no_actions/router_check_role.go.template")
+	pkg.HasError(err, "", -1)
+	t6, err := template.ParseFiles("template/v4/dto.go.template")
+	pkg.HasError(err, "", -1)
+	t7, err := template.ParseFiles("template/v4/no_actions/service.go.template")
+	pkg.HasError(err, "", -1)
+
+	db, err := pkg.GetOrm(c)
+	if err != nil {
+		log.Errorf("get db connection error, %s", err.Error())
+		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
+		return
+	}
+
+	tab, _ := table.Get(db)
+	var b1 bytes.Buffer
+	err = t1.Execute(&b1, tab)
+	var b2 bytes.Buffer
+	err = t2.Execute(&b2, tab)
+	var b3 bytes.Buffer
+	err = t3.Execute(&b3, tab)
+	var b4 bytes.Buffer
+	err = t4.Execute(&b4, tab)
+	var b5 bytes.Buffer
+	err = t5.Execute(&b5, tab)
+	var b6 bytes.Buffer
+	err = t6.Execute(&b6, tab)
+	var b7 bytes.Buffer
+	err = t7.Execute(&b7, tab)
+
+	mp := make(map[string]interface{})
+	mp["template/model.go.template"] = b1.String()
+	mp["template/api.go.template"] = b2.String()
+	mp["template/js.go.template"] = b3.String()
+	mp["template/vue.go.template"] = b4.String()
+	mp["template/router.go.template"] = b5.String()
+	mp["template/dto.go.template"] = b6.String()
+	mp["template/service.go.template"] = b7.String()
+	var res app.Response
+	res.Data = mp
+
+	c.JSON(http.StatusOK, res.ReturnOK())
+}
+
+func GenCodeV3(c *gin.Context) {
+	log := apis.GetRequestLogger(c)
+	table := tools.SysTables{}
+	id, err := pkg.StringToInt(c.Param("tableId"))
+	pkg.HasError(err, "", -1)
+
+	db, err := pkg.GetOrm(c)
+	if err != nil {
+		log.Errorf("get db connection error, %s", err.Error())
+		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
+		return
+	}
+
+	table.TableId = id
+	tab, _ := table.Get(db)
+
+	if tab.IsActions == 1 {
+		ActionsGenV3(tab)
+	} else {
+		NOActionsGenV3(tab)
+	}
+
+	app.OK(c, "", "Code generated successfully！")
+}
+
+func NOActionsGenV3(tab tools.SysTables) {
+
+	basePath := "template/v4/"
+	routerFile := basePath + "no_actions/router_check_role.go.template"
+
+	if tab.IsAuth == 2 {
+		routerFile = basePath + "no_actions/router_no_check_role.go.template"
+	}
+
+	t1, err := template.ParseFiles(basePath + "model.go.template")
+	pkg.HasError(err, "", -1)
+	t2, err := template.ParseFiles(basePath + "no_actions/apis.go.template")
+	pkg.HasError(err, "", -1)
+	t3, err := template.ParseFiles(routerFile)
+	pkg.HasError(err, "", -1)
+	t4, err := template.ParseFiles(basePath + "js.go.template")
+	pkg.HasError(err, "", -1)
+	t5, err := template.ParseFiles(basePath + "vue.go.template")
+	pkg.HasError(err, "", -1)
+	t6, err := template.ParseFiles(basePath + "dto.go.template")
+	pkg.HasError(err, "", -1)
+	t7, err := template.ParseFiles(basePath + "no_actions/service.go.template")
+	pkg.HasError(err, "", -1)
+
+	_ = pkg.PathCreate("./app/" + tab.PackageName + "/apis/" + tab.ModuleName)
+	_ = pkg.PathCreate("./app/" + tab.PackageName + "/models/")
+	_ = pkg.PathCreate("./app/" + tab.PackageName + "/router/")
+	_ = pkg.PathCreate("./app/" + tab.PackageName + "/service/dto/")
+	_ = pkg.PathCreate(config.GenConfig.FrontPath + "/api/")
+	_ = pkg.PathCreate(config.GenConfig.FrontPath + "/views/" + tab.BusinessName)
+
+	var b1 bytes.Buffer
+	err = t1.Execute(&b1, tab)
+	var b2 bytes.Buffer
+	err = t2.Execute(&b2, tab)
+	var b3 bytes.Buffer
+	err = t3.Execute(&b3, tab)
+	var b4 bytes.Buffer
+	err = t4.Execute(&b4, tab)
+	var b5 bytes.Buffer
+	err = t5.Execute(&b5, tab)
+	var b6 bytes.Buffer
+	err = t6.Execute(&b6, tab)
+	var b7 bytes.Buffer
+	err = t7.Execute(&b7, tab)
+	pkg.FileCreate(b1, "./app/"+tab.PackageName+"/models/"+tab.BusinessName+".go")
+	pkg.FileCreate(b2, "./app/"+tab.PackageName+"/apis/"+tab.ModuleName+"/"+tab.BusinessName+".go")
+	pkg.FileCreate(b3, "./app/"+tab.PackageName+"/router/"+tab.BusinessName+".go")
+	pkg.FileCreate(b4, config.GenConfig.FrontPath+"/api/"+tab.BusinessName+".js")
+	pkg.FileCreate(b5, config.GenConfig.FrontPath+"/views/"+tab.BusinessName+"/index.vue")
+	pkg.FileCreate(b6, "./app/"+tab.PackageName+"/service/dto/"+tab.BusinessName+".go")
+	pkg.FileCreate(b7, "./app/"+tab.PackageName+"/service/"+tab.BusinessName+".go")
+
+}
+
+func ActionsGenV3(tab tools.SysTables) {
+	basePath := "template/v4/"
+	routerFile := basePath + "actions/router_check_role.go.template"
+
+	if tab.IsAuth == 2 {
+		routerFile = basePath + "actions/router_no_check_role.go.template"
+	}
+
+	t1, err := template.ParseFiles(basePath + "model.go.template")
+	pkg.HasError(err, "", -1)
+	t3, err := template.ParseFiles(routerFile)
+	pkg.HasError(err, "", -1)
+	t4, err := template.ParseFiles(basePath + "js.go.template")
+	pkg.HasError(err, "", -1)
+	t5, err := template.ParseFiles(basePath + "vue.go.template")
+	pkg.HasError(err, "", -1)
+	t6, err := template.ParseFiles(basePath + "dto.go.template")
+	pkg.HasError(err, "", -1)
+
+	_ = pkg.PathCreate("./app/" + tab.PackageName + "/models/")
+	_ = pkg.PathCreate("./app/" + tab.PackageName + "/router/")
+	_ = pkg.PathCreate("./app/" + tab.PackageName + "/service/dto/")
+	_ = pkg.PathCreate(config.GenConfig.FrontPath + "/api/")
+	_ = pkg.PathCreate(config.GenConfig.FrontPath + "/views/" + tab.BusinessName)
+
+	var b1 bytes.Buffer
+	err = t1.Execute(&b1, tab)
+	var b3 bytes.Buffer
+	err = t3.Execute(&b3, tab)
+	var b4 bytes.Buffer
+	err = t4.Execute(&b4, tab)
+	var b5 bytes.Buffer
+	err = t5.Execute(&b5, tab)
+	var b6 bytes.Buffer
+	err = t6.Execute(&b6, tab)
+
+	pkg.FileCreate(b1, "./app/"+tab.PackageName+"/models/"+tab.BusinessName+".go")
+	pkg.FileCreate(b3, "./app/"+tab.PackageName+"/router/"+tab.BusinessName+".go")
+	pkg.FileCreate(b4, config.GenConfig.FrontPath+"/api/"+tab.BusinessName+".js")
+	pkg.FileCreate(b5, config.GenConfig.FrontPath+"/views/"+tab.BusinessName+"/index.vue")
+	pkg.FileCreate(b6, "./app/"+tab.PackageName+"/service/dto/"+tab.BusinessName+".go")
+}
+
+func GenMenuAndApi(c *gin.Context) {
+	log := apis.GetRequestLogger(c)
+
+	table := tools.SysTables{}
+	timeNow := pkg.GetCurrentTime()
+	id, err := pkg.StringToInt(c.Param("tableId"))
+	pkg.HasError(err, "", -1)
+
+	db, err := pkg.GetOrm(c)
+	if err != nil {
+		log.Errorf("get db connection error, %s", err.Error())
+		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
+		return
+	}
+
+	table.TableId = id
+	tab, _ := table.Get(db)
+	Mmenu := models.Menu{}
+	Mmenu.MenuName = tab.TBName + "Manage"
+	Mmenu.Title = tab.TableComment
+	Mmenu.Icon = "pass"
+	Mmenu.Path = "/" + tab.TBName
+	Mmenu.MenuType = "M"
+	Mmenu.Action = "无"
+	Mmenu.ParentId = 0
+	Mmenu.NoCache = false
+	Mmenu.Component = "Layout"
+	Mmenu.Sort = 0
+	Mmenu.Visible = "0"
+	Mmenu.IsFrame = "0"
+	Mmenu.CreateBy = "1"
+	Mmenu.UpdateBy = "1"
+	Mmenu.CreatedAt = timeNow
+	Mmenu.UpdatedAt = timeNow
+	Mmenu.MenuId, err = Mmenu.Create(db)
+
+	Cmenu := models.Menu{}
+	Cmenu.MenuName = tab.TBName
+	Cmenu.Title = tab.TableComment
+	Cmenu.Icon = "pass"
+	Cmenu.Path = tab.TBName
+	Cmenu.MenuType = "C"
+	Cmenu.Action = "无"
+	Cmenu.Permission = tab.PackageName + ":" + tab.BusinessName + ":list"
+	Cmenu.ParentId = Mmenu.MenuId
+	Cmenu.NoCache = false
+	Cmenu.Component = "/" + tab.BusinessName + "/index"
+	Cmenu.Sort = 0
+	Cmenu.Visible = "0"
+	Cmenu.IsFrame = "0"
+	Cmenu.CreateBy = "1"
+	Cmenu.UpdateBy = "1"
+	Cmenu.CreatedAt = timeNow
+	Cmenu.UpdatedAt = timeNow
+	Cmenu.MenuId, err = Cmenu.Create(db)
+
+	MList := models.Menu{}
+	MList.MenuName = ""
+	MList.Title = "分页获取" + tab.TableComment
+	MList.Icon = ""
+	MList.Path = tab.TBName
+	MList.MenuType = "F"
+	MList.Action = "无"
+	MList.Permission = tab.PackageName + ":" + tab.BusinessName + ":query"
+	MList.ParentId = Cmenu.MenuId
+	MList.NoCache = false
+	MList.Sort = 0
+	MList.Visible = "0"
+	MList.IsFrame = "0"
+	MList.CreateBy = "1"
+	MList.UpdateBy = "1"
+	MList.CreatedAt = timeNow
+	MList.UpdatedAt = timeNow
+	MList.MenuId, err = MList.Create(db)
+
+	MCreate := models.Menu{}
+	MCreate.MenuName = ""
+	MCreate.Title = "创建" + tab.TableComment
+	MCreate.Icon = ""
+	MCreate.Path = tab.TBName
+	MCreate.MenuType = "F"
+	MCreate.Action = "无"
+	MCreate.Permission = tab.PackageName + ":" + tab.BusinessName + ":add"
+	MCreate.ParentId = Cmenu.MenuId
+	MCreate.NoCache = false
+	MCreate.Sort = 0
+	MCreate.Visible = "0"
+	MCreate.IsFrame = "0"
+	MCreate.CreateBy = "1"
+	MCreate.UpdateBy = "1"
+	MCreate.CreatedAt = timeNow
+	MCreate.UpdatedAt = timeNow
+	MCreate.MenuId, err = MCreate.Create(db)
+
+	MUpdate := models.Menu{}
+	MUpdate.MenuName = ""
+	MUpdate.Title = "修改" + tab.TableComment
+	MUpdate.Icon = ""
+	MUpdate.Path = tab.TBName
+	MUpdate.MenuType = "F"
+	MUpdate.Action = "无"
+	MUpdate.Permission = tab.PackageName + ":" + tab.BusinessName + ":edit"
+	MUpdate.ParentId = Cmenu.MenuId
+	MUpdate.NoCache = false
+	MUpdate.Sort = 0
+	MUpdate.Visible = "0"
+	MUpdate.IsFrame = "0"
+	MUpdate.CreateBy = "1"
+	MUpdate.UpdateBy = "1"
+	MUpdate.CreatedAt = timeNow
+	MUpdate.UpdatedAt = timeNow
+	MUpdate.MenuId, err = MUpdate.Create(db)
+
+	MDelete := models.Menu{}
+	MDelete.MenuName = ""
+	MDelete.Title = "删除" + tab.TableComment
+	MDelete.Icon = ""
+	MDelete.Path = tab.TBName
+	MDelete.MenuType = "F"
+	MDelete.Action = "无"
+	MDelete.Permission = tab.PackageName + ":" + tab.BusinessName + ":remove"
+	MDelete.ParentId = Cmenu.MenuId
+	MDelete.NoCache = false
+	MDelete.Sort = 0
+	MDelete.Visible = "0"
+	MDelete.IsFrame = "0"
+	MDelete.CreateBy = "1"
+	MDelete.UpdateBy = "1"
+	MDelete.CreatedAt = timeNow
+	MDelete.UpdatedAt = timeNow
+	MDelete.MenuId, err = MDelete.Create(db)
+
+	var InterfaceId = 63
+	Amenu := models.Menu{}
+	Amenu.MenuName = tab.TBName
+	Amenu.Title = tab.TableComment
+	Amenu.Icon = "bug"
+	Amenu.Path = tab.TBName
+	Amenu.MenuType = "M"
+	Amenu.Action = "无"
+	Amenu.ParentId = InterfaceId
+	Amenu.NoCache = false
+	Amenu.Sort = 0
+	Amenu.Visible = "1"
+	Amenu.IsFrame = "0"
+	Amenu.CreateBy = "1"
+	Amenu.UpdateBy = "1"
+	Amenu.CreatedAt = timeNow
+	Amenu.UpdatedAt = timeNow
+	Amenu.MenuId, err = Amenu.Create(db)
+
+	AList := models.Menu{}
+	AList.MenuName = ""
+	AList.Title = "分页获取" + tab.TableComment
+	AList.Icon = "bug"
+	AList.Path = "/api/v1/" + tab.ModuleName
+	AList.MenuType = "A"
+	AList.Action = "GET"
+	AList.ParentId = Amenu.MenuId
+	AList.NoCache = false
+	AList.Sort = 0
+	AList.Visible = "1"
+	AList.IsFrame = "0"
+	AList.CreateBy = "1"
+	AList.UpdateBy = "1"
+	AList.CreatedAt = timeNow
+	AList.UpdatedAt = timeNow
+	AList.MenuId, err = AList.Create(db)
+
+	AGet := models.Menu{}
+	AGet.MenuName = ""
+	AGet.Title = "根据id获取" + tab.TableComment
+	AGet.Icon = "bug"
+	AGet.Path = "/api/v1/" + tab.ModuleName + "/:id"
+	AGet.MenuType = "A"
+	AGet.Action = "GET"
+	AGet.ParentId = Amenu.MenuId
+	AGet.NoCache = false
+	AGet.Sort = 0
+	AGet.Visible = "1"
+	AGet.IsFrame = "0"
+	AGet.CreateBy = "1"
+	AGet.UpdateBy = "1"
+	AGet.CreatedAt = timeNow
+	AGet.UpdatedAt = timeNow
+	AGet.MenuId, err = AGet.Create(db)
+
+	ACreate := models.Menu{}
+	ACreate.MenuName = ""
+	ACreate.Title = "创建" + tab.TableComment
+	ACreate.Icon = "bug"
+	ACreate.Path = "/api/v1/" + tab.ModuleName
+	ACreate.MenuType = "A"
+	ACreate.Action = "POST"
+	ACreate.ParentId = Amenu.MenuId
+	ACreate.NoCache = false
+	ACreate.Sort = 0
+	ACreate.Visible = "1"
+	ACreate.IsFrame = "0"
+	ACreate.CreateBy = "1"
+	ACreate.UpdateBy = "1"
+	ACreate.CreatedAt = timeNow
+	ACreate.UpdatedAt = timeNow
+	ACreate.MenuId, err = ACreate.Create(db)
+
+	AUpdate := models.Menu{}
+	AUpdate.MenuName = ""
+	AUpdate.Title = "修改" + tab.TableComment
+	AUpdate.Icon = "bug"
+	AUpdate.Path = "/api/v1/" + tab.ModuleName + "/:id"
+	AUpdate.MenuType = "A"
+	AUpdate.Action = "PUT"
+	AUpdate.ParentId = Amenu.MenuId
+	AUpdate.NoCache = false
+	AUpdate.Sort = 0
+	AUpdate.Visible = "1"
+	AUpdate.IsFrame = "0"
+	AUpdate.CreateBy = "1"
+	AUpdate.UpdateBy = "1"
+	AUpdate.CreatedAt = timeNow
+	AUpdate.UpdatedAt = timeNow
+	AUpdate.MenuId, err = AUpdate.Create(db)
+
+	ADelete := models.Menu{}
+	ADelete.MenuName = ""
+	ADelete.Title = "删除" + tab.TableComment
+	ADelete.Icon = "bug"
+	ADelete.Path = "/api/v1/" + tab.ModuleName
+	ADelete.MenuType = "A"
+	ADelete.Action = "DELETE"
+	ADelete.ParentId = Amenu.MenuId
+	ADelete.NoCache = false
+	ADelete.Sort = 0
+	ADelete.Visible = "1"
+	ADelete.IsFrame = "0"
+	ADelete.CreateBy = "1"
+	ADelete.UpdateBy = "1"
+	ADelete.CreatedAt = timeNow
+	ADelete.UpdatedAt = timeNow
+	ADelete.MenuId, err = ADelete.Create(db)
+
+	app.OK(c, "", "数据生成成功！")
+}

app/admin/apis/tools/systables.go

@@ -1,12 +1,17 @@
 package tools
 
 import (
-	"github.com/gin-gonic/gin"
-	"go-admin/models/tools"
-	tools2 "go-admin/tools"
-	"go-admin/tools/app"
 	"net/http"
 	"strings"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
+	"gorm.io/gorm"
+
+	"go-admin/app/admin/models/tools"
+	"go-admin/common/apis"
 )
 
 // @Summary 分页列表数据
@@ -18,23 +23,31 @@ import (
 // @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
 // @Router /api/v1/sys/tables/page [get]
 func GetSysTableList(c *gin.Context) {
+	log := apis.GetRequestLogger(c)
 	var data tools.SysTables
 	var err error
 	var pageSize = 10
 	var pageIndex = 1
 
 	if size := c.Request.FormValue("pageSize"); size != "" {
-		pageSize, err = tools2.StringToInt(size)
+		pageSize, err = pkg.StringToInt(size)
 	}
 
 	if index := c.Request.FormValue("pageIndex"); index != "" {
-		pageIndex, err = tools2.StringToInt(index)
+		pageIndex, err = pkg.StringToInt(index)
+	}
+
+	db, err := pkg.GetOrm(c)
+	if err != nil {
+		log.Errorf("get db connection error, %s", err.Error())
+		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
+		return
 	}
 
 	data.TBName = c.Request.FormValue("tableName")
 	data.TableComment = c.Request.FormValue("tableComment")
-	result, count, err := data.GetPage(pageSize, pageIndex)
-	tools2.HasError(err, "", -1)
+	result, count, err := data.GetPage(db, pageSize, pageIndex)
+	pkg.HasError(err, "", -1)
 
 	var mp = make(map[string]interface{}, 3)
 	mp["list"] = result
@@ -56,20 +69,71 @@ func GetSysTableList(c *gin.Context) {
 // @Router /api/v1/sys/tables/info/{tableId} [get]
 // @Security Bearer
 func GetSysTables(c *gin.Context) {
+	log := apis.GetRequestLogger(c)
+	db, err := pkg.GetOrm(c)
+	if err != nil {
+		log.Errorf("get db connection error, %s", err.Error())
+		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
+		return
+	}
+
 	var data tools.SysTables
-	data.TableId, _ = tools2.StringToInt(c.Param("tableId"))
-	result, err := data.Get()
-	tools2.HasError(err, "抱歉未找到相关信息", -1)
+	data.TableId, _ = pkg.StringToInt(c.Param("tableId"))
+	result, err := data.Get(db)
+	pkg.HasError(err, "抱歉未找到相关信息", -1)
 
 	var res app.Response
 	res.Data = result
 	mp := make(map[string]interface{})
-	mp["rows"] = result.Columns
+	mp["list"] = result.Columns
 	mp["info"] = result
 	res.Data = mp
 	c.JSON(http.StatusOK, res.ReturnOK())
 }
 
+func GetSysTablesInfo(c *gin.Context) {
+	log := apis.GetRequestLogger(c)
+	db, err := pkg.GetOrm(c)
+	if err != nil {
+		log.Errorf("get db connection error, %s", err.Error())
+		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
+		return
+	}
+
+	var data tools.SysTables
+	if c.Request.FormValue("tableName") != "" {
+		data.TBName = c.Request.FormValue("tableName")
+	}
+	result, err := data.Get(db)
+	pkg.HasError(err, "抱歉未找到相关信息", -1)
+
+	var res app.Response
+	res.Data = result
+	mp := make(map[string]interface{})
+	mp["list"] = result.Columns
+	mp["info"] = result
+	res.Data = mp
+	c.JSON(http.StatusOK, res.ReturnOK())
+}
+
+func GetSysTablesTree(c *gin.Context) {
+	log := apis.GetRequestLogger(c)
+	db, err := pkg.GetOrm(c)
+	if err != nil {
+		log.Errorf("get db connection error, %s", err.Error())
+		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
+		return
+	}
+
+	var data tools.SysTables
+	result, err := data.GetTree(db)
+	pkg.HasError(err, "抱歉未找到相关信息", -1)
+
+	var res app.Response
+	res.Data = result
+	c.JSON(http.StatusOK, res.ReturnOK())
+}
+
 // @Summary 添加表结构
 // @Description 添加表结构
 // @Tags 工具 - 生成表
@@ -81,14 +145,21 @@ func GetSysTables(c *gin.Context) {
 // @Router /api/v1/sys/tables/info [post]
 // @Security Bearer
 func InsertSysTable(c *gin.Context) {
+	log := apis.GetRequestLogger(c)
+	db, err := pkg.GetOrm(c)
+	if err != nil {
+		log.Errorf("get db connection error, %s", err.Error())
+		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
+		return
+	}
 
 	tablesList := strings.Split(c.Request.FormValue("tables"), ",")
 	for i := 0; i < len(tablesList); i++ {
 
-		data, err := genTableInit(tablesList, i, c)
+		data, err := genTableInit(db, tablesList, i, c)
 
-		_, err = data.Create()
-		tools2.HasError(err, "", -1)
+		_, err = data.Create(db)
+		pkg.HasError(err, "", -1)
 	}
 	var res app.Response
 	res.Msg = "添加成功！"
@@ -96,15 +167,15 @@ func InsertSysTable(c *gin.Context) {
 
 }
 
-func genTableInit(tablesList []string, i int, c *gin.Context) (tools.SysTables, error) {
+func genTableInit(tx *gorm.DB, tablesList []string, i int, c *gin.Context) (tools.SysTables, error) {
 	var data tools.SysTables
 	var dbTable tools.DBTables
 	var dbColumn tools.DBColumns
 	data.TBName = tablesList[i]
-	data.CreateBy = tools2.GetUserIdStr(c)
+	data.CreateBy = user.GetUserIdStr(c)
 
 	dbTable.TableName = data.TBName
-	dbtable, err := dbTable.Get()
+	dbtable, err := dbTable.Get(tx)
 
 	dbColumn.TableName = data.TBName
 	tablenamelist := strings.Split(dbColumn.TableName, "_")
@@ -112,14 +183,15 @@ func genTableInit(tablesList []string, i int, c *gin.Context) (tools.SysTables,
 		strStart := string([]byte(tablenamelist[i])[:1])
 		strend := string([]byte(tablenamelist[i])[1:])
 		data.ClassName += strings.ToUpper(strStart) + strend
-		data.PackageName += strings.ToLower(strStart) + strings.ToLower(strend)
+		//data.PackageName += strings.ToLower(strStart) + strings.ToLower(strend)
 		data.ModuleName += strings.ToLower(strStart) + strings.ToLower(strend)
 	}
+	data.PackageName = "admin"
 	data.TplCategory = "crud"
 	data.Crud = true
 
-	dbcolumn, err := dbColumn.GetList()
-	data.CreateBy = tools2.GetUserIdStr(c)
+	dbcolumn, err := dbColumn.GetList(tx)
+	data.CreateBy = user.GetUserIdStr(c)
 	data.TableComment = dbtable.TableComment
 	if dbtable.TableComment == "" {
 		data.TableComment = data.ClassName
@@ -130,6 +202,9 @@ func genTableInit(tablesList []string, i int, c *gin.Context) (tools.SysTables,
 	data.IsLogicalDelete = "1"
 	data.LogicalDelete = true
 	data.LogicalDeleteColumn = "is_del"
+	data.IsActions = 1
+	data.IsDataScope = 1
+	data.IsAuth = 1
 
 	data.FunctionAuthor = "wenjianzhang"
 	for i := 0; i < len(dbcolumn); i++ {
@@ -158,6 +233,8 @@ func genTableInit(tablesList []string, i int, c *gin.Context) (tools.SysTables,
 			column.IsPk = "1"
 			column.Pk = true
 			data.PkColumn = dbcolumn[i].ColumnName
+			//column.GoField = strings.ToUpper(column.GoField)
+			//column.JsonField = strings.ToUpper(column.JsonField)
 			data.PkGoField = column.GoField
 			data.PkJsonField = column.JsonField
 		}
@@ -177,6 +254,9 @@ func genTableInit(tablesList []string, i int, c *gin.Context) (tools.SysTables,
 		} else if strings.Contains(dbcolumn[i].ColumnType, "timestamp") {
 			column.GoType = "time.Time"
 			column.HtmlType = "datetime"
+		} else if strings.Contains(dbcolumn[i].ColumnType, "datetime") {
+			column.GoType = "time.Time"
+			column.HtmlType = "datetime"
 		} else {
 			column.GoType = "string"
 			column.HtmlType = "input"
@@ -200,10 +280,19 @@ func genTableInit(tablesList []string, i int, c *gin.Context) (tools.SysTables,
 func UpdateSysTable(c *gin.Context) {
 	var data tools.SysTables
 	err := c.Bind(&data)
-	tools2.HasError(err, "数据解析失败", -1)
-	data.UpdateBy = tools2.GetUserIdStr(c)
-	result, err := data.Update()
-	tools2.HasError(err, "", -1)
+	pkg.HasError(err, "数据解析失败", 500)
+
+	log := apis.GetRequestLogger(c)
+	db, err := pkg.GetOrm(c)
+	if err != nil {
+		log.Errorf("get db connection error, %s", err.Error())
+		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
+		return
+	}
+
+	data.UpdateBy = user.GetUserIdStr(c)
+	result, err := data.Update(db)
+	pkg.HasError(err, "", -1)
 
 	var res app.Response
 	res.Data = result
@@ -219,10 +308,18 @@ func UpdateSysTable(c *gin.Context) {
 // @Success 200 {string} string	"{"code": -1, "message": "删除失败"}"
 // @Router /api/v1/sys/tables/info/{tableId} [delete]
 func DeleteSysTables(c *gin.Context) {
+	log := apis.GetRequestLogger(c)
+	db, err := pkg.GetOrm(c)
+	if err != nil {
+		log.Errorf("get db connection error, %s", err.Error())
+		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
+		return
+	}
+
 	var data tools.SysTables
-	IDS := tools2.IdsStrToIdsIntGroup("tableId", c)
-	_, err := data.BatchDelete(IDS)
-	tools2.HasError(err, "删除失败", 500)
+	IDS := pkg.IdsStrToIdsIntGroup("tableId", c)
+	_, err = data.BatchDelete(db, IDS)
+	pkg.HasError(err, "删除失败", 500)
 	var res app.Response
 	res.Msg = "删除成功"
 	c.JSON(http.StatusOK, res.ReturnOK())

app/admin/middleware/auth.go

@@ -1,17 +1,27 @@
 package middleware
 
 import (
-	"go-admin/handler"
-	jwt "go-admin/pkg/jwtauth"
-	"go-admin/tools/config"
 	"time"
+
+	"github.com/go-admin-team/go-admin-core/sdk/config"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
+	"go-admin/app/admin/middleware/handler"
 )
 
+// AuthInit jwt验证new
 func AuthInit() (*jwt.GinJWTMiddleware, error) {
+	timeout := time.Hour
+	if config.ApplicationConfig.Mode == "dev" {
+		timeout = time.Duration(876010) * time.Hour
+	} else {
+		if config.JwtConfig.Timeout != 0 {
+			timeout = time.Duration(config.JwtConfig.Timeout) * time.Second
+		}
+	}
 	return jwt.New(&jwt.GinJWTMiddleware{
 		Realm:           "test zone",
 		Key:             []byte(config.ApplicationConfig.JwtSecret),
-		Timeout:         time.Hour,
+		Timeout:         timeout,
 		MaxRefresh:      time.Hour,
 		PayloadFunc:     handler.PayloadFunc,
 		IdentityHandler: handler.IdentityHandler,

app/admin/middleware/customerror.go

@@ -2,11 +2,12 @@ package middleware
 
 import (
 	"fmt"
-	"github.com/gin-gonic/gin"
 	"net/http"
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/gin-gonic/gin"
 )
 
 func CustomError(c *gin.Context) {
@@ -26,7 +27,7 @@ func CustomError(c *gin.Context) {
 					}
 					c.Status(statusCode)
 					fmt.Println(
-						time.Now().Format("2006-01-02 15:04:05.9999"),
+						time.Now().Format("2006-01-02 15:04:05"),
 						"[ERROR]",
 						c.Request.Method,
 						c.Request.URL,

app/admin/middleware/handler/auth.go

@@ -1,23 +1,28 @@
 package handler
 
 import (
+	"net/http"
+
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/config"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
 	"github.com/mojocn/base64Captcha"
 	"github.com/mssola/user_agent"
-	"go-admin/global"
-	"go-admin/models"
-	jwt "go-admin/pkg/jwtauth"
-	"go-admin/tools"
-	"go-admin/tools/config"
-	"net/http"
+
+	"go-admin/app/admin/models/system"
+	"go-admin/app/admin/service"
+	"go-admin/common/apis"
 )
 
 var store = base64Captcha.DefaultMemStore
 
 func PayloadFunc(data interface{}) jwt.MapClaims {
 	if v, ok := data.(map[string]interface{}); ok {
-		u, _ := v["user"].(models.SysUser)
-		r, _ := v["role"].(models.SysRole)
+		u, _ := v["user"].(system.SysUser)
+		r, _ := v["role"].(system.SysRole)
 		return jwt.MapClaims{
 			jwt.IdentityKey:  u.UserId,
 			jwt.RoleIdKey:    r.RoleId,
@@ -55,16 +60,26 @@ func IdentityHandler(c *gin.Context) interface{} {
 // @Success 200 {string} string "{"code": 200, "expire": "2019-08-07T12:45:48+08:00", "token": ".eyJleHAiOjE1NjUxNTMxNDgsImlkIjoiYWRtaW4iLCJvcmlnX2lhdCI6MTU2NTE0OTU0OH0.-zvzHvbg0A" }"
 // @Router /login [post]
 func Authenticator(c *gin.Context) (interface{}, error) {
-	var loginVals models.Login
-	var status = "0"
+	log := apis.GetRequestLogger(c)
+	db, err := pkg.GetOrm(c)
+	if err != nil {
+		log.Errorf("get db error, %s", err.Error())
+		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
+		return nil, jwt.ErrFailedAuthentication
+	}
+
+	var loginVals system.Login
+	var status = "2"
 	var msg = "登录成功"
 	var username = ""
+	defer func() {
+		LoginLogToDB(c, status, msg, username)
+	}()
 
-	if err := c.ShouldBind(&loginVals); err != nil {
+	if err = c.ShouldBind(&loginVals); err != nil {
 		username = loginVals.Username
 		msg = "数据解析失败"
 		status = "1"
-		LoginLogToDB(c, status, msg, username)
 
 		return nil, jwt.ErrMissingLoginValues
 	}
@@ -73,44 +88,48 @@ func Authenticator(c *gin.Context) (interface{}, error) {
 			username = loginVals.Username
 			msg = "验证码错误"
 			status = "1"
-			LoginLogToDB(c, status, msg, username)
 
 			return nil, jwt.ErrInvalidVerificationode
 		}
 	}
-	user, role, e := loginVals.GetUser()
+	user, role, e := loginVals.GetUser(db)
 	if e == nil {
 		username = loginVals.Username
-		LoginLogToDB(c, status, msg, username)
 
 		return map[string]interface{}{"user": user, "role": role}, nil
 	} else {
 		msg = "登录失败"
 		status = "1"
-		LoginLogToDB(c, status, msg, username)
-		global.RequestLogger.Println(e.Error())
+		log.Warnf("%s login failed!", loginVals.Username)
 	}
 	return nil, jwt.ErrFailedAuthentication
 }
 
-// Write log to database
+// LoginLogToDB Write log to database
 func LoginLogToDB(c *gin.Context, status string, msg string, username string) {
+	log := apis.GetRequestLogger(c)
 	if config.LoggerConfig.EnabledDB {
-		var loginlog models.LoginLog
+		var loginLog system.SysLoginLog
+		db, err := pkg.GetOrm(c)
+		if err != nil {
+			log.Errorf("获取Orm失败, error:%s", err)
+		}
 		ua := user_agent.New(c.Request.UserAgent())
-		loginlog.Ipaddr = c.ClientIP()
-		loginlog.Username = username
-		location := tools.GetLocation(c.ClientIP())
-		loginlog.LoginLocation = location
-		loginlog.LoginTime = tools.GetCurrentTime()
-		loginlog.Status = status
-		loginlog.Remark = c.Request.UserAgent()
+		loginLog.Ipaddr = c.ClientIP()
+		loginLog.Username = username
+		location := pkg.GetLocation(c.ClientIP())
+		loginLog.LoginLocation = location
+		loginLog.LoginTime = pkg.GetCurrentTime()
+		loginLog.Status = status
+		loginLog.Remark = c.Request.UserAgent()
 		browserName, browserVersion := ua.Browser()
-		loginlog.Browser = browserName + " " + browserVersion
-		loginlog.Os = ua.OS()
-		loginlog.Msg = msg
-		loginlog.Platform = ua.Platform()
-		_, _ = loginlog.Create()
+		loginLog.Browser = browserName + " " + browserVersion
+		loginLog.Os = ua.OS()
+		loginLog.Msg = msg
+		loginLog.Platform = ua.Platform()
+		serviceLoginLog := service.SysLoginLog{}
+		serviceLoginLog.Orm = db
+		_ = serviceLoginLog.InsertSysLoginLog(loginLog.Generate())
 	}
 }
 
@@ -124,21 +143,28 @@ func LoginLogToDB(c *gin.Context, status string, msg string, username string) {
 // @Router /logout [post]
 // @Security Bearer
 func LogOut(c *gin.Context) {
-	var loginlog models.LoginLog
+	log := apis.GetRequestLogger(c)
+	var loginLog system.SysLoginLog
 	ua := user_agent.New(c.Request.UserAgent())
-	loginlog.Ipaddr = c.ClientIP()
-	location := tools.GetLocation(c.ClientIP())
-	loginlog.LoginLocation = location
-	loginlog.LoginTime = tools.GetCurrentTime()
-	loginlog.Status = "0"
-	loginlog.Remark = c.Request.UserAgent()
+	loginLog.Ipaddr = c.ClientIP()
+	location := pkg.GetLocation(c.ClientIP())
+	loginLog.LoginLocation = location
+	loginLog.LoginTime = pkg.GetCurrentTime()
+	loginLog.Status = "2"
+	loginLog.Remark = c.Request.UserAgent()
 	browserName, browserVersion := ua.Browser()
-	loginlog.Browser = browserName + " " + browserVersion
-	loginlog.Os = ua.OS()
-	loginlog.Platform = ua.Platform()
-	loginlog.Username = tools.GetUserName(c)
-	loginlog.Msg = "退出成功"
-	loginlog.Create()
+	loginLog.Browser = browserName + " " + browserVersion
+	loginLog.Os = ua.OS()
+	loginLog.Platform = ua.Platform()
+	loginLog.Username = user.GetUserName(c)
+	loginLog.Msg = "退出成功"
+	db, err := pkg.GetOrm(c)
+	if err != nil {
+		log.Errorf("获取Orm失败, error:%s", err)
+	}
+	serviceLoginLog := service.SysLoginLog{}
+	serviceLoginLog.Orm = db
+	_ = serviceLoginLog.InsertSysLoginLog(loginLog.Generate())
 
 	c.JSON(http.StatusOK, gin.H{
 		"code": 200,
@@ -150,12 +176,12 @@ func LogOut(c *gin.Context) {
 func Authorizator(data interface{}, c *gin.Context) bool {
 
 	if v, ok := data.(map[string]interface{}); ok {
-		u, _ := v["user"].(models.SysUser)
-		r, _ := v["role"].(models.SysRole)
+		u, _ := v["user"].(system.SysUser)
+		r, _ := v["role"].(system.SysRole)
 		c.Set("role", r.RoleName)
 		c.Set("roleIds", r.RoleId)
 		c.Set("userId", u.UserId)
-		c.Set("userName", u.UserName)
+		c.Set("userName", u.Username)
 		c.Set("dataScope", r.DataScope)
 
 		return true

app/admin/middleware/handler/httpshandler.go

@@ -3,7 +3,8 @@ package handler
 import (
 	"github.com/gin-gonic/gin"
 	"github.com/unrolled/secure"
-	"go-admin/tools/config"
+
+	"github.com/go-admin-team/go-admin-core/sdk/config"
 )
 
 func TlsHandler() gin.HandlerFunc {

app/admin/middleware/header.go

@@ -1,9 +1,10 @@
 package middleware
 
 import (
-	"github.com/gin-gonic/gin"
 	"net/http"
 	"time"
+
+	"github.com/gin-gonic/gin"
 )
 
 // NoCache is a middleware function that appends headers

app/admin/middleware/init.go

@@ -3,10 +3,12 @@ package middleware
 import (
 	"github.com/gin-gonic/gin"
 
+	"go-admin/common/middleware"
 )
 
-
 func InitMiddleware(r *gin.Engine) {
+	// 数据库链接
+	r.Use(middleware.WithContextDb)
 	// 日志处理
 	r.Use(LoggerToFile())
 	// 自定义错误处理
@@ -17,6 +19,6 @@ func InitMiddleware(r *gin.Engine) {
 	r.Use(Options)
 	// Secure is a middleware function that appends security
 	r.Use(Secure)
-	// Set X-Request-Id header
-	r.Use(RequestId())
-}
+	// 链路追踪
+	//r.Use(middleware.Trace())
+}

app/admin/middleware/logger.go

@@ -0,0 +1,138 @@
+package middleware
+
+import (
+	"fmt"
+	"net/http"
+	"strings"
+	"time"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/config"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
+
+	"go-admin/app/admin/models"
+	"go-admin/app/admin/models/system"
+	"go-admin/app/admin/service"
+	"go-admin/common/apis"
+)
+
+// LoggerToFile 日志记录到文件
+func LoggerToFile() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		defer c.Next()
+		if c.Request.Method == http.MethodOptions {
+			return
+		}
+		log := apis.GetRequestLogger(c)
+		// 开始时间
+		startTime := time.Now()
+		// 处理请求
+
+		bd, bl := c.Get("body")
+		var body = ""
+		if bl {
+			body = bd.(string)
+		}
+
+		rt, bl := c.Get("result")
+		var result = ""
+		if bl {
+			result = rt.(string)
+		}
+
+		st, bl := c.Get("status")
+		var statusBus = 0
+		if bl {
+			statusBus = st.(int)
+		}
+
+		// 请求方式
+		reqMethod := c.Request.Method
+		// 请求路由
+		reqUri := c.Request.RequestURI
+		// 状态码
+		statusCode := c.Writer.Status()
+		// 请求IP
+		clientIP := c.ClientIP()
+		// 结束时间
+		endTime := time.Now()
+		// 执行时间
+		latencyTime := endTime.Sub(startTime)
+		// 日志格式
+		logData := map[string]interface{}{
+			"statusCode":  statusCode,
+			"latencyTime": latencyTime,
+			"clientIP":    clientIP,
+			"method":      reqMethod,
+			"uri":         reqUri,
+		}
+		log.Info(logData)
+		//l := logger.Logger{Logger: log.Fields(logData)}
+		//l.Info(logData)
+		if c.Request.Method != "GET" && c.Request.Method != "OPTIONS" && config.LoggerConfig.EnabledDB {
+			SetDBOperLog(c, clientIP, statusCode, reqUri, reqMethod, latencyTime, body, result, statusBus)
+		}
+	}
+}
+
+// SetDBOperLog 写入操作日志表 fixme 该方法后续即将弃用
+func SetDBOperLog(c *gin.Context, clientIP string, statusCode int, reqUri string, reqMethod string, latencyTime time.Duration, body string, result string, status int) {
+	log := apis.GetRequestLogger(c)
+	db, err := pkg.GetOrm(c)
+	if err != nil {
+		log.Errorf("get db connection error, %s", err.Error())
+		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
+		return
+	}
+
+	menu := models.Menu{}
+	menu.Path = reqUri
+	menu.Action = reqMethod
+	menuList, _ := menu.Get(db)
+	sysOperaLog := system.SysOperaLog{}
+	sysOperaLog.OperIp = clientIP
+	sysOperaLog.OperLocation = pkg.GetLocation(clientIP)
+	sysOperaLog.Status = pkg.IntToString(statusCode)
+	sysOperaLog.OperName = user.GetUserName(c)
+	sysOperaLog.RequestMethod = c.Request.Method
+	sysOperaLog.OperUrl = reqUri
+	sysOperaLog.OperParam = body
+	if reqUri == "/login" {
+		sysOperaLog.BusinessType = "10"
+		sysOperaLog.Title = "用户登录"
+		sysOperaLog.OperName = "-"
+	} else if strings.Contains(reqUri, "/api/v1/logout") {
+		sysOperaLog.BusinessType = "11"
+	} else if strings.Contains(reqUri, "/api/v1/getCaptcha") {
+		sysOperaLog.BusinessType = "12"
+		sysOperaLog.Title = "验证码"
+	} else {
+		if reqMethod == "POST" {
+			sysOperaLog.BusinessType = "1"
+		} else if reqMethod == "PUT" {
+			sysOperaLog.BusinessType = "2"
+		} else if reqMethod == "DELETE" {
+			sysOperaLog.BusinessType = "3"
+		}
+	}
+	sysOperaLog.Method = reqMethod
+	if len(menuList) > 0 {
+		sysOperaLog.Title = menuList[0].Title
+	}
+	sysOperaLog.CreateBy = user.GetUserId(c)
+	sysOperaLog.OperTime = pkg.GetCurrentTime()
+	sysOperaLog.LatencyTime = fmt.Sprintf("%v", latencyTime)
+
+	sysOperaLog.JsonResult = result
+	sysOperaLog.UserAgent = c.Request.UserAgent()
+	if status == 200 {
+		sysOperaLog.Status = "2"
+	} else {
+		sysOperaLog.Status = "1"
+	}
+	serviceOperaLog := service.SysOperaLog{}
+	serviceOperaLog.Orm = db
+	_ = serviceOperaLog.InsertSysOperaLog(&sysOperaLog)
+}

app/admin/models/gorm/data.go

@@ -0,0 +1,87 @@
+package gorm
+
+import (
+	"go-admin/app/admin/models/system"
+	"gorm.io/gorm"
+)
+
+func InitData(db *gorm.DB) {
+
+	list := []system.CasbinRule{
+		{"p", "admin", "/api/v1/menulist", "GET", "", "", ""},
+		{"p", "admin", "/api/v1/menu", "POST", "", "", ""},
+		{"p", "admin", "/api/v1/dict/databytype/", "GET", "", "", ""},
+		{"p", "admin", "/api/v1/menu", "PUT", "", "", ""},
+		{"p", "admin", "/api/v1/menu/:id", "DELETE", "", "", ""},
+		{"p", "admin", "/api/v1/sysUserList", "GET", "", "", ""},
+		{"p", "admin", "/api/v1/sysUser/:id", "GET", "", "", ""},
+		{"p", "admin", "/api/v1/sysUser/", "GET", "", "", ""},
+		{"p", "admin", "/api/v1/sysUser", "POST", "", "", ""},
+		{"p", "admin", "/api/v1/sysUser", "PUT", "", "", ""},
+		{"p", "admin", "/api/v1/sysUser/:id", "DELETE", "", "", ""},
+		{"p", "admin", "/api/v1/user/profile", "GET", "", "", ""},
+		{"p", "admin", "/api/v1/rolelist", "GET", "", "", ""},
+		{"p", "admin", "/api/v1/role/:id", "GET", "", "", ""},
+		{"p", "admin", "/api/v1/role", "POST", "", "", ""},
+		{"p", "admin", "/api/v1/role", "PUT", "", "", ""},
+		{"p", "admin", "/api/v1/role/:id", "DELETE", "", "", ""},
+		{"p", "admin", "/api/v1/configList", "GET", "", "", ""},
+		{"p", "admin", "/api/v1/config/:id", "GET", "", "", ""},
+		{"p", "admin", "/api/v1/config", "POST", "", "", ""},
+		{"p", "admin", "/api/v1/config", "PUT", "", "", ""},
+		{"p", "admin", "/api/v1/config/:id", "DELETE", "", "", ""},
+		{"p", "admin", "/api/v1/menurole", "GET", "", "", ""},
+		{"p", "admin", "/api/v1/roleMenuTreeselect/:id", "GET", "", "", ""},
+		{"p", "admin", "/api/v1/menuTreeselect", "GET", "", "", ""},
+		{"p", "admin", "/api/v1/rolemenu", "GET", "", "", ""},
+		{"p", "admin", "/api/v1/rolemenu", "POST", "", "", ""},
+		{"p", "admin", "/api/v1/rolemenu/:id", "DELETE", "", "", ""},
+		{"p", "admin", "/api/v1/deptList", "GET", "", "", ""},
+		{"p", "admin", "/api/v1/dept/:id", "GET", "", "", ""},
+		{"p", "admin", "/api/v1/dept", "POST", "", "", ""},
+		{"p", "admin", "/api/v1/dept", "PUT", "", "", ""},
+		{"p", "admin", "/api/v1/dept/:id", "DELETE", "", "", ""},
+		{"p", "admin", "/api/v1/dict/datalist", "GET", "", "", ""},
+		{"p", "admin", "/api/v1/dict/data/:id", "GET", "", "", ""},
+		{"p", "admin", "/api/v1/dict/databytype/:id", "GET", "", "", ""},
+		{"p", "admin", "/api/v1/dict/data", "POST", "", "", ""},
+		{"p", "admin", "/api/v1/dict/data/", "PUT", "", "", ""},
+		{"p", "admin", "/api/v1/dict/data/:id", "DELETE", "", "", ""},
+		{"p", "admin", "/api/v1/dict/typelist", "GET", "", "", ""},
+		{"p", "admin", "/api/v1/dict/type/:id", "GET", "", "", ""},
+		{"p", "admin", "/api/v1/dict/type", "POST", "", "", ""},
+		{"p", "admin", "/api/v1/dict/type", "PUT", "", "", ""},
+		{"p", "admin", "/api/v1/dict/type/:id", "DELETE", "", "", ""},
+		{"p", "admin", "/api/v1/postlist", "GET", "", "", ""},
+		{"p", "admin", "/api/v1/post/:id", "GET", "", "", ""},
+		{"p", "admin", "/api/v1/post", "POST", "", "", ""},
+		{"p", "admin", "/api/v1/post", "PUT", "", "", ""},
+		{"p", "admin", "/api/v1/post/:id", "DELETE", "", "", ""},
+		{"p", "admin", "/api/v1/menu/:id", "GET", "", "", ""},
+		{"p", "admin", "/api/v1/menuids", "GET", "", "", ""},
+		{"p", "admin", "/api/v1/loginloglist", "GET", "", "", ""},
+		{"p", "admin", "/api/v1/loginlog/:id", "DELETE", "", "", ""},
+		{"p", "admin", "/api/v1/operloglist", "GET", "", "", ""},
+		{"p", "admin", "/api/v1/getinfo", "GET", "", "", ""},
+		{"p", "admin", "/api/v1/roledatascope", "PUT", "", "", ""},
+		{"p", "admin", "/api/v1/roleDeptTreeselect/:id", "GET", "", "", ""},
+		{"p", "admin", "/api/v1/deptTree", "GET", "", "", ""},
+		{"p", "admin", "/api/v1/configKey/:id", "GET", "", "", ""},
+		{"p", "admin", "/api/v1/logout", "POST", "", "", ""},
+		{"p", "admin", "/api/v1/user/avatar", "POST", "", "", ""},
+		{"p", "admin", "/api/v1/user/pwd", "PUT", "", "", ""},
+		{"p", "admin", "/api/v1/dict/typeoptionselect", "GET", "", "", ""},
+		{"p", "admin", "/api/v1/sysjobList", "GET", "", "", ""},
+		{"p", "admin", "/api/v1/sysjob/:id", "GET", "", "", ""},
+		{"p", "admin", "/api/v1/sysjob", "POST", "", "", ""},
+		{"p", "admin", "/api/v1/sysjob", "PUT", "", "", ""},
+		{"p", "admin", "/api/v1/sysjob/:id", "DELETE", "", "", ""},
+		{"p", "admin", "/api/v1/syssettingList", "GET", "", "", ""},
+		{"p", "admin", "/api/v1/syssetting/:id", "GET", "", "", ""},
+		{"p", "admin", "/api/v1/syssetting", "POST", "", "", ""},
+		{"p", "admin", "/api/v1/syssetting", "PUT", "", "", ""},
+		{"p", "admin", "/api/v1/syssetting/:id", "DELETE", "", "", ""},
+	}
+
+	db.Table("sys_casbin_rule").Create(list)
+}

app/admin/models/initdb.go

@@ -2,22 +2,24 @@ package models
 
 import (
 	"fmt"
-	"go-admin/global"
+	"go-admin/common/global"
+	"gorm.io/gorm"
 	"io/ioutil"
+	"log"
 	"strings"
 )
 
-func InitDb() error {
+func InitDb(db *gorm.DB) (err error) {
 	filePath := "config/db.sql"
-	err := ExecSql(filePath)
+	err = ExecSql(db, filePath)
 	if global.Driver == "postgres" {
 		filePath = "config/pg.sql"
-		err = ExecSql(filePath)
+		err = ExecSql(db, filePath)
 	}
 	return err
 }
 
-func ExecSql(filePath string) error {
+func ExecSql(db *gorm.DB, filePath string) error {
 	sql, err := Ioutil(filePath)
 	if err != nil {
 		fmt.Println("数据库基础数据初始化脚本读取失败！原因:", err.Error())
@@ -31,7 +33,8 @@ func ExecSql(filePath string) error {
 		}
 		sql := strings.Replace(sqlList[i]+";", "\n", "", 0)
 		sql = strings.TrimSpace(sql)
-		if err = global.Eloquent.Exec(sql).Error; err != nil {
+		if err = db.Exec(sql).Error; err != nil {
+			log.Printf("error sql: %s", sql)
 			if !strings.Contains(err.Error(), "Query was empty") {
 				return err
 			}

app/admin/models/menu.go

@@ -0,0 +1,342 @@
+package models
+
+import (
+	"errors"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+
+	"gorm.io/gorm"
+
+	"go-admin/app/admin/models/system"
+)
+
+type Menu struct {
+	MenuId     int    `json:"menuId" gorm:"primaryKey;autoIncrement"`
+	MenuName   string `json:"menuName" gorm:"size:128;"`
+	Title      string `json:"title" gorm:"size:128;"`
+	Icon       string `json:"icon" gorm:"size:128;"`
+	Path       string `json:"path" gorm:"size:128;"`
+	Paths      string `json:"paths" gorm:"size:128;"`
+	MenuType   string `json:"menuType" gorm:"size:1;"`
+	Action     string `json:"action" gorm:"size:16;"`
+	Permission string `json:"permission" gorm:"size:255;"`
+	ParentId   int    `json:"parentId" gorm:"size:11;"`
+	NoCache    bool   `json:"noCache" gorm:"size:8;"`
+	Breadcrumb string `json:"breadcrumb" gorm:"size:255;"`
+	Component  string `json:"component" gorm:"size:255;"`
+	Sort       int    `json:"sort" gorm:"size:4;"`
+	Visible    string `json:"visible" gorm:"size:1;"`
+	CreateBy   string `json:"createBy" gorm:"size:128;"`
+	UpdateBy   string `json:"updateBy" gorm:"size:128;"`
+	IsFrame    string `json:"isFrame" gorm:"size:1;DEFAULT:0;"`
+	DataScope  string `json:"dataScope" gorm:"-"`
+	Params     string `json:"params" gorm:"-"`
+	RoleId     int    `gorm:"-"`
+	Children   []Menu `json:"children" gorm:"-"`
+	IsSelect   bool   `json:"is_select" gorm:"-"`
+	BaseModel
+}
+
+func (Menu) TableName() string {
+	return "sys_menu"
+}
+
+type MenuLable struct {
+	Id       int         `json:"id" gorm:"-"`
+	Label    string      `json:"label" gorm:"-"`
+	Children []MenuLable `json:"children" gorm:"-"`
+}
+
+type Menus struct {
+	MenuId     int    `json:"menuId" gorm:"column:menu_id;primaryKey;autoIncrement;"`
+	MenuName   string `json:"menuName" gorm:"column:menu_name"`
+	Title      string `json:"title" gorm:"column:title"`
+	Icon       string `json:"icon" gorm:"column:icon"`
+	Path       string `json:"path" gorm:"column:path"`
+	MenuType   string `json:"menuType" gorm:"column:menu_type"`
+	Action     string `json:"action" gorm:"column:action"`
+	Permission string `json:"permission" gorm:"column:permission"`
+	ParentId   int    `json:"parentId" gorm:"column:parent_id"`
+	NoCache    bool   `json:"noCache" gorm:"column:no_cache"`
+	Breadcrumb string `json:"breadcrumb" gorm:"column:breadcrumb"`
+	Component  string `json:"component" gorm:"column:component"`
+	Sort       int    `json:"sort" gorm:"column:sort"`
+
+	Visible  string `json:"visible" gorm:"column:visible"`
+	Children []Menu `json:"children" gorm:"-"`
+
+	CreateBy  string `json:"createBy" gorm:"column:create_by"`
+	UpdateBy  string `json:"updateBy" gorm:"column:update_by"`
+	DataScope string `json:"dataScope" gorm:"-"`
+	Params    string `json:"params" gorm:"-"`
+	BaseModel
+}
+
+func (Menus) TableName() string {
+	return "sys_menu"
+}
+
+type MenuRole struct {
+	Menus
+	IsSelect bool `json:"is_select" gorm:"-"`
+}
+
+type MS []Menu
+
+//func (e *Menu) GetByMenuId() (Menu Menu, err error) {
+//
+//	table := orm.Eloquent.Table(e.TableName())
+//	table = table.Where("menu_id = ?", e.MenuId)
+//	if err = table.Find(&Menu).Error; err != nil {
+//		return
+//	}
+//	return
+//}
+
+//func (e *Menu) SetMenu() (m []Menu, err error) {
+//	menulist, err := e.GetPage()
+//
+//	m = make([]Menu, 0)
+//	for i := 0; i < len(menulist); i++ {
+//		if menulist[i].ParentId != 0 {
+//			continue
+//		}
+//		menusInfo := DiguiMenu(&menulist, menulist[i])
+//
+//		m = append(m, menusInfo)
+//	}
+//	return
+//}
+
+//func DiguiMenu(menulist *[]Menu, menu Menu) Menu {
+//	list := *menulist
+//
+//	min := make([]Menu, 0)
+//	for j := 0; j < len(list); j++ {
+//
+//		if menu.MenuId != list[j].ParentId {
+//			continue
+//		}
+//		mi := Menu{}
+//		mi.MenuId = list[j].MenuId
+//		mi.MenuName = list[j].MenuName
+//		mi.Title = list[j].Title
+//		mi.Icon = list[j].Icon
+//		mi.Path = list[j].Path
+//		mi.MenuType = list[j].MenuType
+//		mi.Action = list[j].Action
+//		mi.Permission = list[j].Permission
+//		mi.ParentId = list[j].ParentId
+//		mi.NoCache = list[j].NoCache
+//		mi.Breadcrumb = list[j].Breadcrumb
+//		mi.Component = list[j].Component
+//		mi.Sort = list[j].Sort
+//		mi.Visible = list[j].Visible
+//		mi.CreatedAt = list[j].CreatedAt
+//		mi.Children = []Menu{}
+//
+//		if mi.MenuType != "F" {
+//			ms := DiguiMenu(menulist, mi)
+//			min = append(min, ms)
+//
+//		} else {
+//			min = append(min, mi)
+//		}
+//
+//	}
+//	menu.Children = min
+//	return menu
+//}
+
+//func (e *Menu) SetMenuLabel() (m *[]MenuLable, err error) {
+//	menulist, err := e.Get()
+//
+//	ml := make([]MenuLable, 0)
+//	for i := 0; i < len(menulist); i++ {
+//		if menulist[i].ParentId != 0 {
+//			continue
+//		}
+//		e := MenuLable{}
+//		e.Id = menulist[i].MenuId
+//		e.Label = menulist[i].Title
+//		menusInfo := MenuLabelCall(&menulist, e)
+//
+//		ml = append(ml, menusInfo)
+//	}
+//	return &ml, err
+//}
+
+//func MenuLabelCall(menulist *[]Menu, menu MenuLable) MenuLable {
+//	list := *menulist
+//
+//	min := make([]MenuLable, 0)
+//	for j := 0; j < len(list); j++ {
+//
+//		if menu.Id != list[j].ParentId {
+//			continue
+//		}
+//		mi := MenuLable{}
+//		mi.Id = list[j].MenuId
+//		mi.Label = list[j].Title
+//		mi.Children = []MenuLable{}
+//		if list[j].MenuType != "F" {
+//			ms := MenuLabelCall(menulist, mi)
+//			min = append(min, ms)
+//		} else {
+//			min = append(min, mi)
+//		}
+//
+//	}
+//	if len(min) > 0 {
+//		menu.Children = min
+//	} else {
+//		menu.Children = nil
+//	}
+//	return menu
+//}
+
+//func (e *Menu) SetMenuRole(roleName string) (m []Menu, err error) {
+//
+//	menus, err := e.GetByRoleName(roleName)
+//
+//	m = make([]Menu, 0)
+//	for i := 0; i < len(menus); i++ {
+//		if menus[i].ParentId != 0 {
+//			continue
+//		}
+//		menusInfo := DiguiMenu(&menus, menus[i])
+//
+//		m = append(m, menusInfo)
+//	}
+//	return
+//}
+
+//func (e *MenuRole) Get(tx *gorm.DB) (Menus []MenuRole, err error) {
+//	table := tx.Table(e.TableName())
+//	if e.MenuName != "" {
+//		table = table.Where("menu_name = ?", e.MenuName)
+//	}
+//	if err = table.Order("sort").Find(&Menus).Error; err != nil {
+//		return
+//	}
+//	return
+//}
+
+//func (e *Menu) GetByRoleName(roleName string) (Menus []Menu, err error) {
+//	var table *gorm.DB
+//	if roleName == "admin" {
+//		table = orm.Eloquent.Table(e.TableName()).Select("sys_menu.*")
+//		table = table.Where(" menu_type in ('M','C')")
+//	} else {
+//		table = orm.Eloquent.Table(e.TableName()).Select("sys_menu.*").Joins("left join sys_role_menu on sys_role_menu.menu_id=sys_menu.menu_id")
+//		table = table.Where("sys_role_menu.role_name=? and menu_type in ('M','C')", roleName)
+//	}
+//	if err = table.Order("sort").Find(&Menus).Error; err != nil {
+//		return
+//	}
+//	return
+//}
+
+func (e *Menu) Get(tx *gorm.DB) (Menus []Menu, err error) {
+	table := tx.Table(e.TableName())
+	if e.MenuName != "" {
+		table = table.Where("menu_name = ?", e.MenuName)
+	}
+	if e.Path != "" {
+		table = table.Where("path = ?", e.Path)
+	}
+	if e.Action != "" {
+		table = table.Where("action = ?", e.Action)
+	}
+	if e.MenuType != "" {
+		table = table.Where("menu_type = ?", e.MenuType)
+	}
+
+	if err = table.Order("sort").Find(&Menus).Error; err != nil {
+		return
+	}
+	return
+}
+
+func (e *Menu) GetPage(tx *gorm.DB) (Menus []Menu, err error) {
+	table := tx.Table(e.TableName())
+	if e.MenuName != "" {
+		table = table.Where("menu_name = ?", e.MenuName)
+	}
+	if e.Title != "" {
+		table = table.Where("title = ?", e.Title)
+	}
+	if e.Visible != "" {
+		table = table.Where("visible = ?", e.Visible)
+	}
+	if e.MenuType != "" {
+		table = table.Where("menu_type = ?", e.MenuType)
+	}
+
+	// 数据权限控制
+	dataPermission := new(system.DataPermission)
+	dataPermission.UserId, _ = pkg.StringToInt(e.DataScope)
+	table, err = dataPermission.GetDataScope("sys_menu", table)
+	if err != nil {
+		return nil, err
+	}
+	if err = table.Order("sort").Find(&Menus).Error; err != nil {
+		return
+	}
+	return
+}
+
+func (e *Menu) Create(tx *gorm.DB) (id int, err error) {
+	result := tx.Table(e.TableName()).Create(&e)
+	if result.Error != nil {
+		err = result.Error
+		return
+	}
+	err = InitPaths(tx, e)
+	if err != nil {
+		return
+	}
+	id = e.MenuId
+	return
+}
+
+func InitPaths(tx *gorm.DB, menu *Menu) (err error) {
+	parentMenu := new(Menu)
+	if menu.ParentId != 0 {
+		tx.Table("sys_menu").Where("menu_id = ?", menu.ParentId).First(parentMenu)
+		if parentMenu.Paths == "" {
+			err = errors.New("父级paths异常，请尝试对当前节点父级菜单进行更新操作！")
+			return
+		}
+		menu.Paths = parentMenu.Paths + "/" + pkg.IntToString(menu.MenuId)
+	} else {
+		menu.Paths = "/0/" + pkg.IntToString(menu.MenuId)
+	}
+	tx.Table("sys_menu").Where("menu_id = ?", menu.MenuId).Update("paths", menu.Paths)
+	return
+}
+
+//func (e *Menu) Update(tx *gorm.DB, id int) (update Menu, err error) {
+//	if err = tx.Table(e.TableName()).First(&update, id).Error; err != nil {
+//		return
+//	}
+//
+//	//参数1:是要修改的数据
+//	//参数2:是修改的数据
+//	if err = tx.Table(e.TableName()).Model(&update).Updates(&e).Error; err != nil {
+//		return
+//	}
+//	err = InitPaths(tx, e)
+//	if err != nil {
+//		return
+//	}
+//	return
+//}
+
+//func (e *Menu) Delete(tx *gorm.DB, id int) (success bool, err error) {
+//	if err = tx.Table(e.TableName()).Where("menu_id = ?", id).Delete(&Menu{}).Error; err != nil {
+//		success = false
+//		return
+//	}
+//	success = true
+//	return
+//}

app/admin/models/role.go

@@ -0,0 +1,242 @@
+package models
+
+type SysRole struct {
+	RoleId    int    `json:"roleId" gorm:"primaryKey;autoIncrement"` // 角色编码
+	RoleName  string `json:"roleName" gorm:"size:128;"`              // 角色名称
+	Status    string `json:"status" gorm:"size:4;"`                  //
+	RoleKey   string `json:"roleKey" gorm:"size:128;"`               //角色代码
+	RoleSort  int    `json:"roleSort" gorm:""`                       //角色排序
+	Flag      string `json:"flag" gorm:"size:128;"`                  //
+	CreateBy  string `json:"createBy" gorm:"size:128;"`              //
+	UpdateBy  string `json:"updateBy" gorm:"size:128;"`              //
+	Remark    string `json:"remark" gorm:"size:255;"`                //备注
+	Admin     bool   `json:"admin" gorm:"size:4;"`
+	DataScope string `json:"dataScope" gorm:"size:128;"`
+	BaseModel
+
+	Params  string `json:"params" gorm:"-"`
+	MenuIds []int  `json:"menuIds" gorm:"-"`
+	DeptIds []int  `json:"deptIds" gorm:"-"`
+}
+
+func (SysRole) TableName() string {
+	return "sys_role"
+}
+
+type MenuIdList struct {
+	MenuId int `json:"menuId"`
+}
+
+//func (role *SysRole) GetById(tx *gorm.DB, id interface{}) error {
+//	return tx.First(role, id).Error
+//}
+//
+//func (role *SysRole) GetPage(pageSize int, pageIndex int) ([]SysRole, int, error) {
+//	var doc []SysRole
+//
+//	table := orm.Eloquent.Table("sys_role")
+//	if role.RoleId != 0 {
+//		table = table.Where("role_id = ?", role.RoleId)
+//	}
+//	if role.RoleName != "" {
+//		table = table.Where("role_name = ?", role.RoleName)
+//	}
+//	if role.Status != "" {
+//		table = table.Where("status = ?", role.Status)
+//	}
+//	if role.RoleKey != "" {
+//		table = table.Where("role_key = ?", role.RoleKey)
+//	}
+//
+//	// 数据权限控制
+//	dataPermission := new(DataPermission)
+//	dataPermission.UserId, _ = tools.StringToInt(role.DataScope)
+//	table, err := dataPermission.GetDataScope("sys_role", table)
+//	if err != nil {
+//		return nil, 0, err
+//	}
+//	var count int64
+//
+//	if err := table.Order("role_sort").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Offset(-1).Limit(-1).Count(&count).Error; err != nil {
+//		return nil, 0, err
+//	}
+//	//table.Where("`deleted_at` IS NULL").Count(&count)
+//	return doc, int(count), nil
+//}
+//
+//func (role *SysRole) Get() (SysRole SysRole, err error) {
+//	table := orm.Eloquent.Table("sys_role")
+//	if role.RoleId != 0 {
+//		table = table.Where("role_id = ?", role.RoleId)
+//	}
+//	if role.RoleName != "" {
+//		table = table.Where("role_name = ?", role.RoleName)
+//	}
+//	if err = table.First(&SysRole).Error; err != nil {
+//		return
+//	}
+//
+//	return
+//}
+//
+//func (role *SysRole) GetOne(sysRole *SysRole) (err error) {
+//	table := orm.Eloquent.Table("sys_role")
+//	if role.RoleId != 0 {
+//		table = table.Where("role_id = ?", role.RoleId)
+//	}
+//	if role.RoleName != "" {
+//		table = table.Where("role_name = ?", role.RoleName)
+//	}
+//	if err = table.First(sysRole).Error; err != nil {
+//		return
+//	}
+//
+//	return
+//}
+//
+//func (role *SysRole) GetList() (SysRole []SysRole, err error) {
+//	table := orm.Eloquent.Table("sys_role")
+//	if role.RoleId != 0 {
+//		table = table.Where("role_id = ?", role.RoleId)
+//	}
+//	if role.RoleName != "" {
+//		table = table.Where("role_name = ?", role.RoleName)
+//	}
+//	if err = table.Order("role_sort").Find(&SysRole).Error; err != nil {
+//		return
+//	}
+//
+//	return
+//}
+//
+//// 获取角色对应的菜单ids
+//func (role *SysRole) GetRoleMeunId() ([]int, error) {
+//	menuIds := make([]int, 0)
+//	menuList := make([]MenuIdList, 0)
+//	if err := orm.Eloquent.Table("sys_role_menu").
+//		Select("sys_role_menu.menu_id").
+//		Where("role_id = ? ", role.RoleId).
+//		Where(" sys_role_menu.menu_id not in(select sys_menu.parent_id from sys_role_menu " +
+//			"LEFT JOIN sys_menu on sys_menu.menu_id=sys_role_menu.menu_id where role_id =?  and parent_id is not null)", role.RoleId).
+//		Find(&menuList).Error; err != nil {
+//		return nil, err
+//	}
+//
+//	for i := 0; i < len(menuList); i++ {
+//		menuIds = append(menuIds, menuList[i].MenuId)
+//	}
+//	return menuIds, nil
+//}
+//
+//func (role *SysRole) Insert() (id int, err error) {
+//	var i int64
+//	orm.Eloquent.Table(role.TableName()).Where("role_name=? or role_key = ?", role.RoleName, role.RoleKey).Count(&i)
+//	if i > 0 {
+//		return 0, errors.New("角色名称或者角色标识已经存在！")
+//	}
+//	role.UpdateBy = ""
+//	result := orm.Eloquent.Table(role.TableName()).Create(&role)
+//	if result.Error != nil {
+//		err = result.Error
+//		return
+//	}
+//	id = role.RoleId
+//	return
+//}
+//
+//type DeptIdList struct {
+//	DeptId int `json:"DeptId"`
+//}
+//
+//func (role *SysRole) GetRoleDeptId() ([]int, error) {
+//	deptIds := make([]int, 0)
+//	deptList := make([]DeptIdList, 0)
+//	if err := orm.Eloquent.Table("sys_role_dept").Select("sys_role_dept.dept_id").Joins("LEFT JOIN sys_dept on sys_dept.dept_id=sys_role_dept.dept_id").Where("role_id = ? ", role.RoleId).Where(" sys_role_dept.dept_id not in(select sys_dept.parent_id from sys_role_dept LEFT JOIN sys_dept on sys_dept.dept_id=sys_role_dept.dept_id where role_id =? )", role.RoleId).Find(&deptList).Error; err != nil {
+//		return nil, err
+//	}
+//
+//	for i := 0; i < len(deptList); i++ {
+//		deptIds = append(deptIds, deptList[i].DeptId)
+//	}
+//
+//	return deptIds, nil
+//}
+//
+////修改
+//func (role *SysRole) Update(id int) (update SysRole, err error) {
+//	if err = orm.Eloquent.Table(role.TableName()).First(&update, id).Error; err != nil {
+//		return
+//	}
+//
+//	if role.RoleName != "" && role.RoleName != update.RoleName {
+//		return update, errors.New("角色名称不允许修改！")
+//	}
+//
+//	if role.RoleKey != "" && role.RoleKey != update.RoleKey {
+//		return update, errors.New("角色标识不允许修改！")
+//	}
+//
+//	//参数1:是要修改的数据
+//	//参数2:是修改的数据
+//	if err = orm.Eloquent.Table(role.TableName()).Model(&update).Updates(&role).Error; err != nil {
+//		return
+//	}
+//	return
+//}
+//
+////批量删除
+//func (role *SysRole) BatchDelete(id []int) (Result bool, err error) {
+//	tx := orm.Eloquent.Begin()
+//
+//	defer func() {
+//		if r := recover(); r != nil {
+//			tx.Rollback()
+//		}
+//	}()
+//
+//	if err := tx.Error; err != nil {
+//		return false, err
+//	}
+//	// 查询角色
+//	var roles []SysRole
+//	if err := tx.Table("sys_role").Where("role_id in (?)", id).Find(&roles).Error; err != nil {
+//		tx.Rollback()
+//		return false, err
+//	}
+//
+//	var count int64
+//	if err := tx.Table("sys_user").Where("role_id in (?)", id).Count(&count).Error; err != nil {
+//		tx.Rollback()
+//		return false, err
+//	}
+//	if count > 0 {
+//		tx.Rollback()
+//		return false, errors.New("存在绑定用户，请解绑后重试")
+//	}
+//
+//	// 删除角色
+//	if err = tx.Table(role.TableName()).Where("role_id in (?)", id).Unscoped().Delete(&SysRole{}).Error; err != nil {
+//		tx.Rollback()
+//		return false, err
+//	}
+//
+//	// 删除角色菜单
+//	if err := tx.Table("sys_role_menu").Where("role_id in (?)", id).Delete(&RoleMenu{}).Error; err != nil {
+//		tx.Rollback()
+//		return false, err
+//	}
+//
+//	// 删除casbin配置
+//	for i := 0; i < len(roles); i++ {
+//		if err := tx.Table("sys_casbin_rule").Where("v0 in (?)", roles[0].RoleKey).Delete(&CasbinRule{}).Error; err != nil {
+//			tx.Rollback()
+//			return false, err
+//		}
+//	}
+//
+//	if err := tx.Commit().Error; err != nil {
+//		return false, err
+//	}
+//
+//	return true, nil
+//}

app/admin/models/rolemenu.go

@@ -0,0 +1,231 @@
+package models
+
+import (
+	"gorm.io/gorm"
+)
+
+type RoleMenu struct {
+	RoleId   int    `gorm:""`
+	MenuId   int    `gorm:""`
+	RoleName string `gorm:"size:128)"`
+	CreateBy string `gorm:"size:128)"`
+	UpdateBy string `gorm:"size:128)"`
+}
+
+func (RoleMenu) TableName() string {
+	return "sys_role_menu"
+}
+
+type MenuPath struct {
+	Path string `json:"path"`
+}
+
+//func (rm *RoleMenu) Get(tx *gorm.DB) ([]RoleMenu, error) {
+//	var r []RoleMenu
+//	table := tx.Table("sys_role_menu")
+//	if rm.RoleId != 0 {
+//		table = table.Where("role_id = ?", rm.RoleId)
+//
+//	}
+//	if err := table.Find(&r).Error; err != nil {
+//		return nil, err
+//	}
+//	return r, nil
+//}
+
+func (rm *RoleMenu) GetPermis(tx *gorm.DB) ([]string, error) {
+	var r []Menu
+	table := tx.Select("sys_menu.permission").Table("sys_menu").Joins("left join sys_role_menu on sys_menu.menu_id = sys_role_menu.menu_id")
+
+	table = table.Where("role_id = ?", rm.RoleId)
+
+	table = table.Where("sys_menu.menu_type in('F','C')")
+	if err := table.Find(&r).Error; err != nil {
+		return nil, err
+	}
+	var list []string
+	for i := 0; i < len(r); i++ {
+		list = append(list, r[i].Permission)
+	}
+	return list, nil
+}
+
+func (rm *RoleMenu) GetIDS(tx *gorm.DB) ([]MenuPath, error) {
+	var r []MenuPath
+	table := tx.Select("sys_menu.path").Table("sys_role_menu")
+	table = table.Joins("left join sys_role on sys_role.role_id=sys_role_menu.role_id")
+	table = table.Joins("left join sys_menu on sys_menu.id=sys_role_menu.menu_id")
+	table = table.Where("sys_role.role_name = ? and sys_menu.type=1", rm.RoleName)
+	if err := table.Find(&r).Error; err != nil {
+		return nil, err
+	}
+	return r, nil
+}
+
+//func (rm *RoleMenu) DeleteRoleMenu(roleId int) (bool, error) {
+//	tx := orm.Eloquent.Begin()
+//	defer func() {
+//		if r := recover(); r != nil {
+//			tx.Rollback()
+//		}
+//	}()
+//
+//	if err := tx.Error; err != nil {
+//		return false, err
+//	}
+//
+//	if err := tx.Table("sys_role_dept").Where("role_id = ?", roleId).Delete(&rm).Error; err != nil {
+//		tx.Rollback()
+//		return false, err
+//	}
+//	if err := tx.Table("sys_role_menu").Where("role_id = ?", roleId).Delete(&rm).Error; err != nil {
+//		tx.Rollback()
+//		return false, err
+//	}
+//	var role SysRole
+//	if err := tx.Table("sys_role").Where("role_id = ?", roleId).First(&role).Error; err != nil {
+//		tx.Rollback()
+//		return false, err
+//	}
+//	sql3 := "delete from sys_casbin_rule where v0= '" + role.RoleKey + "';"
+//	if err := tx.Exec(sql3).Error; err != nil {
+//		tx.Rollback()
+//		return false, err
+//	}
+//	if err := tx.Commit().Error; err != nil {
+//		return false, err
+//	}
+//
+//	return true, nil
+//
+//}
+
+// 该方法即将弃用
+//func (rm *RoleMenu) BatchDeleteRoleMenu(roleIds []int) (bool, error) {
+//	tx := orm.Eloquent.Begin()
+//	defer func() {
+//		if r := recover(); r != nil {
+//			tx.Rollback()
+//		}
+//	}()
+//
+//	if err := tx.Error; err != nil {
+//		return false, err
+//	}
+//
+//	if err := tx.Table("sys_role_menu").Where("role_id in (?)", roleIds).Delete(&rm).Error; err != nil {
+//		tx.Rollback()
+//		return false, err
+//	}
+//	var role []SysRole
+//	if err := tx.Table("sys_role").Where("role_id in (?)", roleIds).Find(&role).Error; err != nil {
+//		tx.Rollback()
+//		return false, err
+//	}
+//	sql := ""
+//	for i := 0; i < len(role); i++ {
+//		sql += "delete from sys_casbin_rule where v0= '" + role[i].RoleName + "';"
+//	}
+//	if err := tx.Exec(sql).Error; err != nil {
+//		tx.Rollback()
+//		return false, err
+//	}
+//	if err := tx.Commit().Error; err != nil {
+//		return false, err
+//	}
+//	return true, nil
+//
+//}
+
+//func (rm *RoleMenu) Insert(roleId int, menuId []int) (bool, error) {
+//	var (
+//		role            SysRole
+//		menu            []Menu
+//		casbinRuleQueue []system.CasbinRule // casbinRule 待插入队列
+//	)
+//
+//	// 开始事务
+//	tx := orm.Eloquent.Begin()
+//	defer func() {
+//		if r := recover(); r != nil {
+//			tx.Rollback()
+//		}
+//	}()
+//
+//	if err := tx.Error; err != nil {
+//		return false, err
+//	}
+//
+//	// 在事务中做一些数据库操作（从这一点使用'tx'，而不是'db'）
+//	if err := tx.Table("sys_role").Where("role_id = ?", roleId).First(&role).Error; err != nil {
+//		tx.Rollback()
+//		return false, err
+//	}
+//	if err := tx.Table("sys_menu").Where("menu_id in (?)", menuId).Find(&menu).Error; err != nil {
+//		tx.Rollback()
+//		return false, err
+//	}
+//	//ORM不支持批量插入所以需要拼接 sql 串
+//	sysRoleMenuSql := "INSERT INTO `sys_role_menu` (`role_id`,`menu_id`,`role_name`) VALUES "
+//	casbinRuleSql := "INSERT INTO `sys_casbin_rule`  (`p_type`,`v0`,`v1`,`v2`) VALUES "
+//
+//	for i, m := range menu {
+//		// 拼装'role_menu'表批量插入SQL语句
+//		sysRoleMenuSql += fmt.Sprintf("(%d,%d,'%s')", role.RoleId, m.MenuId, role.RoleKey)
+//		if i == len(menu)-1 {
+//			sysRoleMenuSql += ";" //最后一条数据 以分号结尾
+//		} else {
+//			sysRoleMenuSql += ","
+//		}
+//		if m.MenuType == "A" {
+//			// 加入队列
+//			casbinRuleQueue = append(casbinRuleQueue,
+//				system.CasbinRule{
+//					V0: role.RoleKey,
+//					V1: m.Path,
+//					V2: m.Action,
+//				})
+//		}
+//	}
+//	// 执行批量插入sys_role_menu
+//	if err := tx.Exec(sysRoleMenuSql).Error; err != nil {
+//		tx.Rollback()
+//		return false, err
+//	}
+//
+//	// 拼装'sys_casbin_rule'批量插入SQL语句
+//	// TODO: casbinRuleQueue队列不为空时才会拼装，否则直接忽略不执行'for'循环
+//	for i, v := range casbinRuleQueue {
+//		casbinRuleSql += fmt.Sprintf("('p','%s','%s','%s')", v.V0, v.V1, v.V2)
+//		if i == len(casbinRuleQueue)-1 {
+//			casbinRuleSql += ";"
+//		} else {
+//			casbinRuleSql += ","
+//		}
+//	}
+//	// 执行批量插入sys_casbin_rule
+//	if len(casbinRuleQueue) > 0 {
+//		if err := tx.Exec(casbinRuleSql).Error; err != nil {
+//			tx.Rollback()
+//			return false, err
+//		}
+//	}
+//
+//	if err := tx.Commit().Error; err != nil {
+//		return false, err
+//	}
+//	return true, nil
+//}
+
+//func (rm *RoleMenu) Delete(RoleId string, MenuID string) (bool, error) {
+//	rm.RoleId, _ = tools.StringToInt(RoleId)
+//	table := orm.Eloquent.Table("sys_role_menu").Where("role_id = ?", RoleId)
+//	if MenuID != "" {
+//		table = table.Where("menu_id = ?", MenuID)
+//	}
+//	if err := table.Delete(&rm).Error; err != nil {
+//		return false, err
+//	}
+//	return true, nil
+//
+//}

app/admin/models/sys_file_dir.go

@@ -0,0 +1,40 @@
+package models
+
+import (
+	"go-admin/common/models"
+)
+
+type SysFileDir struct {
+	models.Model
+	Label    string       `json:"label" gorm:"type:varchar(255);comment:目录名称"` // 目录名称
+	PId      int          `json:"pId" gorm:"type:int(11);comment:上级目录"`        // 上级目录
+	Sort     string       `json:"sort" gorm:"type:bigint(20);comment:排序"`      // 排序
+	Path     string       `json:"path" gorm:"type:varchar(255);comment:路径"`    // 路径
+	Children []SysFileDir `json:"children,omitempty" gorm:"-"`                 // 下级信息
+	models.ControlBy
+	models.ModelTime
+}
+
+type SysFileDirL struct {
+	models.Model
+	Label string `json:"label" gorm:"type:varchar(255);comment:目录名称"` // 目录名称
+	PId   int    `json:"pId" gorm:"type:int(11);comment:上级目录"`        // 上级目录
+	Sort  string `json:"sort" gorm:"type:bigint(20);comment:排序"`      // 排序
+	Path  string `json:"path" gorm:"type:varchar(255);comment:路径"`    // 路径
+	models.ControlBy
+	models.ModelTime
+	Children []SysFileDirL `json:"children,omitempty" gorm:"-"` // 下级信息
+}
+
+func (SysFileDir) TableName() string { /**/
+	return "sys_file_dir"
+}
+
+func (e *SysFileDir) Generate() models.ActiveRecord {
+	o := *e
+	return &o
+}
+
+func (e *SysFileDir) GetId() interface{} {
+	return e.Id
+}

app/admin/models/sys_file_info.go

@@ -0,0 +1,31 @@
+package models
+
+import (
+	"go-admin/common/models"
+)
+
+type SysFileInfo struct {
+	models.Model
+	Type    string `json:"type" gorm:"type:varchar(255);comment:类型"`     //
+	Name    string `json:"name" gorm:"type:varchar(255);comment:名称"`     //
+	Size    string `json:"size" gorm:"type:int(11);comment:大小"`          //
+	PId     int    `json:"pId" gorm:"type:int(11);comment:目录"`           //
+	Source  string `json:"source" gorm:"type:varchar(255);comment:来源"`   //
+	Url     string `json:"url" gorm:"type:varchar(255);comment:地址"`      //
+	FullUrl string `json:"fullUrl" gorm:"type:varchar(255);comment:全地址"` //
+	models.ControlBy
+	models.ModelTime
+}
+
+func (SysFileInfo) TableName() string {
+	return "sys_file_info"
+}
+
+func (e *SysFileInfo) Generate() models.ActiveRecord {
+	o := *e
+	return &o
+}
+
+func (e *SysFileInfo) GetId() interface{} {
+	return e.Id
+}

app/admin/models/syscategory.go

@@ -0,0 +1,29 @@
+package models
+
+import (
+	"go-admin/common/models"
+)
+
+type SysCategory struct {
+	models.Model
+	Name   string `json:"name" gorm:"type:varchar(255);comment:名称"`   //
+	Img    string `json:"img" gorm:"type:varchar(255);comment:图标"`    //
+	Sort   string `json:"sort" gorm:"type:int(4);comment:排序"`         //
+	Status string `json:"status" gorm:"type:int(1);comment:状态"`       //
+	Remark string `json:"remark" gorm:"type:varchar(255);comment:备注"` //
+	models.ControlBy
+	models.ModelTime
+}
+
+func (SysCategory) TableName() string {
+	return "sys_category"
+}
+
+func (e *SysCategory) Generate() models.ActiveRecord {
+	o := *e
+	return &o
+}
+
+func (e *SysCategory) GetId() interface{} {
+	return e.Id
+}

app/admin/models/syschinaareadata.go

@@ -0,0 +1,30 @@
+package models
+
+import (
+	"go-admin/common/models"
+	"time"
+)
+
+type SysChinaAreaData struct {
+	models.Model
+	models.ControlBy
+
+	PId        string    `json:"pId" gorm:"type:int(11);comment:上级编码"`
+	Name       string    `json:"name" gorm:"type:varchar(128);comment:名称"`
+	CreateTime time.Time `json:"createTime" gorm:"type:timestamp;comment:CreateTime"`
+	UpdateTime time.Time `json:"updateTime" gorm:"type:timestamp;comment:UpdateTime"`
+	DeleteTime time.Time `json:"deleteTime" gorm:"type:timestamp;comment:DeleteTime"`
+}
+
+func (SysChinaAreaData) TableName() string {
+	return "sys_china_area_data"
+}
+
+func (e *SysChinaAreaData) Generate() models.ActiveRecord {
+	o := *e
+	return &o
+}
+
+func (e *SysChinaAreaData) GetId() interface{} {
+	return e.Id
+}

app/admin/models/syscontent.go

@@ -0,0 +1,137 @@
+package models
+
+import (
+	"go-admin/common/models"
+)
+
+type SysContent struct {
+	Id      int    `json:"id" gorm:"type:int(11);primaryKey;autoIncrement"` // id
+	CateId  string `json:"cateId" gorm:"type:int(11);comment:分类id"`
+	Name    string `json:"name" gorm:"type:varchar(255);comment:名称"`
+	Status  string `json:"status" gorm:"type:int(1);comment:状态"`
+	Img     string `json:"img" gorm:"type:varchar(255);comment:图片"`
+	Content string `json:"content" gorm:"type:text;comment:内容"`
+	Remark  string `json:"remark" gorm:"type:varchar(255);comment:备注"`
+	Sort    string `json:"sort" gorm:"type:int(4);comment:排序"`
+	models.ControlBy
+	models.ModelTime
+}
+
+func (SysContent) TableName() string {
+	return "sys_content"
+}
+
+func (e *SysContent) Generate() models.ActiveRecord {
+	o := *e
+	return &o
+}
+
+func (e *SysContent) GetId() interface{} {
+	return e.Id
+}
+
+//// 创建SysContent
+//func (e *SysContent) Create() (SysContent, error) {
+//	var doc SysContent
+//	result := orm.Eloquent.Table(e.TableName()).Create(&e)
+//	if result.Error != nil {
+//		err := result.Error
+//		return doc, err
+//	}
+//	doc = *e
+//	return doc, nil
+//}
+//
+//// 获取SysContent
+//func (e *SysContent) Get() (SysContent, error) {
+//	var doc SysContent
+//	table := orm.Eloquent.Table(e.TableName())
+//
+//	if e.Id != 0 {
+//		table = table.Where("id = ?", e.Id)
+//	}
+//
+//	if e.CateId != "" {
+//		table = table.Where("cate_id = ?", e.CateId)
+//	}
+//
+//	if e.Name != "" {
+//		table = table.Where("name like ?", "%"+e.Name+"%")
+//	}
+//
+//	if e.Status != "" {
+//		table = table.Where("status = ?", e.Status)
+//	}
+//
+//	if err := table.First(&doc).Error; err != nil {
+//		return doc, err
+//	}
+//	return doc, nil
+//}
+//
+//// 获取SysContent带分页
+//func (e *SysContent) GetPage(pageSize int, pageIndex int) ([]SysContent, int, error) {
+//	var doc []SysContent
+//
+//	table := orm.Eloquent.Table(e.TableName())
+//
+//	if e.CateId != "" {
+//		table = table.Where("cate_id = ?", e.CateId)
+//	}
+//
+//	if e.Name != "" {
+//		table = table.Where("name like ?", "%"+e.Name+"%")
+//	}
+//
+//	if e.Status != "" {
+//		table = table.Where("status = ?", e.Status)
+//	}
+//
+//	// 数据权限控制(如果不需要数据权限请将此处去掉)
+//	dataPermission := new(system.DataPermission)
+//	dataPermission.UserId, _ = tools.StringToInt(e.DataScope)
+//	table, err := dataPermission.GetDataScope(e.TableName(), table)
+//	if err != nil {
+//		return nil, 0, err
+//	}
+//	var count int64
+//
+//	if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Offset(-1).Limit(-1).Count(&count).Error; err != nil {
+//		return nil, 0, err
+//	}
+//	//table.Where("`deleted_at` IS NULL").Count(&count)
+//	return doc, int(count), nil
+//}
+//
+//// 更新SysContent
+//func (e *SysContent) Update(id int) (update SysContent, err error) {
+//	if err = orm.Eloquent.Table(e.TableName()).Where("id = ?", id).First(&update).Error; err != nil {
+//		return
+//	}
+//
+//	//参数1:是要修改的数据
+//	//参数2:是修改的数据
+//	if err = orm.Eloquent.Table(e.TableName()).Model(&update).Where("id = ?", id).Updates(&e).Error; err != nil {
+//		return
+//	}
+//	return
+//}
+//
+//// 删除SysContent
+//func (e *SysContent) Delete(id int) (success bool, err error) {
+//	if err = orm.Eloquent.Table(e.TableName()).Where("id = ?", id).Delete(&SysContent{}).Error; err != nil {
+//		success = false
+//		return
+//	}
+//	success = true
+//	return
+//}
+//
+////批量删除
+//func (e *SysContent) BatchDelete(id []int) (Result bool, err error) {
+//	if err = orm.Eloquent.Table(e.TableName()).Where("id in (?)", id).Delete(&SysContent{}).Error; err != nil {
+//		return
+//	}
+//	Result = true
+//	return
+//}

app/admin/models/sysjob.go

@@ -0,0 +1,111 @@
+package models
+
+import (
+	"go-admin/common/models"
+	"gorm.io/gorm"
+	"strconv"
+)
+
+type SysJob struct {
+	JobId          int    `json:"jobId" gorm:"primaryKey;autoIncrement"` // 编码
+	JobName        string `json:"jobName" gorm:"size:255;"`              // 名称
+	JobGroup       string `json:"jobGroup" gorm:"size:255;"`             // 任务分组
+	JobType        int    `json:"jobType" gorm:"size:1;"`                // 任务类型
+	CronExpression string `json:"cronExpression" gorm:"size:255;"`       // cron表达式
+	InvokeTarget   string `json:"invokeTarget" gorm:"size:255;"`         // 调用目标
+	Args           string `json:"args" gorm:"size:255;"`                 // 目标参数
+	MisfirePolicy  int    `json:"misfirePolicy" gorm:"size:255;"`        // 执行策略
+	Concurrent     int    `json:"concurrent" gorm:"size:1;"`             // 是否并发
+	Status         int    `json:"status" gorm:"size:1;"`                 // 状态
+	EntryId        int    `json:"entry_id" gorm:"size:11;"`              // job启动时返回的id
+	CreateBy       string `json:"createBy" gorm:"size:128;"`             //
+	UpdateBy       string `json:"updateBy" gorm:"size:128;"`             //
+	BaseModel
+
+	DataScope string `json:"dataScope" gorm:"-"`
+}
+
+func (SysJob) TableName() string {
+	return "sys_job"
+}
+
+func (e *SysJob) Generate() models.ActiveRecord {
+	o := *e
+	return &o
+}
+
+func (e *SysJob) GetId() interface{} {
+	return e.JobId
+}
+
+func (e *SysJob) SetCreateBy(createBy int) {
+	e.CreateBy = strconv.Itoa(int(createBy))
+}
+
+func (e *SysJob) SetUpdateBy(updateBy int) {
+	e.UpdateBy = strconv.Itoa(int(updateBy))
+}
+
+// 创建SysJob
+//func (e *SysJob) Create() (err error) {
+//	return orm.Eloquent.Table(e.TableName()).Create(e).Error
+//}
+
+// 获取SysJob
+//func (e *SysJob) Get(id interface{}) (err error) {
+//	return orm.Eloquent.Table(e.TableName()).First(e, id).Error
+//}
+
+// 获取SysJob带分页
+//func (e *SysJob) GetPage(pageSize int, pageIndex int, v interface{}, list interface{}) (int, error) {
+//	table := orm.Eloquent.Table(e.TableName()).Scopes(dto.MakeCondition(v))
+//
+//	// 数据权限控制(如果不需要数据权限请将此处去掉)
+//	//dataPermission := new(DataPermission)
+//	userid, _ := tools.StringToInt(e.DataScope)
+//
+//	var count int64
+//
+//	if err := table.Scopes(system.DataScopes(e.TableName(), userid), dto.Paginate(pageSize, pageIndex)).Find(list).Offset(-1).Limit(-1).Count(&count).Error; err != nil {
+//		return 0, err
+//	}
+//	return int(count), nil
+//}
+
+func (e *SysJob) GetList(tx *gorm.DB, list interface{}) (err error) {
+	return tx.Table(e.TableName()).Where("status = ?", 2).Find(list).Error
+}
+
+// 更新SysJob
+func (e *SysJob) Update(tx *gorm.DB, id interface{}) (err error) {
+	return tx.Table(e.TableName()).Where(id).Updates(&e).Error
+}
+
+func (e *SysJob) RemoveAllEntryID(tx *gorm.DB) (update SysJob, err error) {
+	if err = tx.Table(e.TableName()).Where("entry_id > ?", 0).Update("entry_id", 0).Error; err != nil {
+		return
+	}
+	return
+}
+
+//func (e *SysJob) RemoveEntryID(entryID int) (update SysJob, err error) {
+//	if err = orm.Eloquent.Table(e.TableName()).Where("entry_id = ?", entryID).Updates(map[string]interface{}{"entry_id": 0}).Error; err != nil {
+//		return
+//	}
+//	return
+//}
+
+// 删除SysJob
+//func (e *SysJob) Delete(id int) (success bool, err error) {
+//	if err = orm.Eloquent.Table(e.TableName()).Where(id).Delete(&SysJob{}).Error; err != nil {
+//		success = false
+//		return
+//	}
+//	success = true
+//	return
+//}
+
+//批量删除
+//func (e *SysJob) BatchDelete(id []int) error {
+//	return orm.Eloquent.Table(e.TableName()).Where(id).Delete(&SysJob{}).Error
+//}

app/admin/models/system.go

@@ -0,0 +1,44 @@
+package models
+
+import (
+	"go-admin/common/models"
+)
+
+type SysSetting struct {
+	SettingsId int    `json:"settings_id" gorm:"primary_key;AUTO_INCREMENT"`
+	Name       string `json:"name" gorm:"type:varchar(256);"`
+	Logo       string `json:"logo" gorm:"type:varchar(256);"`
+	models.ModelTime
+}
+
+func (SysSetting) TableName() string {
+	return "sys_setting"
+}
+
+func (s *SysSetting) GetId() interface{} {
+	return s.SettingsId
+}
+
+//查询
+//func (s *SysSetting) Get() (create SysSetting, err error) {
+//	result := orm.Eloquent.Table("sys_setting").First(&create)
+//	if result.Error != nil {
+//		err = result.Error
+//		return
+//	}
+//	return create, nil
+//}
+
+//修改
+//func (s *SysSetting) Update() (update SysSetting, err error) {
+//	if err = orm.Eloquent.Table("sys_setting").Model(&update).Where("settings_id = ?", s.SettingsId).Updates(&s).Error; err != nil {
+//		return
+//	}
+//	return
+//}
+
+type ResponseSystemConfig struct {
+	Name       string `json:"name" binding:"required"`        // 名称
+	Logo       string `json:"logo" binding:"required"`        // 头像
+	SettingsId int    `json:"settings_id" binding:"required"` // 头像
+}

app/admin/models/system/casbinrule.go

@@ -1,6 +1,6 @@
-package models
+package system
 
-//casbin_rule
+//sys_casbin_rule
 type CasbinRule struct {
 	PType string `json:"p_type" gorm:"size:100;"`
 	V0    string `json:"v0" gorm:"size:100;"`
@@ -12,5 +12,5 @@ type CasbinRule struct {
 }
 
 func (CasbinRule) TableName() string {
-	return "casbin_rule"
+	return "sys_casbin_rule"
 }

app/admin/models/system/datascope.go

@@ -0,0 +1,81 @@
+package system
+
+import (
+	"errors"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+	"gorm.io/gorm"
+
+	log "github.com/go-admin-team/go-admin-core/logger"
+	"github.com/go-admin-team/go-admin-core/sdk/config"
+)
+
+type DataPermission struct {
+	DataScope string
+	UserId    int
+	DeptId    int
+	RoleId    int
+}
+
+func (e *DataPermission) GetDataScope(tableName string, db *gorm.DB) (*gorm.DB, error) {
+
+	if !config.ApplicationConfig.EnableDP {
+		usageStr := `数据权限已经为您` + pkg.Green(`关闭`) + `，如需开启请参考配置文件字段说明`
+		log.Debug("%s\n", usageStr)
+		return db, nil
+	}
+	user := new(SysUser)
+	role := new(SysRole)
+	err := db.Find(user, e.UserId).Error
+	if err != nil {
+		return nil, errors.New("获取用户数据出错 msg:" + err.Error())
+	}
+	err = db.Find(role, user.RoleId).Error
+	if err != nil {
+		return nil, errors.New("获取用户数据出错 msg:" + err.Error())
+	}
+	if role.DataScope == "2" {
+		db = db.Where(tableName+".create_by in (select sys_user.user_id from sys_role_dept left join sys_user on sys_user.dept_id=sys_role_dept.dept_id where sys_role_dept.role_id = ?)", user.RoleId)
+	}
+	if role.DataScope == "3" {
+		db = db.Where(tableName+".create_by in (SELECT user_id from sys_user where dept_id = ? )", user.DeptId)
+	}
+	if role.DataScope == "4" {
+		db = db.Where(tableName+".create_by in (SELECT user_id from sys_user where sys_user.dept_id in(select dept_id from sys_dept where dept_path like ? ))", "%"+pkg.IntToString(user.DeptId)+"%")
+	}
+	if role.DataScope == "5" || role.DataScope == "" {
+		db = db.Where(tableName+".create_by = ?", e.UserId)
+	}
+
+	return db, nil
+}
+
+func DataScopes(tableName string, userId int) func(db *gorm.DB) *gorm.DB {
+	return func(db *gorm.DB) *gorm.DB {
+		user := new(SysUser)
+		role := new(SysRole)
+		user.UserId = userId
+		err := db.Find(user, userId).Error
+		if err != nil {
+			db.Error = errors.New("获取用户数据出错 msg:" + err.Error())
+			return db
+		}
+		err = db.Find(role, user.RoleId).Error
+		if err != nil {
+			db.Error = errors.New("获取用户数据出错 msg:" + err.Error())
+			return db
+		}
+		if role.DataScope == "2" {
+			return db.Where(tableName+".create_by in (select sys_user.user_id from sys_role_dept left join sys_user on sys_user.dept_id=sys_role_dept.dept_id where sys_role_dept.role_id = ?)", user.RoleId)
+		}
+		if role.DataScope == "3" {
+			return db.Where(tableName+".create_by in (SELECT user_id from sys_user where dept_id = ? )", user.DeptId)
+		}
+		if role.DataScope == "4" {
+			return db.Where(tableName+".create_by in (SELECT user_id from sys_user where sys_user.dept_id in(select dept_id from sys_dept where dept_path like ? ))", "%"+pkg.IntToString(user.DeptId)+"%")
+		}
+		if role.DataScope == "5" || role.DataScope == "" {
+			return db.Where(tableName+".create_by = ?", userId)
+		}
+		return db
+	}
+}

app/admin/models/system/login.go

@@ -0,0 +1,35 @@
+package system
+
+import (
+	"fmt"
+	log "github.com/go-admin-team/go-admin-core/logger"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+	"gorm.io/gorm"
+)
+
+type Login struct {
+	Username string `form:"UserName" json:"username" binding:"required"`
+	Password string `form:"Password" json:"password" binding:"required"`
+	Code     string `form:"Code" json:"code" binding:"required"`
+	UUID     string `form:"UUID" json:"uuid" binding:"required"`
+}
+
+func (u *Login) GetUser(tx *gorm.DB) (user SysUser, role SysRole, err error) {
+	err = tx.Table("sys_user").Where("username = ?  and status = 2", u.Username).First(&user).Error
+	if err != nil {
+		log.Errorf("get user error, %s", err.Error())
+		return
+	}
+	fmt.Println(user.Password, u.Password)
+	_, err = pkg.CompareHashAndPassword(user.Password, u.Password)
+	if err != nil {
+		log.Errorf("user login error, %s", err.Error())
+		return
+	}
+	err = tx.Table("sys_role").Where("role_id = ? ", user.RoleId).First(&role).Error
+	if err != nil {
+		log.Errorf("get role error, %s", err.Error())
+		return
+	}
+	return
+}

app/admin/models/system/role_dept.go

@@ -0,0 +1,11 @@
+package system
+
+//sys_role_dept
+type SysRoleDept struct {
+	RoleId int `gorm:"size:11;primaryKey"`
+	DeptId int `gorm:"size:11;primaryKey"`
+}
+
+func (SysRoleDept) TableName() string {
+	return "sys_role_dept"
+}

app/admin/models/system/role_menu.go

@@ -0,0 +1,171 @@
+package system
+
+import (
+	"fmt"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+
+	"github.com/casbin/casbin/v2"
+	"gorm.io/gorm"
+)
+
+type RoleMenu struct {
+	RoleId   int    `gorm:""`
+	MenuId   int    `gorm:""`
+	RoleName string `gorm:"size:128"`
+	CreateBy string `gorm:"size:128"`
+	UpdateBy string `gorm:"size:128"`
+}
+
+func (RoleMenu) TableName() string {
+	return "sys_role_menu"
+}
+
+type MenuPath struct {
+	Path string `json:"path"`
+}
+
+func (rm *RoleMenu) Get(tx *gorm.DB) ([]RoleMenu, error) {
+	var r []RoleMenu
+	table := tx.Table("sys_role_menu")
+	if rm.RoleId != 0 {
+		table = table.Where("role_id = ?", rm.RoleId)
+
+	}
+	if err := table.Find(&r).Error; err != nil {
+		return nil, err
+	}
+	return r, nil
+}
+
+func (rm *RoleMenu) GetPermis(tx *gorm.DB) ([]string, error) {
+	var r []SysMenu
+	table := tx.Select("sys_menu.permission").Table("sys_menu").Joins("left join sys_role_menu on sys_menu.menu_id = sys_role_menu.menu_id")
+
+	table = table.Where("role_id = ?", rm.RoleId)
+
+	table = table.Where("sys_menu.menu_type in('F','C')")
+	if err := table.Find(&r).Error; err != nil {
+		return nil, err
+	}
+	var list []string
+	for i := 0; i < len(r); i++ {
+		list = append(list, r[i].Permission)
+	}
+	return list, nil
+}
+
+func (rm *RoleMenu) GetIDS(tx *gorm.DB) ([]MenuPath, error) {
+	var r []MenuPath
+	table := tx.Select("sys_menu.path").Table("sys_role_menu")
+	table = table.Joins("left join sys_role on sys_role.role_id=sys_role_menu.role_id")
+	table = table.Joins("left join sys_menu on sys_menu.id=sys_role_menu.menu_id")
+	table = table.Where("sys_role.role_name = ? and sys_menu.type=1", rm.RoleName)
+	if err := table.Find(&r).Error; err != nil {
+		return nil, err
+	}
+	return r, nil
+}
+
+func (rm *RoleMenu) DeleteRoleMenu(tx *gorm.DB, roleId int) error {
+	if err := tx.Table("sys_role_dept").Where("role_id = ?", roleId).Delete(&rm).Error; err != nil {
+		return err
+	}
+	if err := tx.Table("sys_role_menu").Where("role_id = ?", roleId).Delete(&rm).Error; err != nil {
+		return err
+	}
+	var role SysRole
+	if err := tx.Table("sys_role").Where("role_id = ?", roleId).First(&role).Error; err != nil {
+		return err
+	}
+	sql3 := "delete from sys_casbin_rule where v0= '" + role.RoleKey + "';"
+	if err := tx.Exec(sql3).Error; err != nil {
+		return err
+	}
+	return nil
+
+}
+
+// 该方法即将弃用
+func (rm *RoleMenu) BatchDeleteRoleMenu(tx *gorm.DB, roleIds []int) error {
+	if err := tx.Table("sys_role_menu").Where("role_id in (?)", roleIds).Delete(&rm).Error; err != nil {
+		return err
+	}
+	var role []SysRole
+	if err := tx.Table("sys_role").Where("role_id in (?)", roleIds).Find(&role).Error; err != nil {
+		return err
+	}
+	sql := ""
+	for i := 0; i < len(role); i++ {
+		sql += "delete from sys_casbin_rule where v0= '" + role[i].RoleName + "';"
+	}
+	if err := tx.Exec(sql).Error; err != nil {
+		return err
+	}
+	if err := tx.Commit().Error; err != nil {
+		return err
+	}
+	return nil
+
+}
+
+func (rm *RoleMenu) Insert(tx *gorm.DB, enforcer *casbin.SyncedEnforcer, roleId int, menuId []int) error {
+	var err error
+	var (
+		role        SysRole
+		menu        []SysMenu
+		casbinRules []CasbinRule // casbinRule 待插入队列
+	)
+	// 在事务中做一些数据库操作（从这一点使用'tx'，而不是'db'）
+	if err = tx.Table("sys_role").Where("role_id = ?", roleId).First(&role).Error; err != nil {
+		return err
+	}
+	if err = tx.Table("sys_menu").Where("menu_id in (?)", menuId).Find(&menu).Error; err != nil {
+		return err
+	}
+	//ORM不支持批量插入所以需要拼接 sql 串
+	sysRoleMenuSql := "INSERT INTO `sys_role_menu` (`role_id`,`menu_id`,`role_name`) VALUES "
+
+	for i, m := range menu {
+		// 拼装'role_menu'表批量插入SQL语句
+		sysRoleMenuSql += fmt.Sprintf("(%d,%d,'%s')", role.RoleId, m.MenuId, role.RoleKey)
+		if i == len(menu)-1 {
+			sysRoleMenuSql += ";" //最后一条数据 以分号结尾
+		} else {
+			sysRoleMenuSql += ","
+		}
+		if m.MenuType == "A" {
+			// 加入队列
+			casbinRules = append(casbinRules,
+				CasbinRule{
+					V0: role.RoleKey,
+					V1: m.Path,
+					V2: m.Action,
+				})
+		}
+	}
+	// 执行批量插入sys_role_menu
+	if err = tx.Exec(sysRoleMenuSql).Error; err != nil {
+		return err
+	}
+
+	// 执行批量插入sys_casbin_rule
+	if len(casbinRules) > 0 {
+		if err = tx.Create(&casbinRules).Error; err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (rm *RoleMenu) Delete(tx *gorm.DB, RoleId string, MenuID string) (bool, error) {
+	rm.RoleId, _ = pkg.StringToInt(RoleId)
+	table := tx.Table("sys_role_menu").Where("role_id = ?", RoleId)
+	if MenuID != "" {
+		table = table.Where("menu_id = ?", MenuID)
+	}
+	if err := table.Delete(&rm).Error; err != nil {
+		return false, err
+	}
+	return true, nil
+
+}

app/admin/models/system/sys_config.go

@@ -0,0 +1,29 @@
+package system
+
+import (
+	"go-admin/common/models"
+)
+
+type SysConfig struct {
+	models.Model
+	ConfigName  string `json:"configName" gorm:"type:varchar(128);comment:ConfigName"`   //
+	ConfigKey   string `json:"configKey" gorm:"type:varchar(128);comment:ConfigKey"`     //
+	ConfigValue string `json:"configValue" gorm:"type:varchar(255);comment:ConfigValue"` //
+	ConfigType  string `json:"configType" gorm:"type:varchar(64);comment:ConfigType"`    //
+	Remark      string `json:"remark" gorm:"type:varchar(128);comment:Remark"`           //
+	models.ControlBy
+	models.ModelTime
+}
+
+func (SysConfig) TableName() string {
+	return "sys_config"
+}
+
+func (e *SysConfig) Generate() models.ActiveRecord {
+	o := *e
+	return &o
+}
+
+func (e *SysConfig) GetId() interface{} {
+	return e.Id
+}

app/admin/models/system/sys_dept.go

@@ -0,0 +1,33 @@
+package system
+
+import "go-admin/common/models"
+
+type SysDept struct {
+	DeptId   int    `json:"deptId" gorm:"primaryKey;autoIncrement;"` //部门编码
+	ParentId int    `json:"parentId" gorm:""`                        //上级部门
+	DeptPath string `json:"deptPath" gorm:"size:255;"`               //
+	DeptName string `json:"deptName"  gorm:"size:128;"`              //部门名称
+	Sort     int    `json:"sort" gorm:""`                            //排序
+	Leader   string `json:"leader" gorm:"size:128;"`                 //负责人
+	Phone    string `json:"phone" gorm:"size:11;"`                   //手机
+	Email    string `json:"email" gorm:"size:64;"`                   //邮箱
+	Status   string `json:"status" gorm:"size:4;"`                   //状态
+	models.ControlBy
+	models.ModelTime
+	DataScope string    `json:"dataScope" gorm:"-"`
+	Params    string    `json:"params" gorm:"-"`
+	Children  []SysDept `json:"children" gorm:"-"`
+}
+
+func (SysDept) TableName() string {
+	return "sys_dept"
+}
+
+func (e *SysDept) Generate() models.ActiveRecord {
+	o := *e
+	return &o
+}
+
+func (e *SysDept) GetId() interface{} {
+	return e.DeptId
+}

app/admin/models/system/sys_dict_data.go

@@ -0,0 +1,35 @@
+package system
+
+import (
+	"go-admin/common/models"
+)
+
+type SysDictData struct {
+	models.ControlBy
+	models.ModelTime
+
+	DictCode  int    `json:"dictCode" gorm:"primaryKey;column:dict_code;autoIncrement;comment:主键编码"`
+	DictSort  int    `json:"dictSort" gorm:"type:bigint(20);comment:DictSort"`
+	DictLabel string `json:"dictLabel" gorm:"type:varchar(128);comment:DictLabel"`
+	DictValue string `json:"dictValue" gorm:"type:varchar(255);comment:DictValue"`
+	DictType  string `json:"dictType" gorm:"type:varchar(64);comment:DictType"`
+	CssClass  string `json:"cssClass" gorm:"type:varchar(128);comment:CssClass"`
+	ListClass string `json:"listClass" gorm:"type:varchar(128);comment:ListClass"`
+	IsDefault string `json:"isDefault" gorm:"type:varchar(8);comment:IsDefault"`
+	Status    string `json:"status" gorm:"type:varchar(4);comment:Status"`
+	Default   string `json:"default" gorm:"type:varchar(8);comment:Default"`
+	Remark    string `json:"remark" gorm:"type:varchar(255);comment:Remark"`
+}
+
+func (SysDictData) TableName() string {
+	return "sys_dict_data"
+}
+
+func (e *SysDictData) Generate() models.ActiveRecord {
+	o := *e
+	return &o
+}
+
+func (e *SysDictData) GetId() interface{} {
+	return e.DictCode
+}

app/admin/models/system/sys_dict_type.go

@@ -0,0 +1,29 @@
+package system
+
+import (
+	"go-admin/common/models"
+)
+
+type SysDictType struct {
+	models.ControlBy
+	models.ModelTime
+
+	ID       int    `json:"id" gorm:"primaryKey;column:dict_id;autoIncrement;comment:主键编码"`
+	DictName string `json:"dictName" gorm:"type:varchar(128);comment:DictName"`
+	DictType string `json:"dictType" gorm:"type:varchar(128);comment:DictType"`
+	Status   string `json:"status" gorm:"type:varchar(4);comment:Status"`
+	Remark   string `json:"remark" gorm:"type:varchar(255);comment:Remark"`
+}
+
+func (SysDictType) TableName() string {
+	return "sys_dict_type"
+}
+
+func (e *SysDictType) Generate() models.ActiveRecord {
+	o := *e
+	return &o
+}
+
+func (e *SysDictType) GetId() interface{} {
+	return e.ID
+}

app/admin/models/system/sys_login_log.go

@@ -0,0 +1,37 @@
+package system
+
+import (
+	"go-admin/common/models"
+
+	"time"
+)
+
+type SysLoginLog struct {
+	models.Model
+	Username      string    `json:"username" gorm:"type:varchar(128);comment:用户名"`
+	Status        string    `json:"status" gorm:"type:varchar(4);comment:状态"`
+	Ipaddr        string    `json:"ipaddr" gorm:"type:varchar(255);comment:ip地址"`
+	LoginLocation string    `json:"loginLocation" gorm:"type:varchar(255);comment:归属地"`
+	Browser       string    `json:"browser" gorm:"type:varchar(255);comment:浏览器"`
+	Os            string    `json:"os" gorm:"type:varchar(255);comment:系统"`
+	Platform      string    `json:"platform" gorm:"type:varchar(255);comment:固件"`
+	LoginTime     time.Time `json:"loginTime" gorm:"type:timestamp;comment:登录时间"`
+	Remark        string    `json:"remark" gorm:"type:varchar(255);comment:备注"`
+	Msg           string    `json:"msg" gorm:"type:varchar(255);comment:信息"`
+	CreatedAt     time.Time `json:"createdAt" gorm:"comment:创建时间"`
+	UpdatedAt     time.Time `json:"updatedAt" gorm:"comment:最后更新时间"`
+	models.ControlBy
+}
+
+func (SysLoginLog) TableName() string {
+	return "sys_login_log"
+}
+
+func (e *SysLoginLog) Generate() models.ActiveRecord {
+	o := *e
+	return &o
+}
+
+func (e *SysLoginLog) GetId() interface{} {
+	return e.Id
+}

app/admin/models/system/sys_menu.go

@@ -0,0 +1,64 @@
+package system
+
+import "go-admin/common/models"
+
+type SysMenu struct {
+	MenuId     int       `json:"menuId" gorm:"primaryKey;autoIncrement"`
+	MenuName   string    `json:"menuName" gorm:"size:128;"`
+	Title      string    `json:"title" gorm:"size:128;"`
+	Icon       string    `json:"icon" gorm:"size:128;"`
+	Path       string    `json:"path" gorm:"size:128;"`
+	Paths      string    `json:"paths" gorm:"size:128;"`
+	MenuType   string    `json:"menuType" gorm:"size:1;"`
+	Action     string    `json:"action" gorm:"size:16;"`
+	Permission string    `json:"permission" gorm:"size:255;"`
+	ParentId   int       `json:"parentId" gorm:"size:11;"`
+	NoCache    bool      `json:"noCache" gorm:"size:8;"`
+	Breadcrumb string    `json:"breadcrumb" gorm:"size:255;"`
+	Component  string    `json:"component" gorm:"size:255;"`
+	Sort       int       `json:"sort" gorm:"size:4;"`
+	Visible    string    `json:"visible" gorm:"size:1;"`
+	IsFrame    string    `json:"isFrame" gorm:"size:1;DEFAULT:0;"`
+	DataScope  string    `json:"dataScope" gorm:"-"`
+	Params     string    `json:"params" gorm:"-"`
+	RoleId     int       `gorm:"-"`
+	Children   []SysMenu `json:"children" gorm:"-"`
+	IsSelect   bool      `json:"is_select" gorm:"-"`
+	models.ControlBy
+	models.ModelTime
+}
+
+type SysMenus struct {
+	MenuId     int       `json:"menuId" gorm:"column:menu_id;primaryKey;autoIncrement;"`
+	MenuName   string    `json:"menuName" gorm:"column:menu_name"`
+	Title      string    `json:"title" gorm:"column:title"`
+	Icon       string    `json:"icon" gorm:"column:icon"`
+	Path       string    `json:"path" gorm:"column:path"`
+	MenuType   string    `json:"menuType" gorm:"column:menu_type"`
+	Action     string    `json:"action" gorm:"column:action"`
+	Permission string    `json:"permission" gorm:"column:permission"`
+	ParentId   int       `json:"parentId" gorm:"column:parent_id"`
+	NoCache    bool      `json:"noCache" gorm:"column:no_cache"`
+	Breadcrumb string    `json:"breadcrumb" gorm:"column:breadcrumb"`
+	Component  string    `json:"component" gorm:"column:component"`
+	Sort       int       `json:"sort" gorm:"column:sort"`
+	Visible    string    `json:"visible" gorm:"column:visible"`
+	Children   []SysMenu `json:"children" gorm:"-"`
+	models.ControlBy
+	models.ModelTime
+	DataScope string `json:"dataScope" gorm:"-"`
+	Params    string `json:"params" gorm:"-"`
+}
+
+func (SysMenu) TableName() string {
+	return "sys_menu"
+}
+
+func (e *SysMenu) Generate() models.ActiveRecord {
+	o := *e
+	return &o
+}
+
+func (e *SysMenu) GetId() interface{} {
+	return e.MenuId
+}

app/admin/models/system/sys_opera_log.go

@@ -0,0 +1,45 @@
+package system
+
+import (
+	"go-admin/common/models"
+
+	"time"
+)
+
+type SysOperaLog struct {
+	models.Model
+	Title         string    `json:"title" gorm:"type:varchar(255);comment:操作模块"`
+	BusinessType  string    `json:"businessType" gorm:"type:varchar(128);comment:操作类型"`
+	BusinessTypes string    `json:"businessTypes" gorm:"type:varchar(128);comment:BusinessTypes"`
+	Method        string    `json:"method" gorm:"type:varchar(128);comment:函数"`
+	RequestMethod string    `json:"requestMethod" gorm:"type:varchar(128);comment:请求方式"`
+	OperatorType  string    `json:"operatorType" gorm:"type:varchar(128);comment:操作类型"`
+	OperName      string    `json:"operName" gorm:"type:varchar(128);comment:操作者"`
+	DeptName      string    `json:"deptName" gorm:"type:varchar(128);comment:部门名称"`
+	OperUrl       string    `json:"operUrl" gorm:"type:varchar(255);comment:访问地址"`
+	OperIp        string    `json:"operIp" gorm:"type:varchar(128);comment:客户端ip"`
+	OperLocation  string    `json:"operLocation" gorm:"type:varchar(128);comment:访问位置"`
+	OperParam     string    `json:"operParam" gorm:"type:varchar(255);comment:请求参数"`
+	Status        string    `json:"status" gorm:"type:varchar(4);comment:操作状态"`
+	OperTime      time.Time `json:"operTime" gorm:"type:timestamp;comment:操作时间"`
+	JsonResult    string    `json:"jsonResult" gorm:"type:varchar(255);comment:返回数据"`
+	Remark        string    `json:"remark" gorm:"type:varchar(255);comment:备注"`
+	LatencyTime   string    `json:"latencyTime" gorm:"type:varchar(128);comment:耗时"`
+	UserAgent     string    `json:"userAgent" gorm:"type:varchar(255);comment:ua"`
+	CreatedAt     time.Time `json:"createdAt" gorm:"comment:创建时间"`
+	UpdatedAt     time.Time `json:"updatedAt" gorm:"comment:最后更新时间"`
+	models.ControlBy
+}
+
+func (SysOperaLog) TableName() string {
+	return "sys_opera_log"
+}
+
+func (e *SysOperaLog) Generate() models.ActiveRecord {
+	o := *e
+	return &o
+}
+
+func (e *SysOperaLog) GetId() interface{} {
+	return e.Id
+}

app/admin/models/system/sys_post.go

@@ -0,0 +1,30 @@
+package system
+
+import "go-admin/common/models"
+
+type SysPost struct {
+	PostId   int    `gorm:"primaryKey;autoIncrement" json:"postId"` //岗位编号
+	PostName string `gorm:"size:128;" json:"postName"`              //岗位名称
+	PostCode string `gorm:"size:128;" json:"postCode"`              //岗位代码
+	Sort     int    `gorm:"" json:"sort"`                           //岗位排序
+	Status   int    `gorm:"size:4;" json:"status"`                  //状态
+	Remark   string `gorm:"size:255;" json:"remark"`                //描述
+	models.ControlBy
+	models.ModelTime
+
+	DataScope string `gorm:"-" json:"dataScope"`
+	Params    string `gorm:"-" json:"params"`
+}
+
+func (SysPost) TableName() string {
+	return "sys_post"
+}
+
+func (e *SysPost) Generate() models.ActiveRecord {
+	o := *e
+	return &o
+}
+
+func (e *SysPost) GetId() interface{} {
+	return e.PostId
+}

app/admin/models/system/sys_role.go

@@ -0,0 +1,33 @@
+package system
+
+import "go-admin/common/models"
+
+type SysRole struct {
+	RoleId    int    `json:"roleId" gorm:"primaryKey;autoIncrement"` // 角色编码
+	RoleName  string `json:"roleName" gorm:"size:128;"`              // 角色名称
+	Status    string `json:"status" gorm:"size:4;"`                  //
+	RoleKey   string `json:"roleKey" gorm:"size:128;"`               //角色代码
+	RoleSort  int    `json:"roleSort" gorm:""`                       //角色排序
+	Flag      string `json:"flag" gorm:"size:128;"`                  //
+	Remark    string `json:"remark" gorm:"size:255;"`                //备注
+	Admin     bool   `json:"admin" gorm:"size:4;"`
+	DataScope string `json:"dataScope" gorm:"size:128;"`
+	Params    string `json:"params" gorm:"-"`
+	MenuIds   []int  `json:"menuIds" gorm:"-"`
+	DeptIds   []int  `json:"deptIds" gorm:"-"`
+	models.ControlBy
+	models.ModelTime
+}
+
+func (SysRole) TableName() string {
+	return "sys_role"
+}
+
+func (e *SysRole) Generate() models.ActiveRecord {
+	o := *e
+	return &o
+}
+
+func (e *SysRole) GetId() interface{} {
+	return e.RoleId
+}

app/admin/models/system/sys_user.go

@@ -0,0 +1,77 @@
+package system
+
+import (
+	"go-admin/common/models"
+	"golang.org/x/crypto/bcrypt"
+	"gorm.io/gorm"
+)
+
+type SysUser struct {
+	models.ControlBy
+	models.ModelTime
+	UserId   int      `gorm:"primaryKey;autoIncrement;comment:编码"  json:"userId"`
+	Username string   `json:"username" gorm:"type:varchar(64);comment:用户名"`
+	Password string   `json:"-" gorm:"type:varchar(128);comment:密码"`
+	NickName string   `json:"nickName" gorm:"type:varchar(128);comment:昵称"`
+	Phone    string   `json:"phone" gorm:"type:varchar(11);comment:手机号"`
+	RoleId   int      `json:"roleId" gorm:"type:bigint(20);comment:角色ID"`
+	Salt     string   `json:"-" gorm:"type:varchar(255);comment:加盐"`
+	Avatar   string   `json:"avatar" gorm:"type:varchar(255);comment:头像"`
+	Sex      string   `json:"sex" gorm:"type:varchar(255);comment:性别"`
+	Email    string   `json:"email" gorm:"type:varchar(128);comment:邮箱"`
+	DeptId   int      `json:"deptId" gorm:"type:bigint(20);comment:部门"`
+	PostId   int      `json:"postId" gorm:"type:bigint(20);comment:岗位"`
+	Remark   string   `json:"remark" gorm:"type:varchar(255);comment:备注"`
+	Status   string   `json:"status" gorm:"type:varchar(4);comment:状态"`
+	DeptIds  []int    `json:"deptIds" gorm:"-"`
+	PostIds  []int    `json:"postIds" gorm:"-"`
+	RoleIds  []int    `json:"roleIds" gorm:"-"`
+	Dept     *SysDept `json:"dept"`
+}
+
+func (SysUser) TableName() string {
+	return "sys_user"
+}
+
+func (e *SysUser) Generate() models.ActiveRecord {
+	o := *e
+	return &o
+}
+
+func (e *SysUser) GetId() interface{} {
+	return e.UserId
+}
+
+//加密
+func (e *SysUser) Encrypt() (err error) {
+	if e.Password == "" {
+		return
+	}
+
+	var hash []byte
+	if hash, err = bcrypt.GenerateFromPassword([]byte(e.Password), bcrypt.DefaultCost); err != nil {
+		return
+	} else {
+		e.Password = string(hash)
+		return
+	}
+}
+
+func (e *SysUser) BeforeCreate(_ *gorm.DB) error {
+	return e.Encrypt()
+}
+
+func (e *SysUser) BeforeUpdate(_ *gorm.DB) error {
+	var err error
+	if e.Password != "" {
+		err = e.Encrypt()
+	}
+	return err
+}
+
+func (e *SysUser) AfterFind(_ *gorm.DB) error {
+	e.DeptIds = []int{e.DeptId}
+	e.PostIds = []int{e.PostId}
+	e.RoleIds = []int{e.RoleId}
+	return nil
+}

app/admin/models/tools/dbcolumns.go

@@ -2,10 +2,11 @@ package tools
 
 import (
 	"errors"
-	"github.com/jinzhu/gorm"
-	orm "go-admin/global"
-	"go-admin/tools"
-	config2 "go-admin/tools/config"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+
+	"gorm.io/gorm"
+
+	"github.com/go-admin-team/go-admin-core/sdk/config"
 )
 
 type DBColumns struct {
@@ -23,14 +24,14 @@ type DBColumns struct {
 	ColumnComment          string `gorm:"column:COLUMN_COMMENT" json:"columnComment"`
 }
 
-func (e *DBColumns) GetPage(pageSize int, pageIndex int) ([]DBColumns, int, error) {
+func (e *DBColumns) GetPage(tx *gorm.DB, pageSize int, pageIndex int) ([]DBColumns, int, error) {
 	var doc []DBColumns
-	var count int
+	var count int64
 	table := new(gorm.DB)
 
-	if config2.DatabaseConfig.Driver == "mysql" {
-		table = orm.Eloquent.Select("*").Table("information_schema.`COLUMNS`")
-		table = table.Where("table_schema= ? ", config2.GenConfig.DBName)
+	if config.DatabaseConfig.Driver == "mysql" {
+		table = tx.Table("information_schema.`COLUMNS`")
+		table = table.Where("table_schema= ? ", config.GenConfig.DBName)
 
 		if e.TableName != "" {
 			return nil, 0, errors.New("table name cannot be empty！")
@@ -39,15 +40,15 @@ func (e *DBColumns) GetPage(pageSize int, pageIndex int) ([]DBColumns, int, erro
 		table = table.Where("TABLE_NAME = ?", e.TableName)
 	}
 
-	if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil {
+	if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Offset(-1).Limit(-1).Count(&count).Error; err != nil {
 		return nil, 0, err
 	}
-	table.Count(&count)
-	return doc, count, nil
+	//table.Count(&count)
+	return doc, int(count), nil
 
 }
 
-func (e *DBColumns) GetList() ([]DBColumns, error) {
+func (e *DBColumns) GetList(tx *gorm.DB) ([]DBColumns, error) {
 	var doc []DBColumns
 	table := new(gorm.DB)
 
@@ -55,13 +56,13 @@ func (e *DBColumns) GetList() ([]DBColumns, error) {
 		return nil, errors.New("table name cannot be empty！")
 	}
 
-	if config2.DatabaseConfig.Driver == "mysql" {
-		table = orm.Eloquent.Select("*").Table("information_schema.columns")
-		table = table.Where("table_schema= ? ", config2.GenConfig.DBName)
+	if config.DatabaseConfig.Driver == "mysql" {
+		table = tx.Table("information_schema.columns")
+		table = table.Where("table_schema= ? ", config.GenConfig.DBName)
 
-		table = table.Where("TABLE_NAME = ?", e.TableName)
+		table = table.Where("TABLE_NAME = ?", e.TableName).Order("ORDINAL_POSITION asc")
 	} else {
-		tools.Assert(true, "目前只支持mysql数据库", 500)
+		pkg.Assert(true, "目前只支持mysql数据库", 500)
 	}
 	if err := table.Find(&doc).Error; err != nil {
 		return doc, err

app/admin/models/tools/dbtables.go

@@ -2,10 +2,11 @@ package tools
 
 import (
 	"errors"
-	"github.com/jinzhu/gorm"
-	orm "go-admin/global"
-	"go-admin/tools"
-	config2 "go-admin/tools/config"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+
+	"gorm.io/gorm"
+
+	config2 "github.com/go-admin-team/go-admin-core/sdk/config"
 )
 
 type DBTables struct {
@@ -18,45 +19,44 @@ type DBTables struct {
 	TableComment   string `gorm:"column:TABLE_COMMENT" json:"tableComment"`
 }
 
-func (e *DBTables) GetPage(pageSize int, pageIndex int) ([]DBTables, int, error) {
+func (e *DBTables) GetPage(tx *gorm.DB, pageSize int, pageIndex int) ([]DBTables, int, error) {
 	var doc []DBTables
 	table := new(gorm.DB)
-	var count int
+	var count int64
 
 	if config2.DatabaseConfig.Driver == "mysql" {
-		table = orm.Eloquent.Select("*").Table("information_schema.tables")
-		table = table.Where("TABLE_NAME not in (select table_name from " + config2.GenConfig.DBName + ".sys_tables) ")
+		table = tx.Table("information_schema.tables")
+		table = table.Where("TABLE_NAME not in (select table_name from `" + config2.GenConfig.DBName + "`.sys_tables) ")
 		table = table.Where("table_schema= ? ", config2.GenConfig.DBName)
 
 		if e.TableName != "" {
 			table = table.Where("TABLE_NAME = ?", e.TableName)
 		}
-		if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil {
+		if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Offset(-1).Limit(-1).Count(&count).Error; err != nil {
 			return nil, 0, err
 		}
 	} else {
-		tools.Assert(true, "目前只支持mysql数据库", 500)
+		pkg.Assert(true, "目前只支持mysql数据库", 500)
 	}
 
-	table.Count(&count)
-	return doc, count, nil
+	//table.Count(&count)
+	return doc, int(count), nil
 }
 
-func (e *DBTables) Get() (DBTables, error) {
+func (e *DBTables) Get(tx *gorm.DB) (DBTables, error) {
 	var doc DBTables
-	table := new(gorm.DB)
 	if config2.DatabaseConfig.Driver == "mysql" {
-		table = orm.Eloquent.Select("*").Table("information_schema.tables")
+		table := tx.Table("information_schema.tables")
 		table = table.Where("table_schema= ? ", config2.GenConfig.DBName)
 		if e.TableName == "" {
 			return doc, errors.New("table name cannot be empty！")
 		}
 		table = table.Where("TABLE_NAME = ?", e.TableName)
+		if err := table.First(&doc).Error; err != nil {
+			return doc, err
+		}
 	} else {
-		tools.Assert(true, "目前只支持mysql数据库", 500)
-	}
-	if err := table.First(&doc).Error; err != nil {
-		return doc, err
+		pkg.Assert(true, "目前只支持mysql数据库", 500)
 	}
 	return doc, nil
 }

app/admin/models/tools/syscolumns.go

@@ -0,0 +1,90 @@
+package tools
+
+import (
+	"go-admin/app/admin/models"
+	"gorm.io/gorm"
+)
+
+type SysColumns struct {
+	ColumnId           int          `gorm:"primaryKey;autoIncrement" json:"columnId"`
+	TableId            int          `gorm:"" json:"tableId"`
+	ColumnName         string       `gorm:"size:128;" json:"columnName"`
+	ColumnComment      string       `gorm:"column:column_comment;size:128;" json:"columnComment"`
+	ColumnType         string       `gorm:"column:column_type;size:128;" json:"columnType"`
+	GoType             string       `gorm:"column:go_type;size:128;" json:"goType"`
+	GoField            string       `gorm:"column:go_field;size:128;" json:"goField"`
+	JsonField          string       `gorm:"column:json_field;size:128;" json:"jsonField"`
+	IsPk               string       `gorm:"column:is_pk;size:4;" json:"isPk"`
+	IsIncrement        string       `gorm:"column:is_increment;size:4;" json:"isIncrement"`
+	IsRequired         string       `gorm:"column:is_required;size:4;" json:"isRequired"`
+	IsInsert           string       `gorm:"column:is_insert;size:4;" json:"isInsert"`
+	IsEdit             string       `gorm:"column:is_edit;size:4;" json:"isEdit"`
+	IsList             string       `gorm:"column:is_list;size:4;" json:"isList"`
+	IsQuery            string       `gorm:"column:is_query;size:4;" json:"isQuery"`
+	QueryType          string       `gorm:"column:query_type;size:128;" json:"queryType"`
+	HtmlType           string       `gorm:"column:html_type;size:128;" json:"htmlType"`
+	DictType           string       `gorm:"column:dict_type;size:128;" json:"dictType"`
+	Sort               int          `gorm:"column:sort;" json:"sort"`
+	List               string       `gorm:"column:list;size:1;" json:"list"`
+	Pk                 bool         `gorm:"column:pk;size:1;" json:"pk"`
+	Required           bool         `gorm:"column:required;size:1;" json:"required"`
+	SuperColumn        bool         `gorm:"column:super_column;size:1;" json:"superColumn"`
+	UsableColumn       bool         `gorm:"column:usable_column;size:1;" json:"usableColumn"`
+	Increment          bool         `gorm:"column:increment;size:1;" json:"increment"`
+	Insert             bool         `gorm:"column:insert;size:1;" json:"insert"`
+	Edit               bool         `gorm:"column:edit;size:1;" json:"edit"`
+	Query              bool         `gorm:"column:query;size:1;" json:"query"`
+	Remark             string       `gorm:"column:remark;size:255;" json:"remark"`
+	FkTableName        string       `gorm:"" json:"fkTableName"`
+	FkTableNameClass   string       `gorm:"" json:"fkTableNameClass"`
+	FkTableNamePackage string       `gorm:"" json:"fkTableNamePackage"`
+	FkCol              []SysColumns `gorm:"-" json:"fkCol"`
+	FkLabelId          string       `gorm:"" json:"fkLabelId"`
+	FkLabelName        string       `gorm:"size:255;" json:"fkLabelName"`
+	CreateBy           string       `gorm:"column:create_by;size:128;" json:"createBy"`
+	UpdateBy           string       `gorm:"column:update_By;size:128;" json:"updateBy"`
+
+	models.BaseModel
+}
+
+func (SysColumns) TableName() string {
+	return "sys_columns"
+}
+
+func (e *SysColumns) GetList(tx *gorm.DB) ([]SysColumns, error) {
+	var doc []SysColumns
+
+	table := tx.Table("sys_columns")
+
+	table = table.Where("table_id = ?", e.TableId)
+
+	if err := table.Find(&doc).Error; err != nil {
+		return nil, err
+	}
+	return doc, nil
+}
+
+func (e *SysColumns) Create(tx *gorm.DB) (SysColumns, error) {
+	var doc SysColumns
+	result := tx.Table("sys_columns").Create(&e)
+	if result.Error != nil {
+		err := result.Error
+		return doc, err
+	}
+	doc = *e
+	return doc, nil
+}
+
+func (e *SysColumns) Update(tx *gorm.DB) (update SysColumns, err error) {
+	if err = tx.Table("sys_columns").First(&update, e.ColumnId).Error; err != nil {
+		return
+	}
+
+	//参数1:是要修改的数据
+	//参数2:是修改的数据
+	if err = tx.Table("sys_columns").Model(&update).Updates(&e).Error; err != nil {
+		return
+	}
+
+	return
+}

app/admin/models/tools/systables.go

@@ -0,0 +1,231 @@
+package tools
+
+import (
+	"gorm.io/gorm"
+	"strings"
+
+	"go-admin/app/admin/models"
+)
+
+type SysTables struct {
+	TableId             int          `gorm:"primaryKey;autoIncrement" json:"tableId"`      //表编码
+	TBName              string       `gorm:"column:table_name;size:255;" json:"tableName"` //表名称
+	TableComment        string       `gorm:"size:255;" json:"tableComment"`                //表备注
+	ClassName           string       `gorm:"size:255;" json:"className"`                   //类名
+	TplCategory         string       `gorm:"size:255;" json:"tplCategory"`                 //
+	PackageName         string       `gorm:"size:255;" json:"packageName"`                 //包名
+	ModuleName          string       `gorm:"size:255;" json:"moduleName"`                  //模块名
+	BusinessName        string       `gorm:"size:255;" json:"businessName"`                //
+	FunctionName        string       `gorm:"size:255;" json:"functionName"`                //功能名称
+	FunctionAuthor      string       `gorm:"size:255;" json:"functionAuthor"`              //功能作者
+	PkColumn            string       `gorm:"size:255;" json:"pkColumn"`
+	PkGoField           string       `gorm:"size:255;" json:"pkGoField"`
+	PkJsonField         string       `gorm:"size:255;" json:"pkJsonField"`
+	Options             string       `gorm:"size:255;" json:"options"`
+	TreeCode            string       `gorm:"size:255;" json:"treeCode"`
+	TreeParentCode      string       `gorm:"size:255;" json:"treeParentCode"`
+	TreeName            string       `gorm:"size:255;" json:"treeName"`
+	Tree                bool         `gorm:"size:1;" json:"tree"`
+	Crud                bool         `gorm:"size:1;" json:"crud"`
+	Remark              string       `gorm:"size:255;" json:"remark"`
+	IsDataScope         int          `gorm:"size:1;" json:"isDataScope"`
+	IsActions           int          `gorm:"size:1;" json:"isActions"`
+	IsAuth              int          `gorm:"size:1;" json:"isAuth"`
+	IsLogicalDelete     string       `gorm:"size:1;" json:"isLogicalDelete"`
+	LogicalDelete       bool         `gorm:"size:1;" json:"logicalDelete"`
+	LogicalDeleteColumn string       `gorm:"size:128;" json:"logicalDeleteColumn"`
+	CreateBy            string       `gorm:"size:128;" json:"createBy"`
+	UpdateBy            string       `gorm:"size:128;" json:"updateBy"`
+	DataScope           string       `gorm:"-" json:"dataScope"`
+	Params              Params       `gorm:"-" json:"params"`
+	Columns             []SysColumns `gorm:"-" json:"columns"`
+
+	models.BaseModel
+}
+
+func (SysTables) TableName() string {
+	return "sys_tables"
+}
+
+type Params struct {
+	TreeCode       string `gorm:"-" json:"treeCode"`
+	TreeParentCode string `gorm:"-" json:"treeParentCode"`
+	TreeName       string `gorm:"-" json:"treeName"`
+}
+
+func (e *SysTables) GetPage(tx *gorm.DB, pageSize int, pageIndex int) ([]SysTables, int, error) {
+	var doc []SysTables
+
+	table := tx.Table("sys_tables")
+
+	if e.TBName != "" {
+		table = table.Where("table_name = ?", e.TBName)
+	}
+	if e.TableComment != "" {
+		table = table.Where("table_comment = ?", e.TableComment)
+	}
+
+	var count int64
+
+	if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Offset(-1).Limit(-1).Count(&count).Error; err != nil {
+		return nil, 0, err
+	}
+	//table.Where("`deleted_at` IS NULL").Count(&count)
+	return doc, int(count), nil
+}
+
+func (e *SysTables) Get(tx *gorm.DB) (SysTables, error) {
+	var doc SysTables
+	var err error
+	table := tx.Table("sys_tables")
+
+	if e.TBName != "" {
+		table = table.Where("table_name = ?", e.TBName)
+	}
+	if e.TableId != 0 {
+		table = table.Where("table_id = ?", e.TableId)
+	}
+	if e.TableComment != "" {
+		table = table.Where("table_comment = ?", e.TableComment)
+	}
+
+	if err := table.First(&doc).Error; err != nil {
+		return doc, err
+	}
+	var col SysColumns
+	col.TableId = doc.TableId
+	if doc.Columns, err = col.GetList(tx); err != nil {
+		return doc, err
+	}
+
+	return doc, nil
+}
+
+func (e *SysTables) GetTree(tx *gorm.DB) ([]SysTables, error) {
+	var doc []SysTables
+	var err error
+	table := tx.Table("sys_tables")
+
+	if e.TBName != "" {
+		table = table.Where("table_name = ?", e.TBName)
+	}
+	if e.TableId != 0 {
+		table = table.Where("table_id = ?", e.TableId)
+	}
+	if e.TableComment != "" {
+		table = table.Where("table_comment = ?", e.TableComment)
+	}
+
+	if err := table.Find(&doc).Error; err != nil {
+		return doc, err
+	}
+	for i := 0; i < len(doc); i++ {
+		var col SysColumns
+		//col.FkCol = append(col.FkCol, SysColumns{ColumnId: 0, ColumnName: "请选择"})
+		col.TableId = doc[i].TableId
+		if doc[i].Columns, err = col.GetList(tx); err != nil {
+			return doc, err
+		}
+
+	}
+
+	return doc, nil
+}
+
+func (e *SysTables) Create(tx *gorm.DB) (SysTables, error) {
+	var doc SysTables
+	result := tx.Table("sys_tables").Create(&e)
+	if result.Error != nil {
+		err := result.Error
+		return doc, err
+	}
+	doc = *e
+	for i := 0; i < len(e.Columns); i++ {
+		e.Columns[i].TableId = doc.TableId
+
+		_, _ = e.Columns[i].Create(tx)
+	}
+
+	return doc, nil
+}
+
+func (e *SysTables) Update(tx *gorm.DB) (update SysTables, err error) {
+	//if err = orm.Eloquent.Table("sys_tables").First(&update, e.TableId).Error; err != nil {
+	//	return
+	//}
+
+	//参数1:是要修改的数据
+	//参数2:是修改的数据
+	if err = tx.Table("sys_tables").Where("table_id = ?", e.TableId).Updates(&e).Error; err != nil {
+		return
+	}
+
+	tableNames := make([]string, 0)
+	for i := range e.Columns {
+		if e.Columns[i].FkTableName != "" {
+			tableNames = append(tableNames, e.Columns[i].FkTableName)
+		}
+	}
+
+	tables := make([]SysTables, 0)
+	tableMap := make(map[string]*SysTables)
+	if len(tableNames) > 0 {
+		if err = tx.Table("sys_tables").Where("table_name in (?)", tableNames).Find(&tables).Error; err != nil {
+			return
+		}
+		for i := range tables {
+			tableMap[tables[i].TBName] = &tables[i]
+		}
+	}
+
+	for i := 0; i < len(e.Columns); i++ {
+		if e.Columns[i].FkTableName != "" {
+			t, ok := tableMap[e.Columns[i].FkTableName]
+			if ok {
+				e.Columns[i].FkTableNameClass = t.ClassName
+				e.Columns[i].FkTableNamePackage = t.ModuleName
+			} else {
+				tableNameList := strings.Split(e.Columns[i].FkTableName, "_")
+				e.Columns[i].FkTableNameClass = ""
+				e.Columns[i].FkTableNamePackage = ""
+				for a := 0; a < len(tableNameList); a++ {
+					strStart := string([]byte(tableNameList[a])[:1])
+					strEnd := string([]byte(tableNameList[a])[1:])
+					e.Columns[i].FkTableNameClass += strings.ToUpper(strStart) + strEnd
+					e.Columns[i].FkTableNamePackage += strings.ToLower(strStart) + strings.ToLower(strEnd)
+				}
+			}
+		}
+		_, _ = e.Columns[i].Update(tx)
+	}
+	return
+}
+
+func (e *SysTables) Delete(db *gorm.DB) (success bool, err error) {
+	tx := db.Begin()
+	defer func() {
+		if err != nil {
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+	if err = tx.Table("sys_tables").Delete(SysTables{}, "table_id = ?", e.TableId).Error; err != nil {
+		success = false
+		return
+	}
+	if err = tx.Table("sys_columns").Delete(SysColumns{}, "table_id = ?", e.TableId).Error; err != nil {
+		success = false
+		return
+	}
+	success = true
+	return
+}
+
+func (e *SysTables) BatchDelete(tx *gorm.DB, id []int) (Result bool, err error) {
+	if err = tx.Unscoped().Table(e.TableName()).Where(" table_id in (?)", id).Delete(&SysColumns{}).Error; err != nil {
+		return
+	}
+	Result = true
+	return
+}

app/admin/router/init_router.go

@@ -0,0 +1,52 @@
+package router
+
+import (
+	"github.com/go-admin-team/go-admin-core/sdk"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+	"os"
+
+	"github.com/gin-gonic/gin"
+	log "github.com/go-admin-team/go-admin-core/logger"
+
+	"go-admin/app/admin/middleware"
+	"go-admin/app/admin/middleware/handler"
+	common "go-admin/common/middleware"
+
+	"github.com/go-admin-team/go-admin-core/sdk/config"
+)
+
+// InitRouter 路由初始化，不要怀疑，这里用到了
+func InitRouter() {
+	var r *gin.Engine
+	h := sdk.Runtime.GetEngine()
+	if h == nil {
+		h = gin.New()
+		sdk.Runtime.SetEngine(h)
+	}
+	switch h.(type) {
+	case *gin.Engine:
+		r = h.(*gin.Engine)
+	default:
+		log.Fatal("not support other engine")
+		os.Exit(-1)
+	}
+	if config.SslConfig.Enable {
+		r.Use(handler.TlsHandler())
+	}
+
+	r.Use(common.Sentinel()).
+		Use(common.RequestId(pkg.TrafficKey))
+	middleware.InitMiddleware(r)
+	// the jwt middleware
+	authMiddleware, err := middleware.AuthInit()
+	if err != nil {
+		log.Fatalf("JWT Init Error, %s", err.Error())
+	}
+
+	// 注册系统路由
+	InitSysRouter(r, authMiddleware)
+
+	// 注册业务路由
+	// TODO: 这里可存放业务路由，里边并无实际路由只有演示代码
+	InitExamplesRouter(r, authMiddleware)
+}

app/admin/router/monitor.go

@@ -0,0 +1,32 @@
+package router
+
+import (
+	"github.com/go-admin-team/go-admin-core/sdk"
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+	log "github.com/go-admin-team/go-admin-core/logger"
+	"github.com/go-admin-team/go-admin-core/tools/transfer"
+	"github.com/prometheus/client_golang/prometheus/promhttp"
+)
+
+func Monitor() {
+	var r *gin.Engine
+	h := sdk.Runtime.GetEngine()
+	if h == nil {
+		h = gin.New()
+		sdk.Runtime.SetEngine(h)
+	}
+	switch h.(type) {
+	case *gin.Engine:
+		r = h.(*gin.Engine)
+	default:
+		log.Fatal("not support other engine")
+	}
+	//开发环境启动监控指标
+	r.GET("/metrics", transfer.Handler(promhttp.Handler()))
+	//健康检查
+	r.GET("/health", func(c *gin.Context) {
+		c.Status(http.StatusOK)
+	})
+}

app/admin/router/router.go

@@ -3,8 +3,13 @@ package router
 import (
 	"github.com/gin-gonic/gin"
 	_ "github.com/gin-gonic/gin"
-	"go-admin/pkg/jwtauth"
-	jwt "go-admin/pkg/jwtauth"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
+)
+
+var (
+	routerNoCheckRole = make([]func(*gin.RouterGroup), 0)
+	routerCheckRole   = make([]func(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware), 0)
 )
 
 // 路由示例
@@ -25,7 +30,12 @@ func examplesNoCheckRoleRouter(r *gin.Engine) {
 	// 空接口防止v1定义无使用报错
 	v1.GET("/nilcheckrole", nil)
 
+	for _, f := range routerNoCheckRole {
+		f(v1)
+	}
+
 	// {{无需认证路由自动补充在此处请勿删除}}
+	//registerSysFileInfoRouter(v1)
 }
 
 // 需要认证的路由示例
@@ -35,5 +45,7 @@ func examplesCheckRoleRouter(r *gin.Engine, authMiddleware *jwtauth.GinJWTMiddle
 	// 空接口防止v1定义无使用报错
 	v1.GET("/checkrole", nil)
 
-	// {{认证路由自动补充在此处请勿删除}}
+	for _, f := range routerCheckRole {
+		f(v1, authMiddleware)
+	}
 }

app/admin/router/sys_category.go

@@ -0,0 +1,31 @@
+package router
+
+import (
+	"github.com/gin-gonic/gin"
+	middleware2 "go-admin/common/middleware"
+
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
+	"go-admin/app/admin/models"
+	"go-admin/app/admin/service/dto"
+	"go-admin/common/actions"
+)
+
+func init() {
+	routerCheckRole = append(routerCheckRole, registerSysCategoryRouter)
+}
+
+// 需认证的路由代码
+func registerSysCategoryRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
+	r := v1.Group("/syscategory").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
+	{
+		model := &models.SysCategory{}
+		r.GET("", actions.PermissionAction(), actions.IndexAction(model, new(dto.SysCategorySearch), func() interface{} {
+			list := make([]models.SysCategory, 0)
+			return &list
+		}))
+		r.GET("/:id", actions.PermissionAction(), actions.ViewAction(new(dto.SysCategoryById), nil))
+		r.POST("", actions.CreateAction(new(dto.SysCategoryControl)))
+		r.PUT("/:id", actions.PermissionAction(), actions.UpdateAction(new(dto.SysCategoryControl)))
+		r.DELETE("", actions.PermissionAction(), actions.DeleteAction(new(dto.SysCategoryById)))
+	}
+}

app/admin/router/sys_config.go

@@ -0,0 +1,31 @@
+package router
+
+import (
+	"github.com/gin-gonic/gin"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
+	"go-admin/app/admin/apis/system/sys_config"
+	middleware2 "go-admin/common/middleware"
+)
+
+func init() {
+	routerCheckRole = append(routerCheckRole, registerSysConfigRouter)
+}
+
+// 需认证的路由代码
+func registerSysConfigRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
+	r := v1.Group("/config").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
+	{
+		api := &sys_config.SysConfig{}
+		r.GET("", api.GetSysConfigList)
+		r.GET("/:id", api.GetSysConfig)
+		r.POST("", api.InsertSysConfig)
+		r.PUT("/:id", api.UpdateSysConfig)
+		r.DELETE("/:id", api.DeleteSysConfig)
+	}
+
+	r1 := v1.Group("/configKey").Use(authMiddleware.MiddlewareFunc())
+	{
+		api := &sys_config.SysConfig{}
+		r1.GET("/:configKey", api.GetSysConfigByKEYForService)
+	}
+}

app/admin/router/sys_content.go

@@ -0,0 +1,37 @@
+package router
+
+import (
+	"github.com/gin-gonic/gin"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
+	"go-admin/app/admin/models"
+	"go-admin/app/admin/service/dto"
+	"go-admin/common/actions"
+	middleware2 "go-admin/common/middleware"
+)
+
+func init() {
+	routerCheckRole = append(routerCheckRole, registerSysContentRouter)
+}
+
+// 需认证的路由代码
+func registerSysContentRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
+
+	r := v1.Group("/syscontent").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
+	{
+		//r.GET("", sys_content.GetSysContentList)
+		//r.GET("/:id", sys_content.GetSysContent)
+		//r.POST("", sys_content.InsertSysContent)
+		//r.PUT("", sys_content.UpdateSysContent)
+		//r.DELETE("/:id", sys_content.DeleteSysContent)
+
+		model := &models.SysContent{}
+		r.GET("", actions.PermissionAction(), actions.IndexAction(model, new(dto.SysContentSearch), func() interface{} {
+			list := make([]models.SysContent, 0)
+			return &list
+		}))
+		r.GET("/:id", actions.PermissionAction(), actions.ViewAction(new(dto.SysContentById), nil))
+		r.POST("", actions.CreateAction(new(dto.SysContentControl)))
+		r.PUT("/:id", actions.PermissionAction(), actions.UpdateAction(new(dto.SysContentControl)))
+		r.DELETE("", actions.PermissionAction(), actions.DeleteAction(new(dto.SysContentById)))
+	}
+}

app/admin/router/sys_dept.go

@@ -0,0 +1,31 @@
+package router
+
+import (
+	"github.com/gin-gonic/gin"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
+	"go-admin/app/admin/apis/system/sys_dept"
+	middleware2 "go-admin/common/middleware"
+)
+
+func init() {
+	routerCheckRole = append(routerCheckRole, registerSysDeptRouter)
+}
+
+// 需认证的路由代码
+func registerSysDeptRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
+	api := &sys_dept.SysDept{}
+	r := v1.Group("/dept").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
+	{
+		r.GET("", api.GetSysDeptList)
+		r.GET("/:id", api.GetSysDept)
+		r.POST("", api.InsertSysDept)
+		r.PUT("/:id", api.UpdateSysDept)
+		r.DELETE("/:id", api.DeleteSysDept)
+	}
+
+	r1 := v1.Group("").Use(authMiddleware.MiddlewareFunc())
+	{
+		r1.GET("/deptTree", api.GetDeptTree)
+	}
+
+}

app/admin/router/sys_file_dir.go

@@ -0,0 +1,25 @@
+package router
+
+import (
+	"github.com/gin-gonic/gin"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
+	"go-admin/app/admin/apis/sys_file"
+	middleware2 "go-admin/common/middleware"
+)
+
+func init() {
+	routerCheckRole = append(routerCheckRole, registerSysFileDirRouter)
+}
+
+// 需认证的路由代码
+func registerSysFileDirRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
+	api := &sys_file.SysFileDir{}
+	r := v1.Group("/sysfiledir").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
+	{
+		r.GET("", api.GetSysFileDirList)
+		r.GET("/:id", api.GetSysFileDir)
+		r.POST("", api.InsertSysFileDir)
+		r.PUT("/:id", api.UpdateSysFileDir)
+		r.DELETE("/:id", api.DeleteSysFileDir)
+	}
+}

app/admin/router/sys_file_info.go

@@ -0,0 +1,25 @@
+package router
+
+import (
+	"github.com/gin-gonic/gin"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
+	"go-admin/app/admin/apis/sys_file"
+	middleware2 "go-admin/common/middleware"
+)
+
+func init() {
+	routerCheckRole = append(routerCheckRole, registerSysFileInfoRouter)
+}
+
+// 需认证的路由代码
+func registerSysFileInfoRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
+	api := &sys_file.SysFileInfo{}
+	r := v1.Group("/sysfileinfo").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
+	{
+		r.GET("", api.GetSysFileInfoList)
+		r.GET("/:id", api.GetSysFileInfo)
+		r.POST("", api.InsertSysFileInfo)
+		r.PUT("/:id", api.UpdateSysFileInfo)
+		r.DELETE("/:id", api.DeleteSysFileInfo)
+	}
+}

app/admin/router/sys_job.go

@@ -0,0 +1,38 @@
+package router
+
+import (
+	"github.com/gin-gonic/gin"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
+	"go-admin/app/admin/apis/sys_job"
+	"go-admin/app/admin/models"
+	"go-admin/app/admin/service/dto"
+	"go-admin/common/actions"
+	middleware2 "go-admin/common/middleware"
+)
+
+func init() {
+	routerCheckRole = append(routerCheckRole, registerSysJobRouter)
+}
+
+// 需认证的路由代码
+func registerSysJobRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
+
+	r := v1.Group("/sysjob").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
+	{
+		sysJob := &models.SysJob{}
+		r.GET("", actions.PermissionAction(), actions.IndexAction(sysJob, new(dto.SysJobSearch), func() interface{} {
+			list := make([]models.SysJob, 0)
+			return &list
+		}))
+		r.GET("/:id", actions.PermissionAction(), actions.ViewAction(new(dto.SysJobById), func() interface{} {
+			return &dto.SysJobItem{}
+		}))
+		r.POST("", actions.CreateAction(new(dto.SysJobControl)))
+		r.PUT("", actions.PermissionAction(), actions.UpdateAction(new(dto.SysJobControl)))
+		r.DELETE("", actions.PermissionAction(), actions.DeleteAction(new(dto.SysJobById)))
+	}
+	sysJob := &sys_job.SysJob{}
+
+	v1.GET("/job/remove/:id", sysJob.RemoveJobForService)
+	v1.GET("/job/start/:id", sysJob.StartJobForService)
+}

app/admin/router/sys_login_log.go

@@ -0,0 +1,25 @@
+package router
+
+import (
+	"github.com/gin-gonic/gin"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
+	"go-admin/app/admin/apis/system/sys_login_log"
+	middleware2 "go-admin/common/middleware"
+)
+
+func init() {
+	routerCheckRole = append(routerCheckRole, registerSysLoginLogRouter)
+}
+
+// 需认证的路由代码
+func registerSysLoginLogRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
+	api := &sys_login_log.SysLoginLog{}
+	r := v1.Group("/sys-login-log").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
+	{
+		r.GET("", api.GetSysLoginLogList)
+		r.GET("/:id", api.GetSysLoginLog)
+		r.POST("", api.InsertSysLoginLog)
+		r.PUT("/:id", api.UpdateSysLoginLog)
+		r.DELETE("", api.DeleteSysLoginLog)
+	}
+}

app/admin/router/sys_menu.go

@@ -0,0 +1,39 @@
+package router
+
+import (
+	"github.com/gin-gonic/gin"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
+	"go-admin/app/admin/apis/system/sys_menu"
+	middleware2 "go-admin/common/middleware"
+)
+
+func init() {
+	routerCheckRole = append(routerCheckRole, registerSysMenuRouter)
+}
+
+// 需认证的路由代码
+func registerSysMenuRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
+	api := &sys_menu.SysMenu{}
+	//menu := v1.Group("/menu").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+	//{
+	//	menu.GET("/:id", system.GetMenu)
+	//	menu.POST("", system.InsertMenu)
+	//	menu.PUT("", system.UpdateMenu)
+	//	menu.DELETE("/:id", system.DeleteMenu)
+	//}
+	r := v1.Group("/menu").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
+	{
+		r.GET("", api.GetSysMenuList)
+		r.GET("/:id", api.GetSysMenu)
+		r.POST("", api.InsertSysMenu)
+		r.PUT("/:id", api.UpdateSysMenu)
+		r.DELETE("/:id", api.DeleteSysMenu)
+	}
+
+	r1 := v1.Group("").Use(authMiddleware.MiddlewareFunc())
+	{
+		r1.GET("/menurole", api.GetMenuRole)
+		r1.GET("/menuids", api.GetMenuIDS)
+	}
+
+}

app/admin/router/sys_opera_log.go

@@ -0,0 +1,25 @@
+package router
+
+import (
+	"github.com/gin-gonic/gin"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
+	"go-admin/app/admin/apis/system/sys_opera_log"
+	middleware2 "go-admin/common/middleware"
+)
+
+func init() {
+	routerCheckRole = append(routerCheckRole, registerSysOperaLogRouter)
+}
+
+// 需认证的路由代码
+func registerSysOperaLogRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
+	api := &sys_opera_log.SysOperaLog{}
+	r := v1.Group("/sys-opera-log").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
+	{
+		r.GET("", api.GetSysOperaLogList)
+		r.GET("/:id", api.GetSysOperaLog)
+		r.POST("", api.InsertSysOperaLog)
+		r.PUT("/:id", api.UpdateSysOperaLog)
+		r.DELETE("", api.DeleteSysOperaLog)
+	}
+}

app/admin/router/sys_post.go

@@ -0,0 +1,25 @@
+package router
+
+import (
+	"github.com/gin-gonic/gin"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
+	"go-admin/app/admin/apis/system/sys_post"
+	middleware2 "go-admin/common/middleware"
+)
+
+func init() {
+	routerCheckRole = append(routerCheckRole, registerSyPostRouter)
+}
+
+// 需认证的路由代码
+func registerSyPostRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
+	api := &sys_post.SysPost{}
+	r := v1.Group("/post").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
+	{
+		r.GET("", api.GetSysPostList)
+		r.GET("/:id", api.GetSysPost)
+		r.POST("", api.InsertSysPost)
+		r.PUT("/:id", api.UpdateSysPost)
+		r.DELETE("/:id", api.DeleteSysPost)
+	}
+}

app/admin/router/sys_role.go

@@ -0,0 +1,26 @@
+package router
+
+import (
+	"github.com/gin-gonic/gin"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
+	"go-admin/app/admin/apis/system/sys_role"
+	middleware2 "go-admin/common/middleware"
+)
+
+func init() {
+	routerCheckRole = append(routerCheckRole, registerSysRoleRouter)
+}
+
+// 需认证的路由代码
+func registerSysRoleRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
+	api := &sys_role.SysRole{}
+	r := v1.Group("/role").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
+	{
+		r.GET("", api.GetSysRoleList)
+		r.GET("/:id", api.GetSysRole)
+		r.POST("", api.InsertSysRole)
+		r.PUT("/:id", api.UpdateSysRole)
+		r.DELETE("", api.DeleteSysRole)
+	}
+	v1.PUT("/roledatascope", api.UpdateRoleDataScope)
+}

app/admin/router/sys_router.go

@@ -0,0 +1,206 @@
+package router
+
+import (
+	"go-admin/app/admin/apis/system/sys_menu"
+	middleware2 "go-admin/common/middleware"
+	"mime"
+
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/ws"
+	"go-admin/app/admin/apis/monitor"
+	"go-admin/app/admin/apis/public"
+	"go-admin/app/admin/apis/system"
+	"go-admin/app/admin/apis/system/dict"
+	. "go-admin/app/admin/apis/tools"
+	"go-admin/app/admin/middleware/handler"
+	_ "go-admin/docs"
+
+	"github.com/gin-gonic/gin"
+	ginSwagger "github.com/swaggo/gin-swagger"
+	"github.com/swaggo/gin-swagger/swaggerFiles"
+)
+
+func InitSysRouter(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware) *gin.RouterGroup {
+	g := r.Group("")
+	sysBaseRouter(g)
+	// 静态文件
+	sysStaticFileRouter(g)
+	// swagger；注意：生产环境可以注释掉
+	sysSwaggerRouter(g)
+	// 无需认证
+	sysNoCheckRoleRouter(g)
+	// 需要认证
+	sysCheckRoleRouterInit(g, authMiddleware)
+	return g
+}
+
+func sysBaseRouter(r *gin.RouterGroup) {
+
+	go ws.WebsocketManager.Start()
+	go ws.WebsocketManager.SendService()
+	go ws.WebsocketManager.SendAllService()
+
+	r.GET("/", system.HelloWorld)
+	r.GET("/info", handler.Ping)
+}
+
+func sysStaticFileRouter(r *gin.RouterGroup) {
+	mime.AddExtensionType(".js", "application/javascript")
+	r.Static("/static", "./static")
+	r.Static("/form-generator", "./static/form-generator")
+}
+
+func sysSwaggerRouter(r *gin.RouterGroup) {
+	r.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
+}
+
+func sysNoCheckRoleRouter(r *gin.RouterGroup) {
+	v1 := r.Group("/api/v1")
+
+	v1.GET("/monitor/server", monitor.ServerInfo)
+	v1.GET("/getCaptcha", system.GenerateCaptchaHandler)
+	v1.GET("/gen/preview/:tableId", Preview)
+	v1.GET("/gen/toproject/:tableId", GenCodeV3)
+	v1.GET("/gen/todb/:tableId", GenMenuAndApi)
+	v1.GET("/gen/tabletree", GetSysTablesTree)
+
+	registerDBRouter(v1)
+	registerSysTableRouter(v1)
+	registerPublicRouter(v1)
+	registerSysSettingRouter(v1)
+}
+
+func registerDBRouter(api *gin.RouterGroup) {
+	db := api.Group("/db")
+	{
+		db.GET("/tables/page", GetDBTableList)
+		db.GET("/columns/page", GetDBColumnList)
+	}
+}
+
+func registerSysTableRouter(v1 *gin.RouterGroup) {
+	systables := v1.Group("/sys/tables")
+	{
+		systables.GET("/page", GetSysTableList)
+		tablesinfo := systables.Group("/info")
+		{
+			tablesinfo.POST("", InsertSysTable)
+			tablesinfo.PUT("", UpdateSysTable)
+			tablesinfo.DELETE("/:tableId", DeleteSysTables)
+			tablesinfo.GET("/:tableId", GetSysTables)
+			tablesinfo.GET("", GetSysTablesInfo)
+		}
+	}
+}
+
+func sysCheckRoleRouterInit(r *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
+	r.POST("/login", authMiddleware.LoginHandler)
+	// Refresh time can be longer than token timeout
+	r.GET("/refresh_token", authMiddleware.RefreshHandler)
+	r.Group("").Use(authMiddleware.MiddlewareFunc()).GET("/ws/:id/:channel", ws.WebsocketManager.WsClient)
+	r.Group("").Use(authMiddleware.MiddlewareFunc()).GET("/wslogout/:id/:channel", ws.WebsocketManager.UnWsClient)
+	v1 := r.Group("/api/v1")
+
+	//registerPageRouter(v1, authMiddleware)
+	registerBaseRouter(v1, authMiddleware)
+	registerDictRouter(v1, authMiddleware)
+	//registerSysUserRouter(v1, authMiddleware)
+	//registerUserCenterRouter(v1, authMiddleware)
+}
+
+func registerBaseRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
+	api := sys_menu.SysMenu{}
+	v1auth := v1.Group("").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
+	{
+		//v1auth.GET("/getinfo", system.GetInfo)
+		v1auth.GET("/roleMenuTreeselect/:roleId", api.GetMenuTreeSelect)
+		v1.GET("/menuTreeselect", api.GetMenuTreeSelect)
+		//v1auth.GET("/roleDeptTreeselect/:roleId", system.GetDeptTreeRoleselect)
+		v1auth.POST("/logout", handler.LogOut)
+	}
+}
+
+//func registerPageRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
+//	v1auth := v1.Group("").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+//	{
+//		v1auth.GET("/sysUserList", system.GetSysUserList)
+//	}
+//}
+
+//func registerUserCenterRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
+//	user := v1.Group("/user").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+//	{
+//		user.GET("/profile", system.GetSysUserProfile)
+//		user.POST("/avatar", system.InsetSysUserAvatar)
+//		user.PUT("/pwd", system.SysUserUpdatePwd)
+//	}
+//}
+
+//func registerPostRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
+//	post := v1.Group("/post").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+//	{
+//		post.GET("/:postId", system.GetPost)
+//		post.POST("", system.InsertPost)
+//		post.PUT("", system.UpdatePost)
+//		post.DELETE("/:postId", system.DeletePost)
+//	}
+//}
+
+//func registerSysUserRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
+//	sysuser := v1.Group("/sysUser").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+//	{
+//		sysuser.GET("/:userId", system.GetSysUser)
+//		sysuser.GET("/", system.GetSysUserInit)
+//		sysuser.POST("", system.InsertSysUser)
+//		sysuser.PUT("", system.UpdateSysUser)
+//		sysuser.DELETE("/:userId", system.DeleteSysUser)
+//	}
+//}
+
+func registerDictRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
+	dictApi := &dict.SysDictType{}
+	dataApi := &dict.SysDictData{}
+	dicts := v1.Group("/dict").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
+	{
+
+		dicts.GET("/data", dataApi.GetSysDictDataList)
+		dicts.GET("/data/:dictCode", dataApi.GetSysDictData)
+		dicts.POST("/data", dataApi.InsertSysDictData)
+		dicts.PUT("/data/:dictCode", dataApi.UpdateSysDictData)
+		dicts.DELETE("/data", dataApi.DeleteSysDictData)
+
+		dicts.GET("/type-option-select", dictApi.GetSysDictTypeAll)
+		dicts.GET("/type", dictApi.GetSysDictTypeList)
+		dicts.GET("/type/:id", dictApi.GetSysDictType)
+		dicts.POST("/type", dictApi.InsertSysDictType)
+		dicts.PUT("/type/:id", dictApi.UpdateSysDictType)
+		dicts.DELETE("/type", dictApi.DeleteSysDictType)
+	}
+	v1.Group("/dict").Use(authMiddleware.MiddlewareFunc()).GET("/data-all", dataApi.GetSysDictDataAll)
+}
+
+//func registerDeptRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
+//	dept := v1.Group("/dept").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+//	{
+//		dept.GET("/:deptId", system.GetDept)
+//		dept.POST("", system.InsertDept)
+//		dept.PUT("", system.UpdateDept)
+//		dept.DELETE("/:id", system.DeleteDept)
+//	}
+//}
+func registerSysSettingRouter(v1 *gin.RouterGroup) {
+	api := system.SysSetting{}
+	setting := v1.Group("/setting")
+	{
+		setting.GET("", api.GetSetting)
+		setting.POST("", api.CreateOrUpdateSetting)
+		setting.GET("/serverInfo", monitor.ServerInfo)
+	}
+}
+
+func registerPublicRouter(v1 *gin.RouterGroup) {
+	p := v1.Group("/public")
+	{
+		p.POST("/uploadFile", public.UploadFile)
+	}
+}

app/admin/router/sys_user.go

@@ -0,0 +1,37 @@
+package router
+
+import (
+	"github.com/gin-gonic/gin"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
+	"go-admin/app/admin/apis/sys_user"
+	"go-admin/common/actions"
+	middleware2 "go-admin/common/middleware"
+)
+
+func init() {
+	routerCheckRole = append(routerCheckRole, registerSysUserRouter)
+}
+
+// 需认证的路由代码
+func registerSysUserRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
+	api := &sys_user.SysUser{}
+	r := v1.Group("/sysUser").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole()).Use(actions.PermissionAction())
+	{
+		r.GET("", api.GetSysUserList)
+		r.GET("/:id", api.GetSysUser)
+		r.POST("", api.InsertSysUser)
+		r.PUT("", api.UpdateSysUser)
+		r.DELETE("", api.DeleteSysUser)
+	}
+
+	user := v1.Group("/user").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole()).Use(actions.PermissionAction())
+	{
+		user.GET("/profile", api.GetSysUserProfile)
+		user.POST("/avatar", api.InsetSysUserAvatar)
+		user.PUT("/pwd", api.SysUserUpdatePwd)
+	}
+	v1auth := v1.Group("").Use(authMiddleware.MiddlewareFunc())
+	{
+		v1auth.GET("/getinfo", api.GetInfo)
+	}
+}

app/admin/router/syschinaareadata.go

@@ -0,0 +1,25 @@
+package router
+
+import (
+	"github.com/gin-gonic/gin"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
+	"go-admin/app/admin/apis/sys_china_area_data"
+	middleware2 "go-admin/common/middleware"
+)
+
+func init() {
+	routerCheckRole = append(routerCheckRole, registerSysChinaAreaDataRouter)
+}
+
+// 需认证的路由代码
+func registerSysChinaAreaDataRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
+	api := &sys_china_area_data.SysChinaAreaData{}
+	r := v1.Group("/sys_china_area_data").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
+	{
+		r.GET("", api.GetSysChinaAreaDataList)
+		r.GET("/:id", api.GetSysChinaAreaData)
+		r.POST("", api.InsertSysChinaAreaData)
+		r.PUT("/:id", api.UpdateSysChinaAreaData)
+		r.DELETE("", api.DeleteSysChinaAreaData)
+	}
+}