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

fix🐛: fix monitor macos env error (#605)
docs📝: update version 2.0.9
2026-09-24 19:17:43 +00:00 · 2022-02-13 00:54:52 +08:00 · 2022-02-13 00:31:46 +08:00 · 2022-02-13 00:23:20 +08:00 · 2022-02-08 18:41:09 +08:00 · 2022-01-22 23:05:38 +08:00
250 changed files with 13452 additions and 12110 deletions
@@ -2,9 +2,12 @@ name: build

 on:
  push:
-    branches: [ master ]
+    branches: [ master, dev ]
  pull_request:
    branches: [ master ]
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}

 jobs:

@@ -29,6 +32,29 @@ jobs:
            curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
            dep ensure
        fi
-
    - name: Build
-      run: go build -v .
+      run: |
+        ref=${{ github.ref }}
+        CGO_ENABLED=0 GOOS=linux go build -ldflags="-w -s" -a -installsuffix cgo -o go-admin .
+
+    - name: Log in to the Container registry
+      uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+      with:
+        registry: ${{ env.REGISTRY }}
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Extract metadata (tags, labels) for Docker
+      id: meta
+      uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+      with:
+        images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
+    - name: Build and push Docker image
+      uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+      with:
+        context: .
+        file: scripts/Dockerfile
+        push: true
+        tags: ${{ steps.meta.outputs.tags }}
+        labels: ${{ steps.meta.outputs.labels }}
@@ -0,0 +1,29 @@
+name: 'GitHub Actions Mirror'
+
+on: [push, delete]
+
+jobs:
+  mirror_to_gitee:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout'
+        uses: actions/checkout@v1
+      - name: 'Mirror to gitee'
+        uses: pixta-dev/repository-mirroring-action@v1
+        with:
+          target_repo_url:
+            git@gitee.com:go-admin-team/go-admin.git
+          ssh_private_key:
+            ${{ secrets.GITEE_KEY }}
+  mirror_to_gitlab:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout'
+        uses: actions/checkout@v1
+      - name: 'Mirror to gitlab'
+        uses: pixta-dev/repository-mirroring-action@v1
+        with:
+          target_repo_url:
+            git@gitlab.com:go-admin-team/go-admin.git
+          ssh_private_key:
+            ${{ secrets.GITLAB_KEY }}
@@ -5,11 +5,11 @@ 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 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
+RUN go mod tidy
 COPY . .
 RUN pwd && ls

@@ -3,6 +3,8 @@ PROJECT:=go-admin
 .PHONY: build
 build:
 	CGO_ENABLED=0 go build -o go-admin main.go
+build-linux:
+	env GOOS=linux GOARCH=amd64 go build
 build-sqlite:
 	go build -tags sqlite3 -o go-admin main.go
 #.PHONY: test
@@ -9,7 +9,6 @@

 [English](https://github.com/go-admin-team/go-admin/blob/master/README.md) | 简体中文

-
 基于Gin + Vue + Element UI的前后端分离权限管理系统,系统初始化极度简单，只需要配置文件中，修改数据库连接，系统支持多指令操作，迁移指令可以让初始化数据库信息变得更简单，服务指令可以很简单的启动api服务

 [在线文档](https://doc.go-admin.dev)
@@ -34,7 +33,7 @@

 - 支持 Swagger 文档(基于swaggo)

- 基于 GORM 的数据库存储，可扩展多种类型数据库 
+- 基于 GORM 的数据库存储，可扩展多种类型数据库

 - 配置文件简单的模型映射，快速能够得到想要的配置

@@ -44,11 +43,13 @@

 - 多指令模式

- TODO: 单元测试
+- 多租户的支持

+- TODO: 单元测试

 ## 🎁 内置

+1. 多租户：系统默认支持多租户，按库分离，一个库一个租户。
 1. 用户管理：用户是系统操作者，该功能主要完成系统用户配置。
 2. 部门管理：配置系统组织机构（公司、部门、小组），树结构展现支持数据权限。
 3. 岗位管理：配置系统用户所属担任职务。
@@ -63,6 +64,7 @@
 1. 表单构建：自定义页面样式，拖拉拽实现页面布局。
 1. 服务监控：查看一些服务器的基本信息。
 1. 内容管理：demo功能，下设分类管理、内容管理。可以参考使用方便快速入门。
+1. 定时任务：自动化任务，目前支持接口调用和函数调用。

 ## 准备工作

@@ -74,9 +76,9 @@

 [步骤一 - 基础内容介绍](http://doc.zhangwj.com/go-admin-site/guide/intro/tutorial01.html)

-[步骤二 - 实际应用 - 编写增删改查](http://doc.zhangwj.com/go-admin-site/guide/intro/tutorial02.html) 
+[步骤二 - 实际应用 - 编写增删改查](http://doc.zhangwj.com/go-admin-site/guide/intro/tutorial02.html)

-### 手把手教你从入门到放弃 - 视频教程 
+### 手把手教你从入门到放弃 - 视频教程

 [如何启动go-admin](https://www.bilibili.com/video/BV1z5411x7JG)

@@ -94,7 +96,6 @@

 [go-admin数据权限使用说明](https://www.bilibili.com/video/BV1LK4y1s71e) [必看]

-
 **如有问题请先看上述使用文档和文章，若不能满足，欢迎 issue 和 pr ，视频教程和文档持续更新中**

 ## 📦 本地开发
@@ -121,7 +122,6 @@ git clone https://github.com/go-admin-team/go-admin-ui.git

 ```

-
 ### 启动说明

 #### 服务端启动说明
@@ -167,10 +167,10 @@ cgo: exec gcc: exec: "gcc": executable file not found in %PATH%
 ``` bash
 # 首次配置需要初始化数据库资源信息
 # macOS or linux 下使用
-$ ./go-admin migrate -c=config/settings.dev.yml
+$ ./go-admin migrate -c config/settings.dev.yml

 # ⚠️注意:windows 下使用
-$ go-admin.exe migrate -c=config/settings.dev.yml
+$ go-admin.exe migrate -c config/settings.dev.yml


 # 启动项目，也可以用IDE进行调试
@@ -193,8 +193,6 @@ docker build -t go-admin .
 docker run --name go-admin -p 8000:8000 -v /config/settings.yml:/config/settings.yml -d go-admin-server
 ```

-
-
 #### 文档生成

 ```bash
@@ -202,6 +200,7 @@ go generate
 ```

 #### 交叉编译
+
 ```bash
 # windows
 env GOOS=windows GOARCH=amd64 go build main.go
@@ -225,22 +224,22 @@ npm run dev
 ```

 ## 🎬 在线体验
-> admin  /  123456
+
+> admin / 123456

 演示地址：[http://www.go-admin.dev](http://www.go-admin.dev/#/login)

-
 ## 📨 互动

 <table>
-  <tr>
+   <tr>
    <td><img src="https://raw.githubusercontent.com/wenjianzhang/image/master/img/wx.png" width="180px"></td>
    <td><img src="https://raw.githubusercontent.com/wenjianzhang/image/master/img/qq.png" width="200px"></td>
    <td><img src="https://raw.githubusercontent.com/wenjianzhang/image/master/img/qq2.png" width="200px"></td>
  </tr>
  <tr>
    <td>微信</td>
-    <td>此群已满</td>
+    <td><a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=I8ZMqsExqCHpyu8SL4rbya700rBBXYLO&jump_from=webapi"><img border="0" src="//pub.idqqimg.com/wpa/images/group.png" alt="go-admin技术交流甲号" title="go-admin技术交流甲号"></a></td>
    <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>
@@ -252,16 +251,14 @@ npm run dev
 <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>

-
 ## 🤝 特别感谢
+
 1. [chengxiao](https://github.com/chengxiao)
 2. [gin](https://github.com/gin-gonic/gin)
 2. [casbin](https://github.com/casbin/casbin)
@@ -280,10 +277,11 @@ npm run dev
 <img class="no-margin" src="https://raw.githubusercontent.com/wenjianzhang/image/master/img/pay.png"  height="200px" >

 ## 🤝 链接
+
 [Go开发者成长线路图](http://www.golangroadmap.com/)

 ## 🔑 License

 [MIT](https://github.com/go-admin-team/go-admin/blob/master/LICENSE.md)

-Copyright (c) 2020 wenjianzhang
+Copyright (c) 2020 wenjianzhang
@@ -161,10 +161,10 @@ cgo: exec gcc: exec: "gcc": executable file not found in %PATH%
 ``` bash
 # The first configuration needs to initialize the database resource information
 # Use under macOS or linux
-$ ./go-admin migrate -c=config/settings.dev.yml
+$ ./go-admin migrate -c config/settings.dev.yml

 # ⚠️Note: Use under windows
-$ go-admin.exe migrate -c=config/settings.dev.yml
+$ go-admin.exe migrate -c config/settings.dev.yml

 # Start the project, you can also use the IDE for debugging
 # Use under macOS or linux
@@ -274,4 +274,4 @@ The `go-admin` project has always been developed in the GoLand integrated develo

 [MIT](https://github.com/go-admin-team/go-admin/blob/master/LICENSE.md)

-Copyright (c) 2020 wenjianzhang
+Copyright (c) 2020 wenjianzhang
@@ -0,0 +1,37 @@
+package apis
+
+import (
+	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/captcha"
+)
+
+type System struct {
+	api.Api
+}
+
+// GenerateCaptchaHandler 获取验证码
+// @Summary 获取验证码
+// @Description 获取验证码
+// @Tags 登陆
+// @Success 200 {object} response.Response{data=string,id=string,msg=string} "{"code": 200, "data": [...]}"
+// @Router /api/v1/captcha [get]
+func (e System) GenerateCaptchaHandler(c *gin.Context) {
+	err := e.MakeContext(c).Errors
+	if err != nil {
+		e.Error(500, err, "服务初始化失败！")
+		return
+	}
+	id, b64s, err := captcha.DriverDigitFunc()
+	if err != nil {
+		e.Logger.Errorf("DriverDigitFunc error, %s", err.Error())
+		e.Error(500, err, "验证码获取失败")
+		return
+	}
+	e.Custom(gin.H{
+		"code": 200,
+		"data": b64s,
+		"id":   id,
+		"msg":  "success",
+	})
+}
@@ -1,4 +1,4 @@
-package system
+package apis

 import (
 	"github.com/gin-gonic/gin"
@@ -33,7 +33,7 @@ $(function(){
 </html>
 `

-func HelloWorld(c *gin.Context) {
+func GoAdmin(c *gin.Context) {
 	c.Header("Content-Type", "text/html; charset=utf-8")
 	c.String(200, INDEX)
 }
@@ -1,76 +0,0 @@
-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/common/apis"
-)
-
-const (
-	B  = 1
-	KB = 1024 * B
-	MB = 1024 * KB
-	GB = 1024 * MB
-)
-
-type Monitor struct {
-	apis.Api
-}
-
-// @Summary 系统信息
-// @Description 获取JSON
-// @Tags 系统信息
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/settings/serverInfo [get]
-func (e Monitor) ServerInfo(c *gin.Context) {
-	e.Context = c
-
-	osDic := make(map[string]interface{}, 0)
-	osDic["goOs"] = runtime.GOOS
-	osDic["arch"] = runtime.GOARCH
-	osDic["mem"] = runtime.MemProfileRate
-	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
-	diskFreeGB := int(dis.Free) / GB
-	diskDic := make(map[string]interface{}, 0)
-	diskDic["total"] = diskTotalGB
-	diskDic["free"] = diskFreeGB
-
-	mem, _ := mem.VirtualMemory()
-	memUsedMB := int(mem.Used) / GB
-	memTotalMB := int(mem.Total) / GB
-	memFreeMB := int(mem.Free) / GB
-	memUsedPercent := int(mem.UsedPercent)
-	memDic := make(map[string]interface{}, 0)
-	memDic["total"] = memTotalMB
-	memDic["used"] = memUsedMB
-	memDic["free"] = memFreeMB
-	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)
-
-	e.Custom(gin.H{
-		"code": 200,
-		"os":   osDic,
-		"mem":  memDic,
-		"cpu":  cpuDic,
-		"disk": diskDic,
-	})
-}
@@ -0,0 +1,148 @@
+package apis
+
+import (
+	"github.com/gin-gonic/gin"
+	"github.com/gin-gonic/gin/binding"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
+	"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/service"
+	"go-admin/app/admin/service/dto"
+	"go-admin/common/actions"
+)
+
+type SysApi struct {
+	api.Api
+}
+
+// GetPage 获取接口管理列表
+// @Summary 获取接口管理列表
+// @Description 获取接口管理列表
+// @Tags 接口管理
+// @Param name query string false "名称"
+// @Param title query string false "标题"
+// @Param path query string false "地址"
+// @Param action query string false "类型"
+// @Param pageSize query int false "页条数"
+// @Param pageIndex query int false "页码"
+// @Success 200 {object} response.Response{data=response.Page{list=[]models.SysApi}} "{"code": 200, "data": [...]}"
+// @Router /api/v1/sys-api [get]
+// @Security Bearer
+func (e SysApi) GetPage(c *gin.Context) {
+	s := service.SysApi{}
+	req := dto.SysApiGetPageReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.Form).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	//数据权限检查
+	p := actions.GetPermissionFromContext(c)
+	list := make([]models.SysApi, 0)
+	var count int64
+	err = s.GetPage(&req, p, &list, &count)
+	if err != nil {
+		e.Error(500, err, "查询失败")
+		return
+	}
+	e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
+}
+
+// Get 获取接口管理
+// @Summary 获取接口管理
+// @Description 获取接口管理
+// @Tags 接口管理
+// @Param id path string false "id"
+// @Success 200 {object} response.Response{data=models.SysApi} "{"code": 200, "data": [...]}"
+// @Router /api/v1/sys-api/{id} [get]
+// @Security Bearer
+func (e SysApi) Get(c *gin.Context) {
+	req := dto.SysApiGetReq{}
+	s := service.SysApi{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, nil).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	p := actions.GetPermissionFromContext(c)
+	var object models.SysApi
+	err = s.Get(&req, p, &object).Error
+	if err != nil {
+		e.Error(500, err, "查询失败")
+		return
+	}
+	e.OK(object, "查询成功")
+}
+
+// Update 修改接口管理
+// @Summary 修改接口管理
+// @Description 修改接口管理
+// @Tags 接口管理
+// @Accept application/json
+// @Product application/json
+// @Param data body dto.SysApiUpdateReq true "body"
+// @Success 200 {object} response.Response	"{"code": 200, "message": "修改成功"}"
+// @Router /api/v1/sys-api/{id} [put]
+// @Security Bearer
+func (e SysApi) Update(c *gin.Context) {
+	req := dto.SysApiUpdateReq{}
+	s := service.SysApi{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		return
+	}
+	req.SetUpdateBy(user.GetUserId(c))
+	p := actions.GetPermissionFromContext(c)
+	err = s.Update(&req, p)
+	if err != nil {
+		e.Error(500, err, "更新失败")
+		return
+	}
+	e.OK(req.GetId(), "更新成功")
+}
+
+// DeleteSysApi 删除接口管理
+// @Summary 删除接口管理
+// @Description 删除接口管理
+// @Tags 接口管理
+// @Param data body dto.SysApiDeleteReq true "body"
+// @Success 200 {object} response.Response	"{"code": 200, "message": "删除成功"}"
+// @Router /api/v1/sys-api [delete]
+// @Security Bearer
+func (e SysApi) DeleteSysApi(c *gin.Context) {
+	req := dto.SysApiDeleteReq{}
+	s := service.SysApi{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		return
+	}
+	p := actions.GetPermissionFromContext(c)
+	err = s.Remove(&req, p)
+	if err != nil {
+		e.Error(500, err, "删除失败")
+		return
+	}
+	e.OK(req.GetId(), "删除成功")
+}
@@ -1,195 +0,0 @@
-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) {
-	e.SetContext(c)
-	log := e.GetLogger()
-	d := new(dto.SysChinaAreaDataSearch)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//查询列表
-	err = d.Bind(c)
-	if err != nil {
-		e.Error(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(http.StatusInternalServerError, err, "查询失败")
-		return
-	}
-
-	e.PageOK(list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功")
-}
-
-func (e SysChinaAreaData) GetSysChinaAreaData(c *gin.Context) {
-	e.SetContext(c)
-	log := e.GetLogger()
-	control := new(dto.SysChinaAreaDataById)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//查看详情
-	err = control.Bind(c)
-	if err != nil {
-		e.Error(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(http.StatusUnprocessableEntity, err, "查询失败")
-		return
-	}
-
-	e.OK(object, "查看成功")
-}
-
-func (e SysChinaAreaData) InsertSysChinaAreaData(c *gin.Context) {
-	e.SetContext(c)
-	log := e.GetLogger()
-	control := new(dto.SysChinaAreaDataControl)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//新增操作
-	err = control.Bind(c)
-	if err != nil {
-		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
-		return
-	}
-	object, err := control.Generate()
-	if err != nil {
-		e.Error(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(http.StatusInternalServerError, err, "创建失败")
-		return
-	}
-
-	e.OK(object.GetId(), "创建成功")
-}
-
-func (e SysChinaAreaData) UpdateSysChinaAreaData(c *gin.Context) {
-	e.SetContext(c)
-	log := e.GetLogger()
-	control := new(dto.SysChinaAreaDataControl)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//更新操作
-	err = control.Bind(c)
-	if err != nil {
-		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
-		return
-	}
-	object, err := control.Generate()
-	if err != nil {
-		e.Error(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(object.GetId(), "更新成功")
-}
-
-func (e SysChinaAreaData) DeleteSysChinaAreaData(c *gin.Context) {
-	e.SetContext(c)
-	log := e.GetLogger()
-	control := new(dto.SysChinaAreaDataById)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//删除操作
-	err = control.Bind(c)
-	if err != nil {
-		log.Errorf("Bind error: %s", err)
-		e.Error(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(http.StatusInternalServerError, err, "删除失败")
-		return
-	}
-	e.OK(control.GetId(), "删除成功")
-}
@@ -0,0 +1,313 @@
+package apis
+
+import (
+	"github.com/gin-gonic/gin"
+	"github.com/gin-gonic/gin/binding"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
+	"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"
+)
+
+type SysConfig struct {
+	api.Api
+}
+
+// GetPage 获取配置管理列表
+// @Summary 获取配置管理列表
+// @Description 获取配置管理列表
+// @Tags 配置管理
+// @Param configName query string false "名称"
+// @Param configKey query string false "key"
+// @Param configType query string false "类型"
+// @Param isFrontend query int false "是否前端"
+// @Param pageSize query int false "页条数"
+// @Param pageIndex query int false "页码"
+// @Success 200 {object} response.Response{data=response.Page{list=[]models.SysApi}} "{"code": 200, "data": [...]}"
+// @Router /api/v1/sys-config [get]
+// @Security Bearer
+func (e SysConfig) GetPage(c *gin.Context) {
+	s := service.SysConfig{}
+	req := dto.SysConfigGetPageReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.Form).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		return
+	}
+
+	list := make([]models.SysConfig, 0)
+	var count int64
+	err = s.GetPage(&req, &list, &count)
+	if err != nil {
+		e.Error(500, err, "查询失败")
+		return
+	}
+	e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
+}
+
+// Get 获取配置管理
+// @Summary 获取配置管理
+// @Description 获取配置管理
+// @Tags 配置管理
+// @Param id path string false "id"
+// @Success 200 {object} response.Response{data=models.SysConfig} "{"code": 200, "data": [...]}"
+// @Router /api/v1/sys-config/{id} [get]
+// @Security Bearer
+func (e SysConfig) Get(c *gin.Context) {
+	req := dto.SysConfigGetReq{}
+	s := service.SysConfig{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.JSON, nil).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	var object models.SysConfig
+
+	err = s.Get(&req, &object)
+	if err != nil {
+		e.Error(500, err, err.Error())
+		return
+	}
+
+	e.OK(object, "查询成功")
+}
+
+// Insert 创建配置管理
+// @Summary 创建配置管理
+// @Description 创建配置管理
+// @Tags 配置管理
+// @Accept application/json
+// @Product application/json
+// @Param data body dto.SysConfigControl true "body"
+// @Success 200 {object} response.Response	"{"code": 200, "message": "创建成功"}"
+// @Router /api/v1/sys-config [post]
+// @Security Bearer
+func (e SysConfig) Insert(c *gin.Context) {
+	s := service.SysConfig{}
+	req := dto.SysConfigControl{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.JSON).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	req.SetCreateBy(user.GetUserId(c))
+
+	err = s.Insert(&req)
+	if err != nil {
+		e.Error(500, err, "创建失败")
+		return
+	}
+	e.OK(req.GetId(), "创建成功")
+}
+
+// Update 修改配置管理
+// @Summary 修改配置管理
+// @Description 修改配置管理
+// @Tags 配置管理
+// @Accept application/json
+// @Product application/json
+// @Param data body dto.SysConfigControl true "body"
+// @Success 200 {object} response.Response	"{"code": 200, "message": "修改成功"}"
+// @Router /api/v1/sys-config/{id} [put]
+// @Security Bearer
+func (e SysConfig) Update(c *gin.Context) {
+	s := service.SysConfig{}
+	req := dto.SysConfigControl{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.JSON, nil).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	req.SetUpdateBy(user.GetUserId(c))
+	err = s.Update(&req)
+	if err != nil {
+		e.Error(500, err, "更新失败")
+		return
+	}
+	e.OK(req.GetId(), "更新成功")
+}
+
+// Delete 删除配置管理
+// @Summary 删除配置管理
+// @Description 删除配置管理
+// @Tags 配置管理
+// @Param ids body []int false "ids"
+// @Success 200 {object} response.Response	"{"code": 200, "message": "删除成功"}"
+// @Router /api/v1/sys-config [delete]
+// @Security Bearer
+func (e SysConfig) Delete(c *gin.Context) {
+	s := service.SysConfig{}
+	req := dto.SysConfigDeleteReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.JSON, nil).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	req.SetUpdateBy(user.GetUserId(c))
+
+	err = s.Remove(&req)
+	if err != nil {
+		e.Error(500, err, "删除失败")
+		return
+	}
+	e.OK(req.GetId(), "删除成功")
+}
+
+// Get2SysApp 获取系统配置信息
+// @Summary 获取系统前台配置信息，主要注意这里不在验证权限
+// @Description 获取系统配置信息，主要注意这里不在验证权限
+// @Tags 配置管理
+// @Success 200 {object} response.Response{data=map[string]string} "{"code": 200, "data": [...]}"
+// @Router /api/v1/app-config [get]
+func (e SysConfig) Get2SysApp(c *gin.Context) {
+	req := dto.SysConfigGetToSysAppReq{}
+	s := service.SysConfig{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.Form).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		return
+	}
+	// 控制只读前台的数据
+	req.IsFrontend = 1
+	list := make([]models.SysConfig, 0)
+	err = s.GetWithKeyList(&req, &list)
+	if err != nil {
+		e.Error(500, err, "查询失败")
+		return
+	}
+	mp := make(map[string]string)
+	for i := 0; i < len(list); i++ {
+		key := list[i].ConfigKey
+		if key != "" {
+			mp[key] = list[i].ConfigValue
+		}
+	}
+	e.OK(mp, "查询成功")
+}
+
+// Get2Set 获取配置
+// @Summary 获取配置
+// @Description 界面操作设置配置值的获取
+// @Tags 配置管理
+// @Accept application/json
+// @Product application/json
+// @Success 200 {object} response.Response{data=map[string]interface{}}	"{"code": 200, "message": "修改成功"}"
+// @Router /api/v1/set-config [get]
+// @Security Bearer
+func (e SysConfig) Get2Set(c *gin.Context) {
+	s := service.SysConfig{}
+	req := make([]dto.GetSetSysConfigReq, 0)
+	err := e.MakeContext(c).
+		MakeOrm().
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	err = s.GetForSet(&req)
+	if err != nil {
+		e.Error(500, err, "查询失败")
+		return
+	}
+	m := make(map[string]interface{}, 0)
+	for _, v := range req {
+		m[v.ConfigKey] = v.ConfigValue
+	}
+	e.OK(m, "查询成功")
+}
+
+// Update2Set 设置配置
+// @Summary 设置配置
+// @Description 界面操作设置配置值
+// @Tags 配置管理
+// @Accept application/json
+// @Product application/json
+// @Param data body []dto.GetSetSysConfigReq true "body"
+// @Success 200 {object} response.Response	"{"code": 200, "message": "修改成功"}"
+// @Router /api/v1/set-config [put]
+// @Security Bearer
+func (e SysConfig) Update2Set(c *gin.Context) {
+	s := service.SysConfig{}
+	req := make([]dto.GetSetSysConfigReq, 0)
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.JSON).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+
+	err = s.UpdateForSet(&req)
+	if err != nil {
+		e.Error(500, err, err.Error())
+		return
+	}
+
+	e.OK("", "更新成功")
+}
+
+// GetSysConfigByKEYForService 根据Key获取SysConfig的Service
+// @Summary 根据Key获取SysConfig的Service
+// @Description 根据Key获取SysConfig的Service
+// @Tags 配置管理
+// @Param configKey path string false "configKey"
+// @Success 200 {object} response.Response{data=dto.SysConfigByKeyReq} "{"code": 200, "data": [...]}"
+// @Router /api/v1/sys-config/{id} [get]
+// @Security Bearer
+func (e SysConfig) GetSysConfigByKEYForService(c *gin.Context) {
+	var s = new(service.SysConfig)
+	var req = new(dto.SysConfigByKeyReq)
+	var resp = new(dto.GetSysConfigByKEYForServiceResp)
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(req, nil).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+
+	err = s.GetWithKey(req, resp)
+	if err != nil {
+		e.Error(500, err, err.Error())
+		return
+	}
+	e.OK(resp, s.Msg)
+}
@@ -0,0 +1,238 @@
+package apis
+
+import (
+	"github.com/gin-gonic/gin"
+	"github.com/gin-gonic/gin/binding"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
+	"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/service"
+	"go-admin/app/admin/service/dto"
+)
+
+type SysDept struct {
+	api.Api
+}
+
+// GetPage
+// @Summary 分页部门列表数据
+// @Description 分页列表
+// @Tags 部门
+// @Param deptName query string false "deptName"
+// @Param deptId query string false "deptId"
+// @Param position query string false "position"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/dept [get]
+// @Security Bearer
+func (e SysDept) GetPage(c *gin.Context) {
+	s := service.SysDept{}
+	req := dto.SysDeptGetPageReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	list := make([]models.SysDept, 0)
+	list, err = s.SetDeptPage(&req)
+	if err != nil {
+		e.Error(500, err, "查询失败")
+		return
+	}
+	e.OK(list, "查询成功")
+}
+
+// Get
+// @Summary 获取部门数据
+// @Description 获取JSON
+// @Tags 部门
+// @Param deptId path string false "deptId"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/dept/{deptId} [get]
+// @Security Bearer
+func (e SysDept) Get(c *gin.Context) {
+	s := service.SysDept{}
+	req := dto.SysDeptGetReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.JSON, nil).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	var object models.SysDept
+
+	err = s.Get(&req, &object)
+	if err != nil {
+		e.Error(500, err, "查询失败")
+		return
+	}
+
+	e.OK(object, "查询成功")
+}
+
+// Insert 添加部门
+// @Summary 添加部门
+// @Description 获取JSON
+// @Tags 部门
+// @Accept  application/json
+// @Product application/json
+// @Param data body dto.SysDeptInsertReq 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) Insert(c *gin.Context) {
+	s := service.SysDept{}
+	req := dto.SysDeptInsertReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.JSON).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+
+	// 设置创建人
+	req.SetCreateBy(user.GetUserId(c))
+	err = s.Insert(&req)
+	if err != nil {
+		e.Error(500, err, "创建失败")
+		return
+	}
+	e.OK(req.GetId(), "创建成功")
+}
+
+// Update
+// @Summary 修改部门
+// @Description 获取JSON
+// @Tags 部门
+// @Accept  application/json
+// @Product application/json
+// @Param id path int true "id"
+// @Param data body dto.SysDeptUpdateReq 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) Update(c *gin.Context) {
+	s := service.SysDept{}
+	req := dto.SysDeptUpdateReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	req.SetUpdateBy(user.GetUserId(c))
+	err = s.Update(&req)
+	if err != nil {
+		e.Error(500, err, err.Error())
+		return
+	}
+	e.OK(req.GetId(), "更新成功")
+}
+
+// Delete
+// @Summary 删除部门
+// @Description 删除数据
+// @Tags 部门
+// @Param data body dto.SysDeptDeleteReq true "body"
+// @Success 200 {string} string	"{"code": 200, "message": "删除成功"}"
+// @Success 200 {string} string	"{"code": -1, "message": "删除失败"}"
+// @Router /api/v1/dept [delete]
+// @Security Bearer
+func (e SysDept) Delete(c *gin.Context) {
+	s := service.SysDept{}
+	req := dto.SysDeptDeleteReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.JSON, nil).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+
+	err = s.Remove(&req)
+	if err != nil {
+		e.Error(500, err, "删除失败")
+		return
+	}
+	e.OK(req.GetId(), "删除成功")
+}
+
+// Get2Tree 用户管理 左侧部门树
+func (e SysDept) Get2Tree(c *gin.Context) {
+	s := service.SysDept{}
+	req := dto.SysDeptGetPageReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req,binding.Form).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	list := make([]dto.DeptLabel, 0)
+	list, err = s.SetDeptTree(&req)
+	if err != nil {
+		e.Error(500, err, "查询失败")
+		return
+	}
+	e.OK(list, "")
+}
+
+// GetDeptTreeRoleSelect TODO: 此接口需要调整不应该将list和选中放在一起
+func (e SysDept) GetDeptTreeRoleSelect(c *gin.Context) {
+	s := service.SysDept{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+
+	id, err := pkg.StringToInt(c.Param("roleId"))
+	result, err := s.SetDeptLabel()
+	if err != nil {
+		e.Error(500, err, err.Error())
+		return
+	}
+	menuIds := make([]int, 0)
+	if id != 0 {
+		menuIds, err = s.GetWithRoleId(id)
+		if err != nil {
+			e.Error(500, err, err.Error())
+			return
+		}
+	}
+	e.OK(gin.H{
+		"depts":       result,
+		"checkedKeys": menuIds,
+	}, "")
+}
@@ -0,0 +1,220 @@
+package apis
+
+import (
+	"github.com/gin-gonic/gin"
+	"github.com/gin-gonic/gin/binding"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
+	"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/service"
+	"go-admin/app/admin/service/dto"
+)
+
+type SysDictData struct {
+	api.Api
+}
+
+// GetPage
+// @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} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/dict/data [get]
+// @Security Bearer
+func (e SysDictData) GetPage(c *gin.Context) {
+	s := service.SysDictData{}
+	req := dto.SysDictDataGetPageReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.Form).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+
+	list := make([]models.SysDictData, 0)
+	var count int64
+	err = s.GetPage(&req, &list, &count)
+	if err != nil {
+		e.Error(500, err, "查询失败")
+		return
+	}
+
+	e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
+}
+
+// Get
+// @Summary 通过编码获取字典数据
+// @Description 获取JSON
+// @Tags 字典数据
+// @Param dictCode path int true "字典编码"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/dict/data/{dictCode} [get]
+// @Security Bearer
+func (e SysDictData) Get(c *gin.Context) {
+	s := service.SysDictData{}
+	req := dto.SysDictDataGetReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, nil).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+
+	var object models.SysDictData
+
+	err = s.Get(&req, &object)
+	if err != nil {
+		e.Logger.Warnf("Get error: %s", err.Error())
+		e.Error(500, err, "查询失败")
+		return
+	}
+
+	e.OK(object, "查询成功")
+}
+
+// Insert
+// @Summary 添加字典数据
+// @Description 获取JSON
+// @Tags 字典数据
+// @Accept  application/json
+// @Product application/json
+// @Param data body dto.SysDictDataInsertReq true "data"
+// @Success 200 {object} response.Response	"{"code": 200, "message": "添加成功"}"
+// @Router /api/v1/dict/data [post]
+// @Security Bearer
+func (e SysDictData) Insert(c *gin.Context) {
+	s := service.SysDictData{}
+	req := dto.SysDictDataInsertReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.JSON).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	req.SetCreateBy(user.GetUserId(c))
+	err = s.Insert(&req)
+	if err != nil {
+		e.Error(500, err, "创建失败")
+		return
+	}
+
+	e.OK(req.GetId(), "创建成功")
+}
+
+// Update
+// @Summary 修改字典数据
+// @Description 获取JSON
+// @Tags 字典数据
+// @Accept  application/json
+// @Product application/json
+// @Param data body dto.SysDictDataUpdateReq true "body"
+// @Success 200 {object} response.Response	"{"code": 200, "message": "修改成功"}"
+// @Router /api/v1/dict/data/{dictCode} [put]
+// @Security Bearer
+func (e SysDictData) Update(c *gin.Context) {
+	s := service.SysDictData{}
+	req := dto.SysDictDataUpdateReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.JSON, nil).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	req.SetUpdateBy(user.GetUserId(c))
+	err = s.Update(&req)
+	if err != nil {
+		e.Error(500, err, "更新失败")
+		return
+	}
+	e.OK(req.GetId(), "更新成功")
+}
+
+// Delete
+// @Summary 删除字典数据
+// @Description 删除数据
+// @Tags 字典数据
+// @Param dictCode body dto.SysDictDataDeleteReq true "body"
+// @Success 200 {object} response.Response	"{"code": 200, "message": "删除成功"}"
+// @Router /api/v1/dict/data [delete]
+// @Security Bearer
+func (e SysDictData) Delete(c *gin.Context) {
+	s := service.SysDictData{}
+	req := dto.SysDictDataDeleteReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.JSON, nil).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	req.SetUpdateBy(user.GetUserId(c))
+	err = s.Remove(&req)
+	if err != nil {
+		e.Error(500, err, "删除失败")
+		return
+	}
+	e.OK(req.GetId(), "删除成功")
+}
+
+// GetAll 数据字典根据key获取 业务页面使用
+// @Summary 数据字典根据key获取
+// @Description 数据字典根据key获取
+// @Tags 字典数据
+// @Param dictType query int true "dictType"
+// @Success 200 {object} response.Response{data=[]dto.SysDictDataGetAllResp}  "{"code": 200, "data": [...]}"
+// @Router /api/v1/dict-data/option-select [get]
+// @Security Bearer
+func (e SysDictData) GetAll(c *gin.Context) {
+	s := service.SysDictData{}
+	req := dto.SysDictDataGetPageReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	list := make([]models.SysDictData, 0)
+	err = s.GetAll(&req, &list)
+	if err != nil {
+		e.Error(500, err, "查询失败")
+		return
+	}
+	l := make([]dto.SysDictDataGetAllResp, 0)
+	for _, i := range list {
+		d := dto.SysDictDataGetAllResp{}
+		e.Translate(i, &d)
+		l = append(l, d)
+	}
+
+	e.OK(l,"查询成功")
+}
@@ -0,0 +1,210 @@
+package apis
+
+import (
+	"fmt"
+	"github.com/gin-gonic/gin"
+	"github.com/gin-gonic/gin/binding"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
+	"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/service"
+	"go-admin/app/admin/service/dto"
+)
+
+type SysDictType struct {
+	api.Api
+}
+
+// GetPage 字典类型列表数据
+// @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} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/dict/type [get]
+// @Security Bearer
+func (e SysDictType) GetPage(c *gin.Context) {
+	s := service.SysDictType{}
+	req :=dto.SysDictTypeGetPageReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.Form).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	list := make([]models.SysDictType, 0)
+	var count int64
+	err = s.GetPage(&req, &list, &count)
+	if err != nil {
+		e.Error(500, err, "查询失败")
+		return
+	}
+	e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
+}
+
+// Get 字典类型通过字典id获取
+// @Summary 字典类型通过字典id获取
+// @Description 获取JSON
+// @Tags 字典类型
+// @Param dictId path int true "字典类型编码"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/dict/type/{dictId} [get]
+// @Security Bearer
+func (e SysDictType) Get(c *gin.Context) {
+	s := service.SysDictType{}
+	req :=dto.SysDictTypeGetReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, nil).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	var object models.SysDictType
+	err = s.Get(&req, &object)
+	if err != nil {
+		e.Error(500, err, "查询失败")
+		return
+	}
+	e.OK(object, "查询成功")
+}
+
+//Insert 字典类型创建
+// @Summary 添加字典类型
+// @Description 获取JSON
+// @Tags 字典类型
+// @Accept  application/json
+// @Product application/json
+// @Param data body dto.SysDictTypeInsertReq true "data"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/dict/type [post]
+// @Security Bearer
+func (e SysDictType) Insert(c *gin.Context) {
+	s := service.SysDictType{}
+	req :=dto.SysDictTypeInsertReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.JSON).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	req.SetCreateBy(user.GetUserId(c))
+	err = s.Insert(&req)
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err,fmt.Sprintf(" 创建字典类型失败，详情：%s", err.Error()))
+		return
+	}
+	e.OK(req.GetId(), "创建成功")
+}
+
+// Update
+// @Summary 修改字典类型
+// @Description 获取JSON
+// @Tags 字典类型
+// @Accept  application/json
+// @Product application/json
+// @Param data body dto.SysDictTypeUpdateReq true "body"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/dict/type/{dictId} [put]
+// @Security Bearer
+func (e SysDictType) Update(c *gin.Context) {
+	s := service.SysDictType{}
+	req :=dto.SysDictTypeUpdateReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.JSON, nil).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Error(500, err, err.Error())
+		e.Logger.Error(err)
+		return
+	}
+	req.SetUpdateBy(user.GetUserId(c))
+	err = s.Update(&req)
+	if err != nil {
+		e.Logger.Error(err)
+		return
+	}
+	e.OK(req.GetId(), "更新成功")
+}
+
+// Delete
+// @Summary 删除字典类型
+// @Description 删除数据
+// @Tags 字典类型
+// @Param dictCode body dto.SysDictTypeDeleteReq true "body"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/dict/type [delete]
+// @Security Bearer
+func (e SysDictType) Delete(c *gin.Context) {
+	s := service.SysDictType{}
+	req :=dto.SysDictTypeDeleteReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.JSON, nil).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	req.SetUpdateBy(user.GetUserId(c))
+	err = s.Remove(&req)
+	if err != nil {
+		e.Error(500, err, err.Error())
+		return
+	}
+	e.OK(req.GetId(), "删除成功")
+}
+
+// GetAll
+// @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} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/dict/type-option-select [get]
+// @Security Bearer
+func (e SysDictType) GetAll(c *gin.Context) {
+	s := service.SysDictType{}
+	req :=dto.SysDictTypeGetPageReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.Form).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	list := make([]models.SysDictType, 0)
+	err = s.GetAll(&req, &list)
+	if err != nil {
+		e.Error(500, err, err.Error())
+		return
+	}
+	e.OK(list, "查询成功")
+}
@@ -1,198 +0,0 @@
-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) {
-	e.Context = c
-	log := e.GetLogger()
-	search := new(dto.SysFileDirSearch)
-	db, err := e.GetOrm()
-	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(http.StatusUnprocessableEntity, err, "查询失败")
-		return
-	}
-
-	e.OK(list, "查询成功")
-}
-
-func (e SysFileDir) GetSysFileDir(c *gin.Context) {
-	control := new(dto.SysFileDirById)
-	e.Context = c
-	log := e.GetLogger()
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//查看详情
-	err = c.ShouldBindUri(control)
-	if err != nil {
-		log.Warnf("ShouldBindUri error: %s", err.Error())
-		e.Error(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(http.StatusInternalServerError, err, "查询失败")
-		return
-	}
-
-	e.OK(object, "查看成功")
-}
-
-func (e SysFileDir) InsertSysFileDir(c *gin.Context) {
-	control := new(dto.SysFileDirControl)
-	e.Context = c
-	log := e.GetLogger()
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//新增操作
-	err = c.ShouldBindUri(control)
-	if err != nil {
-		log.Warnf("ShouldBindUri error: %s", err.Error())
-		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
-		return
-	}
-	err = c.ShouldBind(control)
-	if err != nil {
-		log.Warnf("ShouldBind error: %s", err.Error())
-		e.Error(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(http.StatusInternalServerError, err, "创建失败")
-		return
-	}
-
-	e.OK(control.ID, "创建成功")
-}
-
-func (e SysFileDir) UpdateSysFileDir(c *gin.Context) {
-	control := new(dto.SysFileDirControl)
-	e.Context = c
-	log := e.GetLogger()
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	err = c.ShouldBindUri(control)
-	if err != nil {
-		log.Warnf("ShouldBindUri error: %s", err.Error())
-		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
-	}
-	err = c.ShouldBind(control)
-	if err != nil {
-		log.Warnf("ShouldBind error: %#v", err.Error())
-		e.Error(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(http.StatusInternalServerError, err, "更新失败")
-		return
-	}
-	e.OK(control.ID, "更新成功")
-}
-
-func (e SysFileDir) DeleteSysFileDir(c *gin.Context) {
-	control := new(dto.SysFileDirById)
-	e.Context = c
-	log := e.GetLogger()
-	db, err := e.GetOrm()
-	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(http.StatusUnprocessableEntity, err, "参数验证失败")
-	}
-	err = c.ShouldBind(control)
-	if err != nil {
-		log.Warnf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
-		e.Error(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(http.StatusInternalServerError, err, "删除失败")
-		return
-	}
-	e.OK(control.Id, "删除成功")
-}
@@ -1,209 +0,0 @@
-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) {
-	e.Context = c
-	log := e.GetLogger()
-	search := new(dto.SysFileInfoSearch)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-	err = c.ShouldBind(search)
-	if err != nil {
-		log.Warnf("参数验证错误, error: %s", err)
-		e.Error(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(http.StatusInternalServerError, err, "查询失败")
-		return
-	}
-
-	e.PageOK(list, int(count), search.PageIndex, search.PageSize, "查询成功")
-}
-
-func (e SysFileInfo) GetSysFileInfo(c *gin.Context) {
-	control := new(dto.SysFileInfoById)
-	e.Context = c
-	log := e.GetLogger()
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//查看详情
-	err = c.ShouldBindUri(control)
-	if err != nil {
-		log.Warnf("参数验证错误, error:%s", err)
-		e.Error(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(http.StatusInternalServerError, err, "查询失败")
-		return
-	}
-
-	e.OK(object, "查看成功")
-}
-
-func (e SysFileInfo) InsertSysFileInfo(c *gin.Context) {
-	control := new(dto.SysFileInfoControl)
-	e.Context = c
-	log := e.GetLogger()
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//新增操作
-	err = c.ShouldBindUri(control)
-	if err != nil {
-		log.Warnf("参数验证错误, error: %s", err)
-		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
-		return
-	}
-	err = c.ShouldBind(control)
-	if err != nil {
-		log.Warnf("参数验证错误, error: %s", err)
-		e.Error(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(http.StatusInternalServerError, err, "创建失败")
-		return
-	}
-
-	e.OK(control.ID, "创建成功")
-}
-
-func (e SysFileInfo) UpdateSysFileInfo(c *gin.Context) {
-	control := new(dto.SysFileInfoControl)
-	e.Context = c
-	log := e.GetLogger()
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	err = c.ShouldBindUri(control)
-	if err != nil {
-		log.Warnf("参数验证错误, error: %s", err)
-		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
-		return
-	}
-	err = c.ShouldBind(control)
-	if err != nil {
-		log.Warnf("参数验证错误, error:%s", err)
-		e.Error(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(http.StatusInternalServerError, err, "创建失败")
-		return
-	}
-	e.OK(control.ID, "更新成功")
-}
-
-func (e SysFileInfo) DeleteSysFileInfo(c *gin.Context) {
-	control := new(dto.SysFileInfoById)
-	e.Context = c
-	log := e.GetLogger()
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//删除操作
-	err = c.ShouldBindUri(control)
-	if err != nil {
-		log.Warnf("参数验证错误, error: %s", err)
-		e.Error(422, err, "参数验证失败")
-		return
-	}
-	err = c.ShouldBind(control)
-	if err != nil {
-		log.Warnf("参数验证错误, error: %s", err)
-		e.Error(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(http.StatusInternalServerError, err, "创建失败")
-		return
-	}
-	e.OK(control.Id, "删除成功")
-}
@@ -0,0 +1,110 @@
+package apis
+
+import (
+	"github.com/gin-gonic/gin"
+	"github.com/gin-gonic/gin/binding"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
+	"go-admin/app/admin/models"
+
+	"go-admin/app/admin/service"
+	"go-admin/app/admin/service/dto"
+)
+
+type SysLoginLog struct {
+	api.Api
+}
+
+// GetPage 登录日志列表
+// @Summary 登录日志列表
+// @Description 获取JSON
+// @Tags 登录日志
+// @Param username query string false "用户名"
+// @Param ipaddr query string false "ip地址"
+// @Param loginLocation  query string false "归属地"
+// @Param status query string false "状态"
+// @Param beginTime query string false "开始时间"
+// @Param endTime query string false "结束时间"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/sys-login-log [get]
+// @Security Bearer
+func (e SysLoginLog) GetPage(c *gin.Context) {
+	s := service.SysLoginLog{}
+	req :=dto.SysLoginLogGetPageReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.Form).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	list := make([]models.SysLoginLog, 0)
+	var count int64
+	err = s.GetPage(&req, &list, &count)
+	if err != nil {
+		e.Error(500, err, "查询失败")
+		return
+	}
+	e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
+}
+
+// Get 登录日志通过id获取
+// @Summary 登录日志通过id获取
+// @Description 获取JSON
+// @Tags 登录日志
+// @Param id path string false "id"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/sys-login-log/{id} [get]
+// @Security Bearer
+func (e SysLoginLog) Get(c *gin.Context) {
+	s := service.SysLoginLog{}
+	req :=dto.SysLoginLogGetReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	var object models.SysLoginLog
+	err = s.Get(&req, &object)
+	if err != nil {
+		e.Error(500, err, "查询失败")
+		return
+	}
+	e.OK(object, "查询成功")
+}
+
+// Delete 登录日志删除
+// @Summary 登录日志删除
+// @Description 登录日志删除
+// @Tags 登录日志
+// @Param data body dto.SysLoginLogDeleteReq true "body"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/sys-login-log [delete]
+// @Security Bearer
+func (e SysLoginLog) Delete(c *gin.Context) {
+	s := service.SysLoginLog{}
+	req :=dto.SysLoginLogDeleteReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.JSON, nil).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	err = s.Remove(&req)
+	if err != nil {
+		e.Error(500, err, "删除失败")
+		return
+	}
+	e.OK(req.GetId(), "删除成功")
+}
@@ -0,0 +1,287 @@
+package apis
+
+import (
+	"github.com/gin-gonic/gin"
+	"github.com/gin-gonic/gin/binding"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
+	"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"
+)
+
+type SysMenu struct {
+	api.Api
+}
+
+// GetPage Menu列表数据
+// @Summary Menu列表数据
+// @Description 获取JSON
+// @Tags 菜单
+// @Param menuName query string false "menuName"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/menu [get]
+// @Security Bearer
+func (e SysMenu) GetPage(c *gin.Context) {
+	s := service.SysMenu{}
+	req := dto.SysMenuGetPageReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.Form).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	var list = make([]models.SysMenu, 0)
+	err = s.GetPage(&req, &list).Error
+	if err != nil {
+		e.Error(500, err, "查询失败")
+		return
+	}
+	e.OK(list, "查询成功")
+}
+
+// Get 获取菜单详情
+// @Summary Menu详情数据
+// @Description 获取JSON
+// @Tags 菜单
+// @Param id path string false "id"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/menu/{id} [get]
+// @Security Bearer
+func (e SysMenu) Get(c *gin.Context) {
+	req := dto.SysMenuGetReq{}
+	s := new(service.SysMenu)
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, nil).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	var object = models.SysMenu{}
+
+	err = s.Get(&req, &object).Error
+	if err != nil {
+		e.Error(500, err, "查询失败")
+		return
+	}
+	e.OK(object, "查询成功")
+}
+
+// Insert 创建菜单
+// @Summary 创建菜单
+// @Description 获取JSON
+// @Tags 菜单
+// @Accept  application/json
+// @Product application/json
+// @Param data body dto.SysMenuInsertReq true "data"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/menu [post]
+// @Security Bearer
+func (e SysMenu) Insert(c *gin.Context) {
+	req := dto.SysMenuInsertReq{}
+	s := new(service.SysMenu)
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.JSON).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	// 设置创建人
+	req.SetCreateBy(user.GetUserId(c))
+	err = s.Insert(&req).Error
+	if err != nil {
+		e.Error(500, err, "创建失败")
+		return
+	}
+	e.OK(req.GetId(), "创建成功")
+}
+
+// Update 修改菜单
+// @Summary 修改菜单
+// @Description 获取JSON
+// @Tags 菜单
+// @Accept  application/json
+// @Product application/json
+// @Param id path int true "id"
+// @Param data body dto.SysMenuUpdateReq true "body"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/menu/{id} [put]
+// @Security Bearer
+func (e SysMenu) Update(c *gin.Context) {
+	req := dto.SysMenuUpdateReq{}
+	s := new(service.SysMenu)
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.JSON, nil).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+
+	req.SetUpdateBy(user.GetUserId(c))
+	err = s.Update(&req).Error
+	if err != nil {
+		e.Error(500, err, "更新失败")
+		return
+	}
+	e.OK(req.GetId(), "更新成功")
+}
+
+// Delete 删除菜单
+// @Summary 删除菜单
+// @Description 删除数据
+// @Tags 菜单
+// @Param data body dto.SysMenuDeleteReq true "body"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/menu [delete]
+// @Security Bearer
+func (e SysMenu) Delete(c *gin.Context) {
+	control := new(dto.SysMenuDeleteReq)
+	s := new(service.SysMenu)
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(control, binding.JSON).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	err = s.Remove(control).Error
+	if err != nil {
+		e.Logger.Errorf("RemoveSysMenu error, %s", err)
+		e.Error(500, err, "删除失败")
+		return
+	}
+	e.OK(control.GetId(), "删除成功")
+}
+
+// GetMenuRole 根据登录角色名称获取菜单列表数据（左菜单使用）
+// @Summary 根据登录角色名称获取菜单列表数据（左菜单使用）
+// @Description 获取JSON
+// @Tags 菜单
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/menurole [get]
+// @Security Bearer
+func (e SysMenu) GetMenuRole(c *gin.Context) {
+	s := new(service.SysMenu)
+	err := e.MakeContext(c).
+		MakeOrm().
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+
+	result, err := s.SetMenuRole(user.GetRoleName(c))
+
+	if err != nil {
+		e.Error(500, err, "查询失败")
+		return
+	}
+
+	e.OK(result, "")
+}
+
+//// GetMenuIDS 获取角色对应的菜单id数组
+//// @Summary 获取角色对应的菜单id数组，设置角色权限使用
+//// @Description 获取JSON
+//// @Tags 菜单
+//// @Param id path int true "id"
+//// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+//// @Router /api/v1/menuids/{id} [get]
+//// @Security Bearer
+//func (e SysMenu) GetMenuIDS(c *gin.Context) {
+//	s := new(service.SysMenu)
+//	r := service.SysRole{}
+//	m := dto.SysRoleByName{}
+//	err := e.MakeContext(c).
+//		MakeOrm().
+//		Bind(&m, binding.JSON).
+//		MakeService(&s.Service).
+//		MakeService(&r.Service).
+//		Errors
+//	if err != nil {
+//		e.Logger.Error(err)
+//		e.Error(500, err, err.Error())
+//		return
+//	}
+//	var data models.SysRole
+//	err = r.GetWithName(&m, &data).Error
+//
+//	//data.RoleName = c.GetString("role")
+//	//data.UpdateBy = user.GetUserId(c)
+//	//result, err := data.GetIDS(s.Orm)
+//
+//	if err != nil {
+//		e.Logger.Errorf("GetIDS error, %s", err.Error())
+//		e.Error(500, err, "获取失败")
+//		return
+//	}
+//	e.OK(result, "")
+//}
+
+// GetMenuTreeSelect 根据角色ID查询菜单下拉树结构
+// @Summary 角色修改使用的菜单列表
+// @Description 获取JSON
+// @Tags 菜单
+// @Accept  application/json
+// @Product application/json
+// @Param roleId path int true "roleId"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/menuTreeselect/{roleId} [get]
+// @Security Bearer
+func (e SysMenu) GetMenuTreeSelect(c *gin.Context) {
+	m := service.SysMenu{}
+	r := service.SysRole{}
+	req :=dto.SelectRole{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		MakeService(&m.Service).
+		MakeService(&r.Service).
+		Bind(&req, nil).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+
+	result, err := m.SetLabel()
+	if err != nil {
+		e.Error(500, err, "查询失败")
+		return
+	}
+
+	menuIds := make([]int, 0)
+	if req.RoleId != 0 {
+		menuIds, err = r.GetRoleMenuId(req.RoleId)
+		if err != nil {
+			e.Error(500, err, "")
+			return
+		}
+	}
+	e.OK(gin.H{
+		"menus":       result,
+		"checkedKeys": menuIds,
+	}, "获取成功")
+}
@@ -0,0 +1,118 @@
+package apis
+
+import (
+	"fmt"
+	"github.com/gin-gonic/gin"
+	"github.com/gin-gonic/gin/binding"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
+	"go-admin/app/admin/models"
+	"go-admin/app/admin/service"
+	"go-admin/app/admin/service/dto"
+)
+
+type SysOperaLog struct {
+	api.Api
+}
+
+// GetPage 操作日志列表
+// @Summary 操作日志列表
+// @Description 获取JSON
+// @Tags 操作日志
+// @Param title query string false "title"
+// @Param method query string false "method"
+// @Param requestMethod  query string false "requestMethod"
+// @Param operUrl query string false "operUrl"
+// @Param operIp query string false "operIp"
+// @Param status query string false "status"
+// @Param beginTime query string false "beginTime"
+// @Param endTime query string false "endTime"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/sys-opera-log [get]
+// @Security Bearer
+func (e SysOperaLog) GetPage(c *gin.Context) {
+	s := service.SysOperaLog{}
+	req := new(dto.SysOperaLogGetPageReq)
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(req, binding.Form).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+
+	list := make([]models.SysOperaLog, 0)
+	var count int64
+
+	err = s.GetPage(req, &list, &count)
+	if err != nil {
+		e.Error(500, err, "查询失败")
+		return
+	}
+
+	e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
+}
+
+// Get 操作日志通过id获取
+// @Summary 操作日志通过id获取
+// @Description 获取JSON
+// @Tags 操作日志
+// @Param id path string false "id"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/sys-opera-log/{id} [get]
+// @Security Bearer
+func (e SysOperaLog) Get(c *gin.Context) {
+	s := new(service.SysOperaLog)
+	req :=dto.SysOperaLogGetReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, nil).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	var object models.SysOperaLog
+	err = s.Get(&req, &object)
+	if err != nil {
+		e.Error(500, err, "查询失败")
+		return
+	}
+	e.OK(object, "查询成功")
+}
+
+// Delete 操作日志删除
+// DeleteSysMenu 操作日志删除
+// @Summary 删除操作日志
+// @Description 删除数据
+// @Tags 操作日志
+// @Param data body dto.SysOperaLogDeleteReq true "body"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/sys-opera-log [delete]
+// @Security Bearer
+func (e SysOperaLog) Delete(c *gin.Context) {
+	s := new(service.SysOperaLog)
+	req :=dto.SysOperaLogDeleteReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.JSON).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+
+	err = s.Remove(&req)
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500,err, fmt.Sprintf("删除失败！错误详情：%s", err.Error()))
+		return
+	}
+	e.OK(req.GetId(), "删除成功")
+}
@@ -0,0 +1,184 @@
+package apis
+
+import (
+	"fmt"
+	
+	"github.com/gin-gonic/gin"
+	"github.com/gin-gonic/gin/binding"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
+	"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/service"
+	"go-admin/app/admin/service/dto"
+)
+
+type SysPost struct {
+	api.Api
+}
+
+// GetPage
+// @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} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/post [get]
+// @Security Bearer
+func (e SysPost) GetPage(c *gin.Context) {
+	s := service.SysPost{}
+	req :=dto.SysPostPageReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.Form).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+
+	list := make([]models.SysPost, 0)
+	var count int64
+
+	err = s.GetPage(&req, &list, &count)
+	if err != nil {
+		e.Error(500, err, "查询失败")
+		return
+	}
+
+	e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
+}
+
+// Get
+// @Summary 获取岗位信息
+// @Description 获取JSON
+// @Tags 岗位
+// @Param id path int true "编码"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/post/{postId} [get]
+// @Security Bearer
+func (e SysPost) Get(c *gin.Context) {
+	s := service.SysPost{}
+	req :=dto.SysPostGetReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, nil).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	var object models.SysPost
+
+	err = s.Get(&req, &object)
+	if err != nil {
+		e.Error(500, err, fmt.Sprintf("岗位信息获取失败！错误详情：%s", err.Error()))
+		return
+	}
+
+	e.OK(object, "查询成功")
+}
+
+// Insert
+// @Summary 添加岗位
+// @Description 获取JSON
+// @Tags 岗位
+// @Accept  application/json
+// @Product application/json
+// @Param data body dto.SysPostInsertReq true "data"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/post [post]
+// @Security Bearer
+func (e SysPost) Insert(c *gin.Context) {
+	s := service.SysPost{}
+	req :=dto.SysPostInsertReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.JSON).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	req.SetCreateBy(user.GetUserId(c))
+	err = s.Insert(&req)
+	if err != nil {
+		e.Error(500, err, fmt.Sprintf("新建岗位失败！错误详情：%s", err.Error()))
+		return
+	}
+	e.OK(req.GetId(), "创建成功")
+}
+
+// Update
+// @Summary 修改岗位
+// @Description 获取JSON
+// @Tags 岗位
+// @Accept  application/json
+// @Product application/json
+// @Param data body dto.SysPostUpdateReq true "body"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/post/{id} [put]
+// @Security Bearer
+func (e SysPost) Update(c *gin.Context) {
+	s := service.SysPost{}
+	req :=dto.SysPostUpdateReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.JSON, nil).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+
+	req.SetUpdateBy(user.GetUserId(c))
+
+	err = s.Update(&req)
+	if err != nil {
+		e.Error(500, err, fmt.Sprintf("岗位更新失败！错误详情：%s", err.Error()))
+		return
+	}
+	e.OK(req.GetId(), "更新成功")
+}
+
+// Delete
+// @Summary 删除岗位
+// @Description 删除数据
+// @Tags 岗位
+// @Param id body dto.SysPostDeleteReq true "请求参数"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/post [delete]
+// @Security Bearer
+func (e SysPost) Delete(c *gin.Context) {
+	s := service.SysPost{}
+	req :=dto.SysPostDeleteReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.JSON).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	req.SetUpdateBy(user.GetUserId(c))
+	err = s.Remove(&req)
+	if err != nil {
+		e.Error(500, err, fmt.Sprintf("岗位删除失败！错误详情：%s", err.Error()))
+		return
+	}
+	e.OK(req.GetId(), "删除成功")
+}
@@ -0,0 +1,282 @@
+package apis
+
+import (
+	"fmt"
+	"github.com/gin-gonic/gin/binding"
+	"github.com/go-admin-team/go-admin-core/sdk"
+	"go-admin/app/admin/models"
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
+	"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/service"
+	"go-admin/app/admin/service/dto"
+	"go-admin/common/global"
+)
+
+type SysRole struct {
+	api.Api
+}
+
+// GetPage
+// @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} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/role [get]
+// @Security Bearer
+func (e SysRole) GetPage(c *gin.Context) {
+	s := service.SysRole{}
+	req := dto.SysRoleGetPageReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.Form).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+
+	list := make([]models.SysRole, 0)
+	var count int64
+
+	err = s.GetPage(&req, &list, &count)
+	if err != nil {
+		e.Error(500, err, "查询失败")
+		return
+	}
+
+	e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
+}
+
+// Get
+// @Summary 获取Role数据
+// @Description 获取JSON
+// @Tags 角色/Role
+// @Param roleId path string false "roleId"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/role/{id} [get]
+// @Security Bearer
+func (e SysRole) Get(c *gin.Context) {
+	s := service.SysRole{}
+	req := dto.SysRoleGetReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, nil).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, fmt.Sprintf(" %s ", err.Error()))
+		return
+	}
+
+	var object models.SysRole
+
+	err = s.Get(&req, &object)
+	if err != nil {
+		e.Error(http.StatusUnprocessableEntity, err, "查询失败")
+		return
+	}
+
+	e.OK(object, "查询成功")
+}
+
+// Insert
+// @Summary 创建角色
+// @Description 获取JSON
+// @Tags 角色/Role
+// @Accept  application/json
+// @Product application/json
+// @Param data body dto.SysRoleInsertReq true "data"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/role [post]
+// @Security Bearer
+func (e SysRole) Insert(c *gin.Context) {
+	s := service.SysRole{}
+	req := dto.SysRoleInsertReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.JSON).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+
+	// 设置创建人
+	req.CreateBy = user.GetUserId(c)
+	if req.Status == "" {
+		req.Status = "2"
+	}
+	cb := sdk.Runtime.GetCasbinKey(c.Request.Host)
+	err = s.Insert(&req, cb)
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, "创建失败")
+		return
+	}
+	_, err = global.LoadPolicy(c)
+	if err != nil {
+		e.Error(500, err, "")
+		return
+	}
+	e.OK(req.GetId(), "创建成功")
+}
+
+// Update 修改用户角色
+// @Summary 修改用户角色
+// @Description 获取JSON
+// @Tags 角色/Role
+// @Accept  application/json
+// @Product application/json
+// @Param data body dto.SysRoleUpdateReq true "body"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/role/{id} [put]
+// @Security Bearer
+func (e SysRole) Update(c *gin.Context) {
+	s := service.SysRole{}
+	req := dto.SysRoleUpdateReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, nil, binding.JSON).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	cb := sdk.Runtime.GetCasbinKey(c.Request.Host)
+
+	req.SetUpdateBy(user.GetUserId(c))
+
+	err = s.Update(&req, cb)
+	if err != nil {
+		e.Logger.Error(err)
+		return
+	}
+	_, err = global.LoadPolicy(c)
+	if err != nil {
+		e.Error(500, err, "")
+		return
+	}
+	e.OK(req.GetId(), "更新成功")
+}
+
+// Delete
+// @Summary 删除用户角色
+// @Description 删除数据
+// @Tags 角色/Role
+// @Param data body dto.SysRoleDeleteReq true "body"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/role [delete]
+// @Security Bearer
+func (e SysRole) Delete(c *gin.Context) {
+	s := new(service.SysRole)
+	req := dto.SysRoleDeleteReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.JSON).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, fmt.Sprintf("删除角色 %v 失败，\r\n失败信息 %s", req.Ids, err.Error()))
+		return
+	}
+
+	err = s.Remove(&req)
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, "")
+		return
+	}
+	_, err = global.LoadPolicy(c)
+	if err != nil {
+		e.Error(500, err, fmt.Sprintf("删除角色 %v 失败，失败信息 %s", req.GetId(), err.Error()))
+		return
+	}
+	e.OK(req.GetId(), fmt.Sprintf("删除角色角色 %v 状态成功！", req.GetId()))
+}
+
+// Update2Status 修改用户角色状态
+// @Summary 修改用户角色
+// @Description 获取JSON
+// @Tags 角色/Role
+// @Accept  application/json
+// @Product application/json
+// @Param data body dto.UpdateStatusReq true "body"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/role-status/{id} [put]
+// @Security Bearer
+func (e SysRole) Update2Status(c *gin.Context) {
+	s := service.SysRole{}
+	req := dto.UpdateStatusReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.JSON, nil).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, fmt.Sprintf("更新角色状态失败，失败原因：%s ", err.Error()))
+		return
+	}
+	req.SetUpdateBy(user.GetUserId(c))
+	err = s.UpdateStatus(&req)
+	if err != nil {
+		e.Error(500, err, fmt.Sprintf("更新角色状态失败，失败原因：%s ", err.Error()))
+		return
+	}
+	e.OK(req.GetId(), fmt.Sprintf("更新角色 %v 状态成功！", req.GetId()))
+}
+
+// Update2DataScope 更新角色数据权限
+// @Summary 更新角色数据权限
+// @Description 获取JSON
+// @Tags 角色/Role
+// @Accept  application/json
+// @Product application/json
+// @Param data body dto.RoleDataScopeReq true "body"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/role-status/{id} [put]
+// @Security Bearer
+func (e SysRole) Update2DataScope(c *gin.Context) {
+	s := service.SysRole{}
+	req := dto.RoleDataScopeReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.JSON, nil).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	data := &models.SysRole{
+		RoleId:    req.RoleId,
+		DataScope: req.DataScope,
+		DeptIds:   req.DeptIds,
+	}
+	data.UpdateBy = user.GetUserId(c)
+	err = s.UpdateDataScope(&req).Error
+	if err != nil {
+		e.Error(500, err, fmt.Sprintf("更新角色数据权限失败！错误详情：%s", err.Error()))
+		return
+	}
+	e.OK(nil, "操作成功")
+}
@@ -0,0 +1,453 @@
+package apis
+
+import (
+	"github.com/gin-gonic/gin/binding"
+	"go-admin/app/admin/models"
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
+	"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/google/uuid"
+
+	"go-admin/app/admin/service"
+	"go-admin/app/admin/service/dto"
+	"go-admin/common/actions"
+)
+
+type SysUser struct {
+	api.Api
+}
+
+// GetPage
+// @Summary 列表用户信息数据
+// @Description 获取JSON
+// @Tags 用户
+// @Param username query string false "username"
+// @Success 200 {string} {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/sys-user [get]
+// @Security Bearer
+func (e SysUser) GetPage(c *gin.Context) {
+	s := service.SysUser{}
+	req :=dto.SysUserGetPageReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+
+	//数据权限检查
+	p := actions.GetPermissionFromContext(c)
+
+	list := make([]models.SysUser, 0)
+	var count int64
+
+	err = s.GetPage(&req, p, &list, &count)
+	if err != nil {
+		e.Error(500, err, "查询失败")
+		return
+	}
+
+	e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
+}
+
+// Get
+// @Summary 获取用户
+// @Description 获取JSON
+// @Tags 用户
+// @Param userId path int true "用户编码"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/sys-user/{userId} [get]
+// @Security Bearer
+func (e SysUser) Get(c *gin.Context) {
+	s := service.SysUser{}
+	req :=dto.SysUserById{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, nil).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	var object models.SysUser
+	//数据权限检查
+	p := actions.GetPermissionFromContext(c)
+	err = s.Get(&req, p, &object)
+	if err != nil {
+		e.Error(http.StatusUnprocessableEntity, err, "查询失败")
+		return
+	}
+	e.OK(object, "查询成功")
+}
+
+// Insert
+// @Summary 创建用户
+// @Description 获取JSON
+// @Tags 用户
+// @Accept  application/json
+// @Product application/json
+// @Param data body dto.SysUserInsertReq true "用户数据"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/sys-user [post]
+// @Security Bearer
+func (e SysUser) Insert(c *gin.Context) {
+	s := service.SysUser{}
+	req :=dto.SysUserInsertReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.JSON).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+	// 设置创建人
+	req.SetCreateBy(user.GetUserId(c))
+	err = s.Insert(&req)
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+
+	e.OK(req.GetId(), "创建成功")
+}
+
+// Update
+// @Summary 修改用户数据
+// @Description 获取JSON
+// @Tags 用户
+// @Accept  application/json
+// @Product application/json
+// @Param data body dto.SysUserUpdateReq true "body"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/sys-user/{userId} [put]
+// @Security Bearer
+func (e SysUser) Update(c *gin.Context) {
+	s := service.SysUser{}
+	req :=dto.SysUserUpdateReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+
+	req.SetUpdateBy(user.GetUserId(c))
+
+	//数据权限检查
+	p := actions.GetPermissionFromContext(c)
+
+	err = s.Update(&req, p)
+	if err != nil {
+		e.Logger.Error(err)
+		return
+	}
+	e.OK(req.GetId(), "更新成功")
+}
+
+// Delete
+// @Summary 删除用户数据
+// @Description 删除数据
+// @Tags 用户
+// @Param userId path int true "userId"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/sys-user/{userId} [delete]
+// @Security Bearer
+func (e SysUser) Delete(c *gin.Context) {
+	s := service.SysUser{}
+	req :=dto.SysUserById{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.JSON).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+
+	// 设置编辑人
+	req.SetUpdateBy(user.GetUserId(c))
+
+	// 数据权限检查
+	p := actions.GetPermissionFromContext(c)
+
+	err = s.Remove(&req, p)
+	if err != nil {
+		e.Logger.Error(err)
+		return
+	}
+	e.OK(req.GetId(), "删除成功")
+}
+
+// InsetAvatar
+// @Summary 修改头像
+// @Description 获取JSON
+// @Tags 个人中心
+// @Accept multipart/form-data
+// @Param file formData file true "file"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/user/avatar [post]
+// @Security Bearer
+func (e SysUser) InsetAvatar(c *gin.Context) {
+	s := service.SysUser{}
+	req :=dto.UpdateSysUserAvatarReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		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 {
+		e.Logger.Debugf("upload avatar file: %s", file.Filename)
+		// 上传文件至指定目录
+		err = c.SaveUploadedFile(file, filPath)
+		if err != nil {
+			e.Logger.Errorf("save file error, %s", err.Error())
+			e.Error(500, err, "")
+			return
+		}
+	}
+	req.UserId = p.UserId
+	req.Avatar = "/" + filPath
+
+	err = s.UpdateAvatar(&req, p)
+	if err != nil {
+		e.Logger.Error(err)
+		return
+	}
+	e.OK(filPath, "修改成功")
+}
+
+// UpdateStatus 修改用户状态
+// @Summary 修改用户状态
+// @Description 获取JSON
+// @Tags 用户
+// @Accept  application/json
+// @Product application/json
+// @Param data body dto.UpdateSysUserStatusReq true "body"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/user/status [put]
+// @Security Bearer
+func (e SysUser) UpdateStatus(c *gin.Context) {
+	s := service.SysUser{}
+	req :=dto.UpdateSysUserStatusReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.JSON, nil).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+
+	req.SetUpdateBy(user.GetUserId(c))
+
+	//数据权限检查
+	p := actions.GetPermissionFromContext(c)
+
+	err = s.UpdateStatus(&req, p)
+	if err != nil {
+		e.Logger.Error(err)
+		return
+	}
+	e.OK(req.GetId(), "更新成功")
+}
+
+// ResetPwd 重置用户密码
+// @Summary 重置用户密码
+// @Description 获取JSON
+// @Tags 用户
+// @Accept  application/json
+// @Product application/json
+// @Param data body dto.ResetSysUserPwdReq true "body"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/user/pwd/reset [put]
+// @Security Bearer
+func (e SysUser) ResetPwd(c *gin.Context) {
+	s := service.SysUser{}
+	req :=dto.ResetSysUserPwdReq{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.JSON).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+
+	req.SetUpdateBy(user.GetUserId(c))
+
+	//数据权限检查
+	p := actions.GetPermissionFromContext(c)
+
+	err = s.ResetPwd(&req, p)
+	if err != nil {
+		e.Logger.Error(err)
+		return
+	}
+	e.OK(req.GetId(), "更新成功")
+}
+
+// UpdatePwd
+// @Summary 重置密码
+// @Description 获取JSON
+// @Tags 用户
+// @Accept  application/json
+// @Product application/json
+// @Param data body dto.PassWord true "body"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/user/pwd/set [put]
+// @Security Bearer
+func (e SysUser) UpdatePwd(c *gin.Context) {
+	s := service.SysUser{}
+	req :=dto.PassWord{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+
+	// 数据权限检查
+	p := actions.GetPermissionFromContext(c)
+
+	err = s.UpdatePwd(user.GetUserId(c), req.OldPassword, req.NewPassword, p)
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(http.StatusForbidden, err, "密码修改失败")
+		return
+	}
+	e.OK(nil, "密码修改成功")
+}
+
+// GetProfile
+// @Summary 获取个人中心用户
+// @Description 获取JSON
+// @Tags 个人中心
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/user/profile [get]
+// @Security Bearer
+func (e SysUser) GetProfile(c *gin.Context) {
+	s := service.SysUser{}
+	req :=dto.SysUserById{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+
+	req.Id = user.GetUserId(c)
+
+	sysUser := models.SysUser{}
+	roles := make([]models.SysRole, 0)
+	posts := make([]models.SysPost, 0)
+	err = s.GetProfile(&req, &sysUser, &roles, &posts)
+	if err != nil {
+		e.Logger.Errorf("get user profile error, %s", err.Error())
+		e.Error(500, err, "获取用户信息失败")
+		return
+	}
+	e.OK(gin.H{
+		"user":  sysUser,
+		"roles": roles,
+		"posts": posts,
+	}, "查询成功")
+}
+
+// GetInfo
+// @Summary 获取个人信息
+// @Description 获取JSON
+// @Tags 个人中心
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/getinfo [get]
+// @Security Bearer
+func (e SysUser) GetInfo(c *gin.Context) {
+	req :=dto.SysUserById{}
+	s := service.SysUser{}
+	r := service.SysRole{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		MakeService(&r.Service).
+		MakeService(&s.Service).
+		Errors
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		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] = "*:*:*"
+
+	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, _ := r.GetById(user.GetRoleId(c))
+		mp["permissions"] = list
+		mp["buttons"] = list
+	}
+	sysUser := models.SysUser{}
+	req.Id = user.GetUserId(c)
+	err = s.Get(&req, p, &sysUser)
+	if err != nil {
+		e.Error(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
+	mp["code"] = 200
+	e.OK(mp, "")
+}
@@ -1,472 +0,0 @@
-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/go-admin-team/go-admin-core/sdk/pkg/response"
-	"github.com/google/uuid"
-
-	"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) {
-	e.Context = c
-	log := e.GetLogger()
-	d := new(dto.SysUserSearch)
-	db, err := e.GetOrm()
-	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(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(http.StatusInternalServerError, err, "查询失败")
-		return
-	}
-
-	e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
-}
-
-// @Summary 获取用户
-// @Description 获取JSON
-// @Tags 用户
-// @Param userId path int true "用户编码"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/sysUser/{userId} [get]
-// @Security Bearer
-func (e SysUser) GetSysUser(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	control := new(dto.SysUserById)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//查看详情
-	req := control.Generate()
-	err = req.Bind(c)
-	if err != nil {
-		e.Error(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(http.StatusUnprocessableEntity, err, "查询失败")
-		return
-	}
-
-	e.OK(object, "查看成功")
-}
-
-// @Summary 创建用户
-// @Description 获取JSON
-// @Tags 用户
-// @Accept  application/json
-// @Product application/json
-// @Param data body dto.SysUserControl 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) {
-	e.Context = c
-	log := e.GetLogger()
-	control := new(dto.SysUserControl)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//新增操作
-	req := control.Generate()
-	err = req.Bind(c)
-	if err != nil {
-		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
-		return
-	}
-	var object common.ActiveRecord
-	object, err = req.GenerateM()
-	if err != nil {
-		e.Error(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(http.StatusInternalServerError, err, "创建失败")
-		return
-	}
-
-	e.OK(object.GetId(), "创建成功")
-}
-
-// @Summary 修改用户数据
-// @Description 获取JSON
-// @Tags 用户
-// @Accept  application/json
-// @Product application/json
-// @Param data body dto.SysUserControl 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)
-
-	e.Context = c
-	log := e.GetLogger()
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	req := control.Generate()
-	//更新操作
-	err = req.Bind(c)
-	if err != nil {
-		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
-		return
-	}
-	var object common.ActiveRecord
-	object, err = req.GenerateM()
-	if err != nil {
-		e.Error(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(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) {
-	e.Context = c
-	log := e.GetLogger()
-	control := new(dto.SysUserById)
-
-	db, err := e.GetOrm()
-	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(http.StatusUnprocessableEntity, err, "参数验证失败")
-		return
-	}
-	var object common.ActiveRecord
-	object, err = req.GenerateM()
-	if err != nil {
-		e.Error(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(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) {
-	e.Context = c
-	log := e.GetLogger()
-	db, err := e.GetOrm()
-	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(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(filPath, "修改成功")
-}
-
-// @Summary 重置密码
-// @Description 获取JSON
-// @Tags 用户
-// @Accept  application/json
-// @Product application/json
-// @Param data body dto.PassWord true "body"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/user/pwd [post]
-// @Security Bearer
-func (e SysUser) SysUserUpdatePwd(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	db, err := e.GetOrm()
-	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(http.StatusUnprocessableEntity, err, "参数验证失败")
-		return
-	}
-
-	// 数据权限检查
-	p := actions.GetPermissionFromContext(c)
-
-	serviceSysUser := service.SysUser{}
-	serviceSysUser.Orm = db
-	serviceSysUser.Log = log
-	err = serviceSysUser.UpdateSysUserPwd(user.GetUserId(c), pwd.OldPassword, pwd.NewPassword, p)
-	if err != nil {
-		log.Error(err)
-		e.Error(http.StatusForbidden, err, "密码修改失败")
-		return
-	}
-	e.OK(nil, "密码修改成功")
-}
-
-// @Summary 获取个人中心用户
-// @Description 获取JSON
-// @Tags 个人中心
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/user/profile [get]
-// @Security Bearer
-func (e SysUser) GetSysUserProfile(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	db, err := e.GetOrm()
-	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(http.StatusInternalServerError, err, "获取用户信息失败")
-		return
-	}
-	e.OK(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) {
-	e.Context = c
-	log := e.GetLogger()
-
-	db, err := e.GetOrm()
-	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 := system.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(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(mp, "")
-}
@@ -1,28 +0,0 @@
-package system
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/go-admin-team/go-admin-core/sdk/pkg/captcha"
-	"go-admin/common/apis"
-)
-
-type System struct {
-	apis.Api
-}
-
-func (e System) GenerateCaptchaHandler(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	id, b64s, err := captcha.DriverDigitFunc()
-	if err != nil {
-		log.Errorf("DriverDigitFunc error, %s", err.Error())
-		e.Error(500, err, "验证码获取失败")
-		return
-	}
-	e.Custom(gin.H{
-		"code": 200,
-		"data": b64s,
-		"id":   id,
-		"msg":  "success",
-	})
-}
@@ -1,269 +0,0 @@
-package dict
-
-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"
-	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} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/dict/data [get]
-// @Security Bearer
-func (e SysDictData) GetSysDictDataList(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	db, err := e.GetOrm()
-	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(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(http.StatusInternalServerError, err, "查询失败")
-		return
-	}
-
-	e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
-}
-
-// @Summary 通过编码获取字典数据
-// @Description 获取JSON
-// @Tags 字典数据
-// @Param dictCode path int true "字典编码"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/dict/data/{dictCode} [get]
-// @Security Bearer
-func (e SysDictData) GetSysDictData(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	db, err := e.GetOrm()
-	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(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(http.StatusInternalServerError, err, "查询失败")
-		return
-	}
-
-	e.OK(object, "查看成功")
-}
-
-// @Summary 添加字典数据
-// @Description 获取JSON
-// @Tags 字典数据
-// @Accept  application/json
-// @Product application/json
-// @Param data body dto.SysDictDataControl 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) {
-	e.Context = c
-	log := e.GetLogger()
-	db, err := e.GetOrm()
-	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(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(http.StatusInternalServerError, err, "创建失败")
-		return
-	}
-
-	e.OK(object.GetId(), "创建成功")
-}
-
-// @Summary 修改字典数据
-// @Description 获取JSON
-// @Tags 字典数据
-// @Accept  application/json
-// @Product application/json
-// @Param data body dto.SysDictDataControl 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) {
-	e.Context = c
-	log := e.GetLogger()
-	db, err := e.GetOrm()
-	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(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(http.StatusInternalServerError, err, "更新失败")
-		return
-	}
-	e.OK(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) {
-	e.Context = c
-	log := e.GetLogger()
-	db, err := e.GetOrm()
-	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(http.StatusUnprocessableEntity, err, "参数验证失败")
-		return
-	}
-	var object common.ActiveRecord
-	object, err = req.GenerateM()
-	if err != nil {
-		log.Errorf("GenerateM error, %s", err.Error())
-		e.Error(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(http.StatusInternalServerError, err, "删除失败")
-		return
-	}
-	e.OK(object.GetId(), "删除成功")
-}
-
-func (e SysDictData) GetSysDictDataAll(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	db, err := e.GetOrm()
-	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(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(http.StatusInternalServerError, err, "查询失败")
-		return
-	}
-
-	e.OK(list, "查询成功")
-}
@@ -1,267 +0,0 @@
-package dict
-
-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"
-	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} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/dict/type [get]
-// @Security Bearer
-func (e SysDictType) GetSysDictTypeList(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	req := &dto.SysDictTypeSearch{}
-
-	//查询列表
-	err = req.Bind(c)
-	if err != nil {
-		e.Error(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(http.StatusInternalServerError, err, "查询失败")
-		return
-	}
-
-	e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
-}
-
-// @Summary 通过字典id获取字典类型
-// @Description 获取JSON
-// @Tags 字典类型
-// @Param dictId path int true "字典类型编码"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/dict/type/{dictId} [get]
-// @Security Bearer
-func (e SysDictType) GetSysDictType(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//查看详情
-	req := &dto.SysDictTypeById{}
-	err = req.Bind(c)
-	if err != nil {
-		e.Error(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(http.StatusUnprocessableEntity, err, "查询失败")
-		return
-	}
-
-	e.OK(object, "查看成功")
-}
-
-// @Summary 添加字典类型
-// @Description 获取JSON
-// @Tags 字典类型
-// @Accept  application/json
-// @Product application/json
-// @Param data body dto.SysDictTypeControl 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) {
-	e.Context = c
-	log := e.GetLogger()
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//新增操作
-	req := &dto.SysDictTypeControl{}
-	err = req.Bind(c)
-	if err != nil {
-		e.Error(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(http.StatusInternalServerError, err, "创建失败")
-		return
-	}
-
-	e.OK(object.GetId(), "创建成功")
-}
-
-// @Summary 修改字典类型
-// @Description 获取JSON
-// @Tags 字典类型
-// @Accept  application/json
-// @Product application/json
-// @Param data body dto.SysDictTypeControl 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) {
-	e.Context = c
-	log := e.GetLogger()
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	req := &dto.SysDictTypeControl{}
-	//更新操作
-	err = req.Bind(c)
-	if err != nil {
-		e.Error(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(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) {
-	e.Context = c
-	log := e.GetLogger()
-	db, err := e.GetOrm()
-	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(http.StatusUnprocessableEntity, err, "参数验证失败")
-		return
-	}
-	var object common.ActiveRecord
-	object, err = req.GenerateM()
-	if err != nil {
-		e.Error(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(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} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/dict/type-option-select [get]
-// @Security Bearer
-func (e SysDictType) GetSysDictTypeAll(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	req := &dto.SysDictTypeSearch{}
-
-	//查询列表
-	err = req.Bind(c)
-	if err != nil {
-		e.Error(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(http.StatusUnprocessableEntity, err, "查询失败")
-		return
-	}
-
-	e.OK(list, "查询成功")
-}
@@ -1,98 +0,0 @@
-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) {
-	e.Context = c
-	log := e.GetLogger()
-	db, err := e.GetOrm()
-	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(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(model, "查询成功")
-}
-
-// @Summary 更新或提交系统信息
-// @Description 获取JSON
-// @Tags 系统信息
-// @Param data body dto.SysSettingControl 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)
-	e.Context = c
-	log := e.GetLogger()
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//更新操作
-	err = control.Bind(c)
-	if err != nil {
-		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
-		return
-	}
-	object, err := control.Generate()
-	if err != nil {
-		e.Error(http.StatusInternalServerError, err, "模型生成失败")
-		return
-	}
-
-	sysSettingService := service.SysSetting{}
-	sysSettingService.Log = log
-	sysSettingService.Orm = db
-	err = sysSettingService.UpdateSysSetting(object)
-	if err != nil {
-		e.Error(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(object, "提交成功")
-}
@@ -1,277 +0,0 @@
-package sys_config
-
-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 SysConfig struct {
-	apis.Api
-}
-
-func (e SysConfig) GetSysConfigList(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	d := new(dto.SysConfigSearch)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//查询列表
-	err = d.Bind(c)
-	if err != nil {
-		log.Errorf("参数验证失败, error:%s", err)
-		e.Error(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)
-		e.Error(500, err, "查询失败")
-		return
-	}
-	e.PageOK(list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功")
-}
-
-// GetSysConfigBySysApp 获取系统配置信息，主要注意这里不在验证数据权限
-func (e SysConfig) GetSysConfigBySysApp(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	d := new(dto.SysConfigSearch)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-	err = d.Bind(c)
-	if err != nil {
-		log.Errorf("参数验证失败, error:%s", err)
-		e.Error(500, err, "参数验证失败")
-		return
-	}
-
-	// 控制只读前台的数据
-	d.IsFrontend = 1
-
-	list := make([]system.SysConfig, 0)
-	s := service.SysConfig{}
-	s.Log = log
-	s.Orm = db
-	err = s.GetSysConfigByKey(d, &list)
-	if err != nil {
-		log.Errorf("GetSysConfigPage 查询失败, error:%s", err)
-		e.Error(500, err, "查询失败")
-		return
-	}
-	mp := make(map[string]string)
-	for i := 0; i < len(list); i++ {
-		key := list[i].ConfigKey
-		if key != "" {
-			mp[key] = list[i].ConfigValue
-		}
-	}
-	e.OK(mp, "查询成功")
-}
-
-func (e SysConfig) GetSysConfig(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	control := new(dto.SysConfigById)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-	//查看详情
-	err = control.Bind(c)
-	if err != nil {
-		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
-		log.Errorf("Orm获取失败, error:%s", err)
-		e.Error(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(http.StatusUnprocessableEntity, err, "查询失败")
-		log.Errorf("Orm获取失败, error:%s", err)
-		e.Error(500, err, "Orm获取失败")
-		return
-	}
-
-	e.OK(object, "查看成功")
-}
-
-func (e SysConfig) InsertSysConfig(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	control := new(dto.SysConfigControl)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//新增操作
-	err = control.Bind(c)
-	if err != nil {
-		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
-		log.Errorf("Orm获取失败, error:%s", err)
-		e.Error(500, err, "Orm获取失败")
-		return
-	}
-	object, err := control.Generate()
-	if err != nil {
-		e.Error(http.StatusInternalServerError, err, "模型生成失败")
-		log.Errorf("Orm获取失败, error:%s", err)
-		e.Error(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(http.StatusInternalServerError, err, "创建失败")
-		log.Errorf("Orm获取失败, error:%s", err)
-		e.Error(500, err, "Orm获取失败")
-		return
-	}
-
-	e.OK(object.GetId(), "创建成功")
-}
-
-func (e SysConfig) UpdateSysConfig(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	control := new(dto.SysConfigControl)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//更新操作
-	err = control.Bind(c)
-
-	if err != nil {
-		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
-		log.Errorf("Orm获取失败, error:%s", err)
-		e.Error(500, err, "Orm获取失败")
-		return
-	}
-	object, err := control.Generate()
-	if err != nil {
-		e.Error(http.StatusInternalServerError, err, "模型生成失败")
-		log.Errorf("Orm获取失败, error:%s", err)
-		e.Error(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(http.StatusUnprocessableEntity, err, "更新失败")
-		log.Errorf("Orm获取失败, error:%s", err)
-		e.Error(500, err, "Orm获取失败")
-		return
-	}
-	e.OK(object.GetId(), "更新成功")
-}
-
-func (e SysConfig) DeleteSysConfig(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	control := new(dto.SysConfigById)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//删除操作
-	err = control.Bind(c)
-	if err != nil {
-		log.Errorf("Bind error: %s", err)
-		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
-		log.Errorf("Orm获取失败, error:%s", err)
-		e.Error(500, err, "Orm获取失败")
-		return
-	}
-	object, err := control.GenerateM()
-	if err != nil {
-		e.Error(http.StatusInternalServerError, err, "模型生成失败")
-		log.Errorf("Orm获取失败, error:%s", err)
-		e.Error(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(http.StatusUnprocessableEntity, err, "删除失败")
-		log.Errorf("Orm获取失败, error:%s", err)
-		e.Error(500, err, "Orm获取失败")
-		return
-	}
-	e.OK(object.GetId(), "删除成功")
-}
-
-// GetSysConfigByKEYForService 根据Key获取SysConfig的Service
-func (e SysConfig) GetSysConfigByKEYForService(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-	var v dto.SysConfigControl
-	err = v.Bind(c)
-	if err != nil {
-		log.Errorf("参数验证错误, error:%s", err)
-		e.Error(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)
-		e.Error(500, err, "")
-		return
-	}
-	e.OK(v, s.Msg)
-}
@@ -1,294 +0,0 @@
-package sys_dept
-
-import (
-	"github.com/go-admin-team/go-admin-core/sdk/pkg"
-	"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 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} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/dept [get]
-// @Security Bearer
-func (e SysDept) GetSysDeptList(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	d := new(dto.SysDeptSearch)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//查询列表
-	err = d.Bind(c)
-	if err != nil {
-		e.Error(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(http.StatusUnprocessableEntity, err, "查询失败")
-		return
-	}
-
-	e.OK(list, "查询成功")
-}
-
-// @Summary 部门列表数据
-// @Description 获取JSON
-// @Tags 部门
-// @Param deptId path string false "deptId"
-// @Param position query string false "position"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/dept/{deptId} [get]
-// @Security Bearer
-func (e SysDept) GetSysDept(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	control := new(dto.SysDeptById)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//查看详情
-	err = control.Bind(c)
-	if err != nil {
-		e.Error(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(http.StatusUnprocessableEntity, err, "查询失败")
-		return
-	}
-
-	e.OK(object, "查看成功")
-}
-
-// @Summary 添加部门
-// @Description 获取JSON
-// @Tags 部门
-// @Accept  application/json
-// @Product application/json
-// @Param data body dto.SysDeptControl 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) {
-	e.Context = c
-	log := e.GetLogger()
-	control := new(dto.SysDeptControl)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//新增操作
-	err = control.Bind(c)
-	if err != nil {
-		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
-		return
-	}
-	object, err := control.Generate()
-	if err != nil {
-		e.Error(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(http.StatusInternalServerError, err, "创建失败")
-		return
-	}
-
-	e.OK(object.GetId(), "创建成功")
-}
-
-// @Summary 修改部门
-// @Description 获取JSON
-// @Tags 部门
-// @Accept  application/json
-// @Product application/json
-// @Param id path int true "id"
-// @Param data body dto.SysDeptControl 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) {
-	e.Context = c
-	log := e.GetLogger()
-	control := new(dto.SysDeptControl)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//更新操作
-	err = control.Bind(c)
-	if err != nil {
-		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
-		return
-	}
-	object, err := control.Generate()
-	if err != nil {
-		e.Error(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(object.GetId(), "更新成功")
-}
-
-// @Summary 删除部门
-// @Description 删除数据
-// @Tags 部门
-// @Param data body dto.SysDeptById 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) {
-	e.Context = c
-	log := e.GetLogger()
-	control := new(dto.SysDeptById)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//删除操作
-	err = control.Bind(c)
-	if err != nil {
-		log.Errorf("Bind error: %s", err)
-		e.Error(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(http.StatusInternalServerError, err, "删除失败")
-		return
-	}
-	e.OK(control.GetId(), "删除成功")
-}
-
-// GetDeptTree 用户管理 左侧部门树
-func (e SysDept) GetDeptTree(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	d := new(dto.SysDeptSearch)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//查询列表
-	err = d.Bind(c)
-	if err != nil {
-		e.Error(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(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(list, "")
-}
-
-func (e SysDept) GetDeptTreeRoleSelect(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	s := service.SysDept{}
-	s.Orm = db
-	s.Log = log
-	id, err := pkg.StringToInt(c.Param("roleId"))
-	result, err := s.SetDeptLabel()
-	if err != nil {
-		log.Errorf("SetDeptLabel error, %s", err.Error())
-		e.Error(http.StatusInternalServerError, err, "")
-	}
-	menuIds := make([]int, 0)
-	if id != 0 {
-		menuIds, err = s.GetRoleDeptId(id)
-		if err != nil {
-			log.Errorf("抱歉未找到相关信息, %s", err.Error())
-			e.Error(http.StatusInternalServerError, err, "")
-		}
-	}
-	e.OK(gin.H{
-		"depts":       result,
-		"checkedKeys": menuIds,
-	}, "")
-}
@@ -1,188 +0,0 @@
-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) {
-	e.Context = c
-	log := e.GetLogger()
-	d := new(dto.SysLoginLogSearch)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//查询列表
-	err = d.Bind(c)
-	if err != nil {
-		e.Error(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(http.StatusUnprocessableEntity, err, "查询失败")
-		return
-	}
-
-	e.PageOK(list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功")
-}
-
-func (e SysLoginLog) GetSysLoginLog(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	control := new(dto.SysLoginLogById)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//查看详情
-	err = control.Bind(c)
-	if err != nil {
-		e.Error(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(http.StatusUnprocessableEntity, err, "查询失败")
-		return
-	}
-
-	e.OK(object, "查看成功")
-}
-
-func (e SysLoginLog) InsertSysLoginLog(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	control := new(dto.SysLoginLogControl)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//新增操作
-	err = control.Bind(c)
-	if err != nil {
-		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
-		return
-	}
-	object, err := control.Generate()
-	if err != nil {
-		e.Error(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(http.StatusInternalServerError, err, "创建失败")
-		return
-	}
-
-	e.OK(object.GetId(), "创建成功")
-}
-
-func (e SysLoginLog) UpdateSysLoginLog(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	control := new(dto.SysLoginLogControl)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//更新操作
-	err = control.Bind(c)
-	if err != nil {
-		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
-		return
-	}
-	object, err := control.Generate()
-	if err != nil {
-		e.Error(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(http.StatusInternalServerError, err, "更新失败")
-		return
-	}
-	e.OK(object.GetId(), "更新成功")
-}
-
-func (e SysLoginLog) DeleteSysLoginLog(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	control := new(dto.SysLoginLogById)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//删除操作
-	err = control.Bind(c)
-	if err != nil {
-		log.Errorf("Bind error: %s", err)
-		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
-		return
-	}
-	object, err := control.GenerateM()
-	if err != nil {
-		e.Error(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(http.StatusInternalServerError, err, "删除失败")
-		return
-	}
-	e.OK(object.GetId(), "删除成功")
-}
@@ -1,369 +0,0 @@
-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/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) {
-	e.Context = c
-	log := e.GetLogger()
-	d := new(dto.SysMenuSearch)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//查询列表
-	err = d.Bind(c)
-	if err != nil {
-		e.Error(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(http.StatusUnprocessableEntity, err, "查询失败")
-		return
-	}
-
-	e.OK(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)
-
-	e.Context = c
-	log := e.GetLogger()
-
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//查看详情
-	err = control.Bind(c)
-	if err != nil {
-		e.Error(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(http.StatusUnprocessableEntity, err, "查询失败")
-		return
-	}
-
-	e.OK(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)
-
-	e.Context = c
-	log := e.GetLogger()
-
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//新增操作
-	err = control.Bind(c)
-	if err != nil {
-		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
-		return
-	}
-	object, err := control.Generate()
-	if err != nil {
-		e.Error(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(http.StatusInternalServerError, err, "创建失败")
-		return
-	}
-
-	e.OK(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 dto.SysMenuControl 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)
-
-	e.Context = c
-	log := e.GetLogger()
-
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//更新操作
-	err = control.Bind(c)
-	if err != nil {
-		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
-		return
-	}
-	object, err := control.Generate()
-	if err != nil {
-		e.Error(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(object.GetId(), "更新成功")
-}
-
-// @Summary 删除菜单
-// @Description 删除数据
-// @Tags 菜单
-// @Param data body dto.SysMenuById 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)
-
-	e.Context = c
-	log := e.GetLogger()
-
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//删除操作
-	err = control.Bind(c)
-	if err != nil {
-		log.Errorf("Bind error: %s", err)
-		e.Error(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(http.StatusInternalServerError, err, "删除失败")
-		return
-	}
-	e.OK(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) {
-	e.Context = c
-	log := e.GetLogger()
-	db, err := e.GetOrm()
-	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(http.StatusInternalServerError, err, "查询失败")
-		return
-	}
-
-	e.OK(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) {
-	e.Context = c
-	log := e.GetLogger()
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-	var data system.RoleMenu
-	data.RoleName = c.GetString("role")
-	data.UpdateBy = user.GetUserId(c)
-	result, err := data.GetIDS(db)
-	if err != nil {
-		log.Errorf("GetIDS error, %s", err.Error())
-		e.Error(http.StatusInternalServerError, err, "获取失败")
-		return
-	}
-	e.OK(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) {
-	e.Context = c
-	log := e.GetLogger()
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	d := new(dto.SelectRole)
-
-	err = c.BindUri(d)
-	if err != nil {
-		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
-		return
-	}
-
-	serviceSysMenu := service.SysMenu{}
-	serviceSysMenu.Log = log
-	serviceSysMenu.Orm = db
-	result, err := serviceSysMenu.SetSysMenuLabel()
-	if err != nil {
-		e.Error(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(http.StatusInternalServerError, err, "")
-		return
-	}
-	e.OK(gin.H{
-		"menus":       result,
-		"checkedKeys": menuIds,
-	}, "获取成功")
-}
@@ -1,178 +0,0 @@
-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) {
-	e.Context = c
-	log := e.GetLogger()
-	d := new(dto.SysOperaLogSearch)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//查询列表
-	err = d.Bind(c)
-	if err != nil {
-		e.Error(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(http.StatusUnprocessableEntity, err, "查询失败")
-		return
-	}
-
-	e.PageOK(list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功")
-}
-
-func (e SysOperaLog) GetSysOperaLog(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	control := new(dto.SysOperaLogById)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//查看详情
-	err = control.Bind(c)
-	if err != nil {
-		e.Error(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(http.StatusUnprocessableEntity, err, "查询失败")
-		return
-	}
-
-	e.OK(object, "查看成功")
-}
-
-func (e SysOperaLog) InsertSysOperaLog(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	control := new(dto.SysOperaLogControl)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//新增操作
-	err = control.Bind(c)
-	if err != nil {
-		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
-		return
-	}
-	object, err := control.Generate()
-	if err != nil {
-		e.Error(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(http.StatusInternalServerError, err, "创建失败")
-		return
-	}
-
-	e.OK(object.GetId(), "创建成功")
-}
-
-func (e SysOperaLog) UpdateSysOperaLog(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	control := new(dto.SysOperaLogControl)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//更新操作
-	err = control.Bind(c)
-	if err != nil {
-		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
-		return
-	}
-	object, err := control.Generate()
-	if err != nil {
-		e.Error(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(object.GetId(), "更新成功")
-}
-
-func (e SysOperaLog) DeleteSysOperaLog(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	control := new(dto.SysOperaLogById)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//删除操作
-	err = control.Bind(c)
-	if err != nil {
-		log.Errorf("Bind error: %s", err)
-		e.Error(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(control.GetId(), "删除成功")
-}
@@ -1,223 +0,0 @@
-package sys_post
-
-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 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} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/post [get]
-// @Security Bearer
-func (e SysPost) GetSysPostList(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	d := new(dto.SysPostSearch)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//查询列表
-	err = d.Bind(c)
-	if err != nil {
-		e.Error(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(http.StatusUnprocessableEntity, err, "查询失败")
-		return
-	}
-
-	e.PageOK(list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功")
-}
-
-// @Summary 获取岗位信息
-// @Description 获取JSON
-// @Tags 岗位
-// @Param postId path int true "postId"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/post/{postId} [get]
-// @Security Bearer
-func (e SysPost) GetSysPost(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	control := new(dto.SysPostById)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//查看详情
-	err = control.Bind(c)
-	if err != nil {
-		e.Error(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(http.StatusUnprocessableEntity, err, "查询失败")
-		return
-	}
-
-	e.OK(object, "查看成功")
-}
-
-// @Summary 添加岗位
-// @Description 获取JSON
-// @Tags 岗位
-// @Accept  application/json
-// @Product application/json
-// @Param data body dto.SysPostControl 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) {
-	e.Context = c
-	log := e.GetLogger()
-	control := new(dto.SysPostControl)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//新增操作
-	err = control.Bind(c)
-	if err != nil {
-		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
-		return
-	}
-	object, err := control.Generate()
-	if err != nil {
-		e.Error(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(http.StatusInternalServerError, err, "创建失败")
-		return
-	}
-
-	e.OK(object.GetId(), "创建成功")
-}
-
-// @Summary 修改岗位
-// @Description 获取JSON
-// @Tags 岗位
-// @Accept  application/json
-// @Product application/json
-// @Param data body dto.SysPostControl 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) {
-	e.Context = c
-	log := e.GetLogger()
-	control := new(dto.SysPostControl)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//更新操作
-	err = control.Bind(c)
-	if err != nil {
-		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
-		return
-	}
-	object, err := control.Generate()
-	if err != nil {
-		e.Error(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(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) {
-	e.Context = c
-	log := e.GetLogger()
-	control := new(dto.SysPostById)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//删除操作
-	err = control.Bind(c)
-	if err != nil {
-		log.Errorf("Bind error: %s", err)
-		e.Error(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(control.GetId(), "删除成功")
-}
@@ -1,279 +0,0 @@
-package sys_role
-
-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"
-	"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} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/role [get]
-// @Security Bearer
-func (e SysRole) GetSysRoleList(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	d := new(dto.SysRoleSearch)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//查询列表
-	err = d.Bind(c)
-	if err != nil {
-		e.Error(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(http.StatusUnprocessableEntity, err, "查询失败")
-		return
-	}
-
-	e.PageOK(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) {
-	e.Context = c
-	log := e.GetLogger()
-	control := new(dto.SysRoleById)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//查看详情
-	err = control.Bind(c)
-	if err != nil {
-		e.Error(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(http.StatusUnprocessableEntity, err, "查询失败")
-		return
-	}
-
-	e.OK(object, "查看成功")
-}
-
-// @Summary 创建角色
-// @Description 获取JSON
-// @Tags 角色/Role
-// @Accept  application/json
-// @Product application/json
-// @Param data body dto.SysRoleControl 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) {
-	e.Context = c
-	log := e.GetLogger()
-	control := new(dto.SysRoleControl)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//新增操作
-	err = control.Bind(c)
-	if err != nil {
-		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
-		return
-	}
-	object, err := control.Generate()
-	if err != nil {
-		e.Error(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(http.StatusInternalServerError, err, "创建失败")
-		return
-	}
-	_, err = global.LoadPolicy(c)
-	if err != nil {
-		e.Error(http.StatusInternalServerError, err, "")
-		return
-	}
-	e.OK(object.GetId(), "创建成功")
-}
-
-// @Summary 修改用户角色
-// @Description 获取JSON
-// @Tags 角色/Role
-// @Accept  application/json
-// @Product application/json
-// @Param data body dto.SysRoleControl 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) {
-	e.Context = c
-	log := e.GetLogger()
-	control := new(dto.SysRoleControl)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//更新操作
-	err = control.Bind(c)
-	if err != nil {
-		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
-		return
-	}
-	object, err := control.Generate()
-	if err != nil {
-		e.Error(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(http.StatusInternalServerError, err, "")
-		return
-	}
-	e.OK(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) {
-	e.Context = c
-	log := e.GetLogger()
-	control := new(dto.SysRoleById)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//删除操作
-	err = control.Bind(c)
-	if err != nil {
-		log.Errorf("Bind error: %s", err)
-		e.Error(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(http.StatusInternalServerError, err, "")
-		return
-	}
-	_, err = global.LoadPolicy(c)
-	if err != nil {
-		e.Error(http.StatusInternalServerError, err, "")
-		return
-	}
-	e.OK(control.GetId(), "删除成功")
-}
-
-func (e SysRole) UpdateRoleDataScope(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	control := new(dto.RoleDataScopeReq)
-	db, err := e.GetOrm()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//更新操作
-	err = c.Bind(control)
-	if err != nil {
-		log.Errorf("request bind error, %s", err.Error())
-		e.Error(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(http.StatusInternalServerError, err, "")
-		return
-	}
-	e.OK(nil, "操作成功")
-}
@@ -1,582 +0,0 @@
-package tools
-
-import (
-	"bytes"
-	"net/http"
-	"strconv"
-	"text/template"
-	"time"
-
-	"github.com/gin-gonic/gin"
-	"github.com/go-admin-team/go-admin-core/sdk/api"
-	"github.com/go-admin-team/go-admin-core/sdk/config"
-	"github.com/go-admin-team/go-admin-core/sdk/pkg"
-
-	"go-admin/app/admin/models"
-	"go-admin/app/admin/models/tools"
-	"go-admin/common/apis"
-)
-
-type Gen struct {
-	apis.Api
-}
-
-func (e Gen) Preview(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	table := tools.SysTables{}
-	id, err := pkg.StringToInt(c.Param("tableId"))
-	if err != nil {
-		log.Error(err)
-		e.Error(500, err, "")
-		return
-	}
-	table.TableId = id
-	t1, err := template.ParseFiles("template/v4/model.go.template")
-	if err != nil {
-		log.Error(err)
-		e.Error(500, err, "")
-		return
-	}
-	t2, err := template.ParseFiles("template/v4/no_actions/apis.go.template")
-	if err != nil {
-		log.Error(err)
-		e.Error(500, err, "")
-		return
-	}
-	t3, err := template.ParseFiles("template/v4/js.go.template")
-	if err != nil {
-		log.Error(err)
-		e.Error(500, err, "")
-		return
-	}
-	t4, err := template.ParseFiles("template/v4/vue.go.template")
-	if err != nil {
-		log.Error(err)
-		e.Error(500, err, "")
-		return
-	}
-	t5, err := template.ParseFiles("template/v4/no_actions/router_check_role.go.template")
-	if err != nil {
-		log.Error(err)
-		e.Error(500, err, "")
-		return
-	}
-	t6, err := template.ParseFiles("template/v4/dto.go.template")
-	if err != nil {
-		log.Error(err)
-		e.Error(500, err, "")
-		return
-	}
-	t7, err := template.ParseFiles("template/v4/no_actions/service.go.template")
-	if err != nil {
-		log.Error(err)
-		e.Error(500, err, "")
-		return
-	}
-
-	db, err := pkg.GetOrm(c)
-	if err != nil {
-		log.Errorf("get db connection error, %s", err.Error())
-		e.Error(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()
-	e.OK(mp, "")
-}
-
-func (e Gen) GenCode(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	table := tools.SysTables{}
-	id, err := pkg.StringToInt(c.Param("tableId"))
-	if err != nil {
-		log.Error(err)
-		e.Error(500, err, "")
-		return
-	}
-
-	db, err := pkg.GetOrm(c)
-	if err != nil {
-		log.Errorf("get db connection error, %s", err.Error())
-		e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
-		return
-	}
-
-	table.TableId = id
-	tab, _ := table.Get(db)
-
-	if tab.IsActions == 1 {
-		e.ActionsGen(c, tab)
-	} else {
-		e.NOActionsGen(c, tab)
-	}
-
-	e.OK("", "Code generated successfully！")
-}
-
-func (e Gen) GenApiToFile(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	table := tools.SysTables{}
-	id, err := pkg.StringToInt(c.Param("tableId"))
-	if err != nil {
-		log.Error(err)
-		e.Error(500, err, "")
-		return
-	}
-
-	db, err := pkg.GetOrm(c)
-	if err != nil {
-		log.Errorf("get db connection error, %s", err.Error())
-		e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
-		return
-	}
-
-	table.TableId = id
-	tab, _ := table.Get(db)
-	e.genApiToFile(c, tab)
-
-	e.OK("", "Code generated successfully！")
-}
-
-func (e Gen) NOActionsGen(c *gin.Context, tab tools.SysTables) {
-	e.Context = c
-	log := e.GetLogger()
-
-	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")
-	if err != nil {
-		log.Error(err)
-		e.Error(500, err, "")
-		return
-	}
-	t2, err := template.ParseFiles(basePath + "no_actions/apis.go.template")
-	if err != nil {
-		log.Error(err)
-		e.Error(500, err, "")
-		return
-	}
-	t3, err := template.ParseFiles(routerFile)
-	if err != nil {
-		log.Error(err)
-		e.Error(500, err, "")
-		return
-	}
-	t4, err := template.ParseFiles(basePath + "js.go.template")
-	if err != nil {
-		log.Error(err)
-		e.Error(500, err, "")
-		return
-	}
-	t5, err := template.ParseFiles(basePath + "vue.go.template")
-	if err != nil {
-		log.Error(err)
-		e.Error(500, err, "")
-		return
-	}
-	t6, err := template.ParseFiles(basePath + "dto.go.template")
-	if err != nil {
-		log.Error(err)
-		e.Error(500, err, "")
-		return
-	}
-	t7, err := template.ParseFiles(basePath + "no_actions/service.go.template")
-	if err != nil {
-		log.Error(err)
-		e.Error(500, err, "")
-		return
-	}
-
-	_ = 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 (e Gen) genApiToFile(c *gin.Context, tab tools.SysTables) {
-	e.Context = c
-	log := e.GetLogger()
-
-	basePath := "template/"
-
-	t1, err := template.ParseFiles(basePath + "api_migrate.template")
-	if err != nil {
-		log.Error(err)
-		e.Error(500, err, "")
-		return
-	}
-	i := strconv.FormatInt(time.Now().UnixNano()/1e6, 10)
-	var b1 bytes.Buffer
-	err = t1.Execute(&b1, struct {
-		tools.SysTables
-		GenerateTime string
-	}{tab, i})
-
-	pkg.FileCreate(b1, "./cmd/migrate/migration/version-local/"+i+"_migrate.go")
-
-}
-
-func (e Gen) ActionsGen(c *gin.Context, tab tools.SysTables) {
-	e.Context = c
-	log := api.GetRequestLogger(c)
-	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")
-	if err != nil {
-		log.Error(err)
-		e.Error(500, err, "")
-		return
-	}
-	t3, err := template.ParseFiles(routerFile)
-	if err != nil {
-		log.Error(err)
-		e.Error(500, err, "")
-		return
-	}
-	t4, err := template.ParseFiles(basePath + "js.go.template")
-	if err != nil {
-		log.Error(err)
-		e.Error(500, err, "")
-		return
-	}
-	t5, err := template.ParseFiles(basePath + "vue.go.template")
-	if err != nil {
-		log.Error(err)
-		e.Error(500, err, "")
-		return
-	}
-	t6, err := template.ParseFiles(basePath + "dto.go.template")
-	if err != nil {
-		log.Error(err)
-		e.Error(500, err, "")
-		return
-	}
-
-	_ = 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 (e Gen) GenMenuAndApi(c *gin.Context) {
-	log := api.GetRequestLogger(c)
-	e.Context = 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())
-		e.Error(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)
-
-	e.OK("", "数据生成成功！")
-}
@@ -1,4 +1,4 @@
-package system
+package models

 import (
 	"errors"
@@ -49,33 +49,33 @@ func (e *DataPermission) GetDataScope(tableName string, db *gorm.DB) (*gorm.DB,
 	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
-	}
-}
+//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
+//	}
+//}
@@ -1,343 +0,0 @@
-package models
-
-import (
-	"errors"
-	"github.com/go-admin-team/go-admin-core/sdk/pkg"
-	"go-admin/common/models"
-
-	"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:"-"`
-	models.ModelTime
-}
-
-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
-//}
@@ -1,243 +0,0 @@
-package models
-
-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;"`
-	models.ModelTime
-	models.ControlBy
-
-	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
-//}
@@ -0,0 +1,91 @@
+package models
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"regexp"
+	"strings"
+
+	"github.com/bitly/go-simplejson"
+	"github.com/go-admin-team/go-admin-core/sdk"
+	"github.com/go-admin-team/go-admin-core/sdk/runtime"
+	"github.com/go-admin-team/go-admin-core/storage"
+
+	"go-admin/common/models"
+)
+
+type SysApi struct {
+	Id     int    `json:"id" gorm:"primaryKey;autoIncrement;comment:主键编码"`
+	Handle string `json:"handle" gorm:"size:128;comment:handle"`
+	Title  string `json:"title" gorm:"size:128;comment:标题"`
+	Path   string `json:"path" gorm:"size:128;comment:地址"`
+	Action string `json:"action" gorm:"size:16;comment:请求类型"`
+	Type   string `json:"type" gorm:"size:16;comment:接口类型"`
+	models.ModelTime
+	models.ControlBy
+}
+
+func (SysApi) TableName() string {
+	return "sys_api"
+}
+
+func (e *SysApi) Generate() models.ActiveRecord {
+	o := *e
+	return &o
+}
+
+func (e *SysApi) GetId() interface{} {
+	return e.Id
+}
+
+func SaveSysApi(message storage.Messager) (err error) {
+	var rb []byte
+	rb, err = json.Marshal(message.GetValues())
+	if err != nil {
+		fmt.Errorf("json Marshal error, %s", err.Error())
+		return err
+	}
+
+	var l runtime.Routers
+	err = json.Unmarshal(rb, &l)
+	if err != nil {
+		fmt.Errorf("json Unmarshal error, %s", err.Error())
+		return err
+	}
+	dbList := sdk.Runtime.GetDb()
+	for _, d := range dbList {
+		for _, v := range l.List {
+			if v.HttpMethod != "HEAD" ||
+				strings.Contains(v.RelativePath, "/swagger/") ||
+				strings.Contains(v.RelativePath, "/static/") ||
+				strings.Contains(v.RelativePath, "/form-generator/") ||
+				strings.Contains(v.RelativePath, "/sys/tables") {
+
+				// 根据接口方法注释里的@Summary填充接口名称，适用于代码生成器
+				// 可在此处增加配置路径前缀的if判断，只对代码生成的自建应用进行定向的接口名称填充
+				jsonFile, _ := ioutil.ReadFile("docs/swagger.json")
+				jsonData, _ := simplejson.NewFromReader(bytes.NewReader(jsonFile))
+				urlPath := v.RelativePath
+				idPatten := "(.*)/:(\\w+)" // 正则替换，把:id换成{id}
+				reg, _ := regexp.Compile(idPatten)
+				if reg.MatchString(urlPath) {
+					urlPath = reg.ReplaceAllString(v.RelativePath, "${1}/{${2}}") // 把:id换成{id}
+				}
+				apiTitle, _ := jsonData.Get("paths").Get(urlPath).Get(strings.ToLower(v.HttpMethod)).Get("summary").String()
+
+				err := d.Debug().Where(SysApi{Path: v.RelativePath, Action: v.HttpMethod}).
+					Attrs(SysApi{Handle: v.Handler, Title: apiTitle}).
+					FirstOrCreate(&SysApi{}).
+					//Update("handle", v.Handler).
+					Error
+				if err != nil {
+					err := fmt.Errorf("Models SaveSysApi error: %s \r\n ", err.Error())
+					return err
+				}
+			}
+		}
+	}
+	return nil
+}
@@ -1,29 +0,0 @@
-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   int    `json:"sort" gorm:"type:int(4);comment:排序"`         //
-	Status int    `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
-}
@@ -1,27 +0,0 @@
-package models
-
-import (
-	"go-admin/common/models"
-)
-
-type SysChinaAreaData struct {
-	models.Model
-
-	PId        string    `json:"pId" gorm:"type:int(11);comment:上级编码"`
-	Name       string    `json:"name" gorm:"type:varchar(128);comment:名称"`
-	models.ControlBy
-	models.ModelTime
-}
-
-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
-}
@@ -0,0 +1,30 @@
+package models
+
+import (
+	"go-admin/common/models"
+)
+
+type SysConfig struct {
+	models.Model
+	ConfigName  string `json:"configName" gorm:"size:128;comment:ConfigName"`   //
+	ConfigKey   string `json:"configKey" gorm:"size:128;comment:ConfigKey"`     //
+	ConfigValue string `json:"configValue" gorm:"size:255;comment:ConfigValue"` //
+	ConfigType  string `json:"configType" gorm:"size:64;comment:ConfigType"`
+	IsFrontend  int    `json:"isFrontend" gorm:"size:64;comment:是否前台"` //
+	Remark      string `json:"remark" gorm:"size: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
+}
@@ -1,33 +0,0 @@
-package models
-
-import (
-	"go-admin/common/models"
-)
-
-type SysContent struct {
-	models.Model
-	CateId  int    `json:"cateId" gorm:"type:int(11);comment:分类id"`
-	Name    string `json:"name" gorm:"type:varchar(255);comment:名称"`
-	Status  int    `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    int    `json:"sort" gorm:"type:int(4);comment:排序"`
-	models.ControlBy
-	models.ModelTime
-}
-
-// TableName
-func (SysContent) TableName() string {
-	return "sys_content"
-}
-
-// Generate
-func (e *SysContent) Generate() models.ActiveRecord {
-	o := *e
-	return &o
-}
-
-func (e *SysContent) GetId() interface{} {
-	return e.Id
-}
@@ -1,4 +1,4 @@
-package system
+package models

 import "go-admin/common/models"

@@ -7,11 +7,11 @@ type SysDept struct {
 	ParentId int    `json:"parentId" gorm:""`                        //上级部门
 	DeptPath string `json:"deptPath" gorm:"size:255;"`               //
 	DeptName string `json:"deptName"  gorm:"size:128;"`              //部门名称
-	Sort     int    `json:"sort" gorm:""`                            //排序
+	Sort     int    `json:"sort" gorm:"size:4;"`                            //排序
 	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;"`                   //状态
+	Status   int    `json:"status" gorm:"size:4;"`                   //状态
 	models.ControlBy
 	models.ModelTime
 	DataScope string    `json:"dataScope" gorm:"-"`
@@ -0,0 +1,34 @@
+package models
+
+import (
+	"go-admin/common/models"
+)
+
+type SysDictData struct {
+	DictCode  int    `json:"dictCode" gorm:"primaryKey;column:dict_code;autoIncrement;comment:主键编码"`
+	DictSort  int    `json:"dictSort" gorm:"size:20;comment:DictSort"`
+	DictLabel string `json:"dictLabel" gorm:"size:128;comment:DictLabel"`
+	DictValue string `json:"dictValue" gorm:"size:255;comment:DictValue"`
+	DictType  string `json:"dictType" gorm:"size:64;comment:DictType"`
+	CssClass  string `json:"cssClass" gorm:"size:128;comment:CssClass"`
+	ListClass string `json:"listClass" gorm:"size:128;comment:ListClass"`
+	IsDefault string `json:"isDefault" gorm:"size:8;comment:IsDefault"`
+	Status    int    `json:"status" gorm:"size:4;comment:Status"`
+	Default   string `json:"default" gorm:"size:8;comment:Default"`
+	Remark    string `json:"remark" gorm:"size:255;comment:Remark"`
+	models.ControlBy
+	models.ModelTime
+}
+
+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
+}
@@ -1,18 +1,17 @@
-package system
+package models

 import (
 	"go-admin/common/models"
 )

 type SysDictType struct {
+	ID       int    `json:"id" gorm:"primaryKey;column:dict_id;autoIncrement;comment:主键编码"`
+	DictName string `json:"dictName" gorm:"size:128;comment:DictName"`
+	DictType string `json:"dictType" gorm:"size:128;comment:DictType"`
+	Status   int    `json:"status" gorm:"size:4;comment:Status"`
+	Remark   string `json:"remark" gorm:"size:255;comment:Remark"`
 	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 {
@@ -1,40 +0,0 @@
-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
-}
@@ -1,31 +0,0 @@
-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
-}
@@ -1,4 +1,4 @@
-package system
+package models

 import (
 	"encoding/json"
@@ -14,16 +14,16 @@ import (

 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:信息"`
+	Username      string    `json:"username" gorm:"size:128;comment:用户名"`
+	Status        string    `json:"status" gorm:"size:4;comment:状态"`
+	Ipaddr        string    `json:"ipaddr" gorm:"size:255;comment:ip地址"`
+	LoginLocation string    `json:"loginLocation" gorm:"size:255;comment:归属地"`
+	Browser       string    `json:"browser" gorm:"size:255;comment:浏览器"`
+	Os            string    `json:"os" gorm:"size:255;comment:系统"`
+	Platform      string    `json:"platform" gorm:"size:255;comment:固件"`
+	LoginTime     time.Time `json:"loginTime" gorm:"comment:登录时间"`
+	Remark        string    `json:"remark" gorm:"size:255;comment:备注"`
+	Msg           string    `json:"msg" gorm:"size:255;comment:信息"`
 	CreatedAt     time.Time `json:"createdAt" gorm:"comment:创建时间"`
 	UpdatedAt     time.Time `json:"updatedAt" gorm:"comment:最后更新时间"`
 	models.ControlBy
@@ -1,4 +1,4 @@
-package system
+package models

 import "go-admin/common/models"

@@ -19,37 +19,17 @@ type SysMenu struct {
 	Sort       int       `json:"sort" gorm:"size:4;"`
 	Visible    string    `json:"visible" gorm:"size:1;"`
 	IsFrame    string    `json:"isFrame" gorm:"size:1;DEFAULT:0;"`
+	SysApi     []SysApi  `json:"sysApi" gorm:"many2many:sys_menu_api_rule"`
+	Apis       []int     `json:"apis" gorm:"-"`
 	DataScope  string    `json:"dataScope" gorm:"-"`
 	Params     string    `json:"params" gorm:"-"`
 	RoleId     int       `gorm:"-"`
-	Children   []SysMenu `json:"children" gorm:"-"`
+	Children   []SysMenu `json:"children,omitempty" 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"
 }
@@ -61,4 +41,4 @@ func (e *SysMenu) Generate() models.ActiveRecord {

 func (e *SysMenu) GetId() interface{} {
 	return e.MenuId
-}
+}
@@ -0,0 +1,88 @@
+package models
+
+import (
+	"encoding/json"
+	"errors"
+	"time"
+
+	log "github.com/go-admin-team/go-admin-core/logger"
+	"github.com/go-admin-team/go-admin-core/sdk"
+	"github.com/go-admin-team/go-admin-core/storage"
+
+	"go-admin/common/models"
+)
+
+type SysOperaLog struct {
+	models.Model
+	Title         string    `json:"title" gorm:"size:255;comment:操作模块"`
+	BusinessType  string    `json:"businessType" gorm:"size:128;comment:操作类型"`
+	BusinessTypes string    `json:"businessTypes" gorm:"size:128;comment:BusinessTypes"`
+	Method        string    `json:"method" gorm:"size:128;comment:函数"`
+	RequestMethod string    `json:"requestMethod" gorm:"size:128;comment:请求方式"`
+	OperatorType  string    `json:"operatorType" gorm:"size:128;comment:操作类型"`
+	OperName      string    `json:"operName" gorm:"size:128;comment:操作者"`
+	DeptName      string    `json:"deptName" gorm:"size:128;comment:部门名称"`
+	OperUrl       string    `json:"operUrl" gorm:"size:255;comment:访问地址"`
+	OperIp        string    `json:"operIp" gorm:"size:128;comment:客户端ip"`
+	OperLocation  string    `json:"operLocation" gorm:"size:128;comment:访问位置"`
+	OperParam     string    `json:"operParam" gorm:"size:255;comment:请求参数"`
+	Status        string    `json:"status" gorm:"size:4;comment:操作状态"`
+	OperTime      time.Time `json:"operTime" gorm:"comment:操作时间"`
+	JsonResult    string    `json:"jsonResult" gorm:"size:255;comment:返回数据"`
+	Remark        string    `json:"remark" gorm:"size:255;comment:备注"`
+	LatencyTime   string    `json:"latencyTime" gorm:"size:128;comment:耗时"`
+	UserAgent     string    `json:"userAgent" gorm:"size: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
+}
+
+// SaveOperaLog 从队列中获取操作日志
+func SaveOperaLog(message storage.Messager) (err error) {
+	//准备db
+	db := sdk.Runtime.GetDbByKey(message.GetPrefix())
+	if db == nil {
+		err = errors.New("db not exist")
+		log.Errorf("host[%s]'s %s", message.GetPrefix(), err.Error())
+		// Log writing to the database ignores error
+		return nil
+	}
+	var rb []byte
+	rb, err = json.Marshal(message.GetValues())
+	if err != nil {
+		log.Errorf("json Marshal error, %s", err.Error())
+		// Log writing to the database ignores error
+		return nil
+	}
+	var l SysOperaLog
+	err = json.Unmarshal(rb, &l)
+	if err != nil {
+		log.Errorf("json Unmarshal error, %s", err.Error())
+		// Log writing to the database ignores error
+		return nil
+	}
+	// 超出100个字符返回值截断
+	if len(l.JsonResult) > 100 {
+		l.JsonResult = l.JsonResult[:100]
+	}
+	err = db.Create(&l).Error
+	if err != nil {
+		log.Errorf("db create error, %s", err.Error())
+		// Log writing to the database ignores error
+		return nil
+	}
+	return nil
+}
@@ -1,4 +1,4 @@
-package system
+package models

 import "go-admin/common/models"

@@ -6,7 +6,7 @@ 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"`                           //岗位排序
+	Sort     int    `gorm:"size:4;" json:"sort"`                    //岗位排序
 	Status   int    `gorm:"size:4;" json:"status"`                  //状态
 	Remark   string `gorm:"size:255;" json:"remark"`                //描述
 	models.ControlBy
@@ -27,4 +27,4 @@ func (e *SysPost) Generate() models.ActiveRecord {

 func (e *SysPost) GetId() interface{} {
 	return e.PostId
-}
+}
@@ -0,0 +1,35 @@
+package models
+
+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:"-"`
+	SysDept   []SysDept `json:"sysDept" gorm:"many2many:sys_role_dept;foreignKey:RoleId;joinForeignKey:role_id;references:DeptId;joinReferences:dept_id;"`
+	SysMenu   *[]SysMenu `json:"sysMenu" gorm:"many2many:sys_role_menu;foreignKey:RoleId;joinForeignKey:role_id;references:MenuId;joinReferences:menu_id;"`
+	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
+}
@@ -1,4 +1,4 @@
-package system
+package models

 import (
 	"go-admin/common/models"
@@ -7,26 +7,26 @@ import (
 )

 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:状态"`
+	Username string   `json:"username" gorm:"size:64;comment:用户名"`
+	Password string   `json:"-" gorm:"size:128;comment:密码"`
+	NickName string   `json:"nickName" gorm:"size:128;comment:昵称"`
+	Phone    string   `json:"phone" gorm:"size:11;comment:手机号"`
+	RoleId   int      `json:"roleId" gorm:"size:20;comment:角色ID"`
+	Salt     string   `json:"-" gorm:"size:255;comment:加盐"`
+	Avatar   string   `json:"avatar" gorm:"size:255;comment:头像"`
+	Sex      string   `json:"sex" gorm:"size:255;comment:性别"`
+	Email    string   `json:"email" gorm:"size:128;comment:邮箱"`
+	DeptId   int      `json:"deptId" gorm:"size:20;comment:部门"`
+	PostId   int      `json:"postId" gorm:"size:20;comment:岗位"`
+	Remark   string   `json:"remark" gorm:"size:255;comment:备注"`
+	Status   string   `json:"status" gorm:"size:4;comment:状态"`
 	DeptIds  []int    `json:"deptIds" gorm:"-"`
 	PostIds  []int    `json:"postIds" gorm:"-"`
 	RoleIds  []int    `json:"roleIds" gorm:"-"`
 	Dept     *SysDept `json:"dept"`
+	models.ControlBy
+	models.ModelTime
 }

 func (SysUser) TableName() string {
@@ -1,44 +0,0 @@
-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"` // 头像
-}
@@ -1,11 +0,0 @@
-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"
-}
@@ -1,172 +0,0 @@
-package system
-
-import (
-	"fmt"
-
-	"github.com/casbin/casbin/v2"
-	"github.com/go-admin-team/go-admin-core/sdk/pkg"
-	"gorm.io/gorm"
-
-	"go-admin/common/models"
-)
-
-type RoleMenu struct {
-	RoleId   int    `gorm:""`
-	MenuId   int    `gorm:""`
-	RoleName string `gorm:"size:128"`
-	models.ControlBy
-}
-
-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
-
-}
@@ -1,30 +0,0 @@
-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"`
-	IsFrontend  int    `json:"isFrontend" gorm:"type:varchar(64);comment:是否前台"` //
-	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
-}
@@ -1,35 +0,0 @@
-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
-}
@@ -1,85 +0,0 @@
-package system
-
-import (
-	"encoding/json"
-	"errors"
-	"time"
-
-	log "github.com/go-admin-team/go-admin-core/logger"
-	"github.com/go-admin-team/go-admin-core/sdk"
-	"github.com/go-admin-team/go-admin-core/storage"
-
-	"go-admin/common/models"
-)
-
-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
-}
-
-// SaveOperaLog 从队列中获取操作日志
-func SaveOperaLog(message storage.Messager) (err error) {
-	//准备db
-	db := sdk.Runtime.GetDbByKey(message.GetPrefix())
-	if db == nil {
-		err = errors.New("db not exist")
-		log.Errorf("host[%s]'s %s", message.GetPrefix(), err.Error())
-		return err
-	}
-	var rb []byte
-	rb, err = json.Marshal(message.GetValues())
-	if err != nil {
-		log.Errorf("json Marshal error, %s", err.Error())
-		return err
-	}
-	var l SysOperaLog
-	err = json.Unmarshal(rb, &l)
-	if err != nil {
-		log.Errorf("json Unmarshal error, %s", err.Error())
-		return err
-	}
-	if l.Title == "" {
-		m := &SysMenu{}
-		db.Model(m).Select("Title").Where("action = ?", l.Method).Where("path = ?", message.GetValues()["_fullPath"]).First(m)
-		l.Title = m.Title
-	}
-	err = db.Create(&l).Error
-	if err != nil {
-		log.Errorf("db create error, %s", err.Error())
-		return err
-	}
-	return nil
-}
@@ -1,33 +0,0 @@
-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
-}
@@ -6,12 +6,7 @@ import (
 	"github.com/gin-gonic/gin"
 	log "github.com/go-admin-team/go-admin-core/logger"
 	"github.com/go-admin-team/go-admin-core/sdk"
-	"github.com/go-admin-team/go-admin-core/sdk/api"
-	"github.com/go-admin-team/go-admin-core/sdk/config"
-	"github.com/go-admin-team/go-admin-core/sdk/pkg"
-
 	common "go-admin/common/middleware"
-	"go-admin/common/middleware/handler"
 )

 // InitRouter 路由初始化，不要怀疑，这里用到了
@@ -19,8 +14,8 @@ func InitRouter() {
 	var r *gin.Engine
 	h := sdk.Runtime.GetEngine()
 	if h == nil {
-		h = gin.New()
-		sdk.Runtime.SetEngine(h)
+		log.Fatal("not found engine...")
+		os.Exit(-1)
 	}
 	switch h.(type) {
 	case *gin.Engine:
@@ -29,14 +24,7 @@ func InitRouter() {
 		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)).
-		Use(api.SetRequestLogger)
-	common.InitMiddleware(r)
 	// the jwt middleware
 	authMiddleware, err := common.AuthInit()
 	if err != nil {
@@ -1,32 +0,0 @@
-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)
-	})
-}
@@ -27,25 +27,16 @@ func InitExamplesRouter(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware) *gi
 func examplesNoCheckRoleRouter(r *gin.Engine) {
 	// 可根据业务需求来设置接口版本
 	v1 := r.Group("/api/v1")
-	// 空接口防止v1定义无使用报错
-	v1.GET("/nilcheckrole", nil)
-
 	for _, f := range routerNoCheckRole {
 		f(v1)
 	}
-
-	// {{无需认证路由自动补充在此处请勿删除}}
-	//registerSysFileInfoRouter(v1)
 }

 // 需要认证的路由示例
 func examplesCheckRoleRouter(r *gin.Engine, authMiddleware *jwtauth.GinJWTMiddleware) {
 	// 可根据业务需求来设置接口版本
 	v1 := r.Group("/api/v1")
-	// 空接口防止v1定义无使用报错
-	v1.GET("/checkrole", nil)
-
 	for _, f := range routerCheckRole {
 		f(v1, authMiddleware)
 	}
-}
+}
@@ -0,0 +1,24 @@
+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"
+	"go-admin/common/middleware"
+)
+
+func init() {
+	routerCheckRole = append(routerCheckRole, registerSysApiRouter)
+}
+
+// registerSysApiRouter
+func registerSysApiRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
+	api := apis.SysApi{}
+	r := v1.Group("/sys-api").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+	{
+		r.GET("", api.GetPage)
+		r.GET("/:id", api.Get)
+		r.PUT("/:id", api.Update)
+	}
+}
@@ -1,31 +0,0 @@
-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)))
-	}
-}
@@ -1,25 +0,0 @@
-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)
-	}
-}
@@ -1,10 +1,11 @@
 package router

 import (
+	"go-admin/app/admin/apis"
+	"go-admin/common/middleware"
+
 	"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() {
@@ -13,15 +14,14 @@ func init() {

 // 需认证的路由代码
 func registerSysConfigRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
-	api := sys_config.SysConfig{}
-	r := v1.Group("/config").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
+	api := apis.SysConfig{}
+	r := v1.Group("/config").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
 	{
-
-		r.GET("", api.GetSysConfigList)
-		r.GET("/:id", api.GetSysConfig)
-		r.POST("", api.InsertSysConfig)
-		r.PUT("/:id", api.UpdateSysConfig)
-		r.DELETE("", api.DeleteSysConfig)
+		r.GET("", api.GetPage)
+		r.GET("/:id", api.Get)
+		r.POST("", api.Insert)
+		r.PUT("/:id", api.Update)
+		r.DELETE("", api.Delete)
 	}

 	r1 := v1.Group("/configKey").Use(authMiddleware.MiddlewareFunc())
@@ -31,7 +31,13 @@ func registerSysConfigRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMidd

 	r2 := v1.Group("/app-config")
 	{
-		r2.GET("", api.GetSysConfigBySysApp)
+		r2.GET("", api.Get2SysApp)
 	}

-}
+	r3 := v1.Group("/set-config").Use(authMiddleware.MiddlewareFunc())
+	{
+		r3.PUT("", api.Update2Set)
+		r3.GET("", api.Get2Set)
+	}
+
+}
@@ -1,37 +0,0 @@
-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)))
-	}
-}
@@ -3,8 +3,8 @@ 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"
+	"go-admin/app/admin/apis"
+	"go-admin/common/middleware"
 )

 func init() {
@@ -13,19 +13,20 @@ func init() {

 // 需认证的路由代码
 func registerSysDeptRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
-	api := sys_dept.SysDept{}
-	r := v1.Group("/dept").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
+	api := apis.SysDept{}
+
+	r := v1.Group("/dept").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
 	{
-		r.GET("", api.GetSysDeptList)
-		r.GET("/:id", api.GetSysDept)
-		r.POST("", api.InsertSysDept)
-		r.PUT("/:id", api.UpdateSysDept)
-		r.DELETE("/:id", api.DeleteSysDept)
+		r.GET("", api.GetPage)
+		r.GET("/:id", api.Get)
+		r.POST("", api.Insert)
+		r.PUT("/:id", api.Update)
+		r.DELETE("", api.Delete)
 	}

 	r1 := v1.Group("").Use(authMiddleware.MiddlewareFunc())
 	{
-		r1.GET("/deptTree", api.GetDeptTree)
+		r1.GET("/deptTree", api.Get2Tree)
 	}

-}
+}
@@ -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"
+	"go-admin/common/middleware"
+)
+
+func init() {
+	routerCheckRole = append(routerCheckRole, registerDictRouter)
+}
+
+func registerDictRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
+	dictApi := apis.SysDictType{}
+	dataApi := apis.SysDictData{}
+	dicts := v1.Group("/dict").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+	{
+
+		dicts.GET("/data", dataApi.GetPage)
+		dicts.GET("/data/:dictCode", dataApi.Get)
+		dicts.POST("/data", dataApi.Insert)
+		dicts.PUT("/data/:dictCode", dataApi.Update)
+		dicts.DELETE("/data", dataApi.Delete)
+
+		dicts.GET("/type-option-select", dictApi.GetAll)
+		dicts.GET("/type", dictApi.GetPage)
+		dicts.GET("/type/:id", dictApi.Get)
+		dicts.POST("/type", dictApi.Insert)
+		dicts.PUT("/type/:id", dictApi.Update)
+		dicts.DELETE("/type", dictApi.Delete)
+	}
+	opSelect := v1.Group("/dict-data").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+	{
+		opSelect.GET("/option-select", dataApi.GetAll)
+	}
+}
@@ -1,25 +0,0 @@
-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)
-	}
-}
@@ -1,25 +0,0 @@
-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)
-	}
-}
@@ -3,8 +3,8 @@ 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"
+	"go-admin/app/admin/apis"
+	"go-admin/common/middleware"
 )

 func init() {
@@ -13,13 +13,12 @@ func init() {

 // 需认证的路由代码
 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())
+	api := apis.SysLoginLog{}
+
+	r := v1.Group("/sys-login-log").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
 	{
-		r.GET("", api.GetSysLoginLogList)
-		r.GET("/:id", api.GetSysLoginLog)
-		r.POST("", api.InsertSysLoginLog)
-		r.PUT("/:id", api.UpdateSysLoginLog)
-		r.DELETE("", api.DeleteSysLoginLog)
+		r.GET("", api.GetPage)
+		r.GET("/:id", api.Get)
+		r.DELETE("", api.Delete)
 	}
-}
+}
@@ -3,8 +3,8 @@ 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"
+	"go-admin/app/admin/apis"
+	"go-admin/common/middleware"
 )

 func init() {
@@ -13,27 +13,21 @@ func init() {

 // 需认证的路由代码
 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())
+	api := apis.SysMenu{}
+
+	r := v1.Group("/menu").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
 	{
-		r.GET("", api.GetSysMenuList)
-		r.GET("/:id", api.GetSysMenu)
-		r.POST("", api.InsertSysMenu)
-		r.PUT("/:id", api.UpdateSysMenu)
-		r.DELETE("/:id", api.DeleteSysMenu)
+		r.GET("", api.GetPage)
+		r.GET("/:id", api.Get)
+		r.POST("", api.Insert)
+		r.PUT("/:id", api.Update)
+		r.DELETE("", api.Delete)
 	}

 	r1 := v1.Group("").Use(authMiddleware.MiddlewareFunc())
 	{
 		r1.GET("/menurole", api.GetMenuRole)
-		r1.GET("/menuids", api.GetMenuIDS)
+		//r1.GET("/menuids", api.GetMenuIDS)
 	}

-}
+}
@@ -3,8 +3,8 @@ 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"
+	"go-admin/app/admin/apis"
+	"go-admin/common/middleware"
 )

 func init() {
@@ -13,13 +13,11 @@ func init() {

 // 需认证的路由代码
 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())
+	api := apis.SysOperaLog{}
+	r := v1.Group("/sys-opera-log").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
 	{
-		r.GET("", api.GetSysOperaLogList)
-		r.GET("/:id", api.GetSysOperaLog)
-		r.POST("", api.InsertSysOperaLog)
-		r.PUT("/:id", api.UpdateSysOperaLog)
-		r.DELETE("", api.DeleteSysOperaLog)
+		r.GET("", api.GetPage)
+		r.GET("/:id", api.Get)
+		r.DELETE("", api.Delete)
 	}
-}
+}
@@ -3,8 +3,8 @@ 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"
+	"go-admin/app/admin/apis"
+	"go-admin/common/middleware"
 )

 func init() {
@@ -13,13 +13,13 @@ func init() {

 // 需认证的路由代码
 func registerSyPostRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
-	api := sys_post.SysPost{}
-	r := v1.Group("/post").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
+	api := apis.SysPost{}
+	r := v1.Group("/post").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
 	{
-		r.GET("", api.GetSysPostList)
-		r.GET("/:id", api.GetSysPost)
-		r.POST("", api.InsertSysPost)
-		r.PUT("/:id", api.UpdateSysPost)
-		r.DELETE("/:id", api.DeleteSysPost)
+		r.GET("", api.GetPage)
+		r.GET("/:id", api.Get)
+		r.POST("", api.Insert)
+		r.PUT("/:id", api.Update)
+		r.DELETE("", api.Delete)
 	}
-}
+}
@@ -3,8 +3,9 @@ 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"
+
+	"go-admin/app/admin/apis"
+	"go-admin/common/middleware"
 )

 func init() {
@@ -13,14 +14,18 @@ func init() {

 // 需认证的路由代码
 func registerSysRoleRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
-	api := sys_role.SysRole{}
-	r := v1.Group("/role").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
+	api := apis.SysRole{}
+	r := v1.Group("/role").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
 	{
-		r.GET("", api.GetSysRoleList)
-		r.GET("/:id", api.GetSysRole)
-		r.POST("", api.InsertSysRole)
-		r.PUT("/:id", api.UpdateSysRole)
-		r.DELETE("", api.DeleteSysRole)
+		r.GET("", api.GetPage)
+		r.GET("/:id", api.Get)
+		r.POST("", api.Insert)
+		r.PUT("/:id", api.Update)
+		r.DELETE("", api.Delete)
+	}
+	r1 := v1.Group("").Use(authMiddleware.MiddlewareFunc())
+	{
+		r1.PUT("/role-status", api.Update2Status)
+		r1.PUT("/roledatascope", api.Update2DataScope)
 	}
-	v1.PUT("/roledatascope", api.UpdateRoleDataScope)
 }
@@ -1,6 +1,8 @@
 package router

 import (
+	"github.com/go-admin-team/go-admin-core/sdk/config"
+	"go-admin/app/admin/apis"
 	"mime"

 	"github.com/gin-gonic/gin"
@@ -9,13 +11,6 @@ import (
 	ginSwagger "github.com/swaggo/gin-swagger"
 	"github.com/swaggo/gin-swagger/swaggerFiles"

-	"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/system/sys_dept"
-	"go-admin/app/admin/apis/system/sys_menu"
-	"go-admin/app/admin/apis/tools"
 	"go-admin/common/middleware"
 	"go-admin/common/middleware/handler"
 	_ "go-admin/docs"
@@ -27,9 +22,9 @@ func InitSysRouter(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware) *gin.Rou
 	// 静态文件
 	sysStaticFileRouter(g)
 	// swagger；注意：生产环境可以注释掉
-	sysSwaggerRouter(g)
-	// 无需认证
-	sysNoCheckRoleRouter(g)
+	if config.ApplicationConfig.Mode != "prod" {
+		sysSwaggerRouter(g)
+	}
 	// 需要认证
 	sysCheckRoleRouterInit(g, authMiddleware)
 	return g
@@ -41,7 +36,9 @@ func sysBaseRouter(r *gin.RouterGroup) {
 	go ws.WebsocketManager.SendService()
 	go ws.WebsocketManager.SendAllService()

-	r.GET("/", system.HelloWorld)
+	if config.ApplicationConfig.Mode != "prod" {
+		r.GET("/", apis.GoAdmin)
+	}
 	r.GET("/info", handler.Ping)
 }

@@ -51,172 +48,39 @@ func sysStaticFileRouter(r *gin.RouterGroup) {
 		return
 	}
 	r.Static("/static", "./static")
-	r.Static("/form-generator", "./static/form-generator")
+	if config.ApplicationConfig.Mode != "prod" {
+		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")
-
-	m := monitor.Monitor{}
-	v1.GET("/monitor/server", m.ServerInfo)
-	sys := system.System{}
-	v1.GET("/getCaptcha", sys.GenerateCaptchaHandler)
-	gen := tools.Gen{}
-	v1.GET("/gen/preview/:tableId", gen.Preview)
-	v1.GET("/gen/toproject/:tableId", gen.GenCode)
-	v1.GET("/gen/apitofile/:tableId", gen.GenApiToFile)
-
-	v1.GET("/gen/todb/:tableId", gen.GenMenuAndApi)
-	sysTable := tools.SysTable{}
-	v1.GET("/gen/tabletree", sysTable.GetSysTablesTree)
-
-	registerDBRouter(v1)
-	registerSysTableRouter(v1)
-	registerPublicRouter(v1)
-	registerSysSettingRouter(v1)
-}
-
-func registerDBRouter(api *gin.RouterGroup) {
-	db := api.Group("/db")
-	{
-		gen := tools.Gen{}
-		db.GET("/tables/page", gen.GetDBTableList)
-		db.GET("/columns/page", gen.GetDBColumnList)
-	}
-}
-
-func registerSysTableRouter(v1 *gin.RouterGroup) {
-	systables := v1.Group("/sys/tables")
-	{
-		sysTable := tools.SysTable{}
-		systables.GET("/page", sysTable.GetSysTableList)
-		tablesinfo := systables.Group("/info")
-		{
-			tablesinfo.POST("", sysTable.InsertSysTable)
-			tablesinfo.PUT("", sysTable.UpdateSysTable)
-			tablesinfo.DELETE("/:tableId", sysTable.DeleteSysTables)
-			tablesinfo.GET("/:tableId", sysTable.GetSysTables)
-			tablesinfo.GET("", sysTable.GetSysTablesInfo)
-		}
-	}
-}
-
 func sysCheckRoleRouterInit(r *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
-	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")
+	wss:=r.Group("").Use(authMiddleware.MiddlewareFunc())
+	{
+		wss.GET("/ws/:id/:channel", ws.WebsocketManager.WsClient)
+		wss.GET("/wslogout/:id/:channel", ws.WebsocketManager.UnWsClient)
+	}

-	v1.POST("/login", authMiddleware.LoginHandler)
-	// Refresh time can be longer than token timeout
-	v1.GET("/refresh_token", authMiddleware.RefreshHandler)
-	//registerPageRouter(v1, authMiddleware)
+	v1 := r.Group("/api/v1")
+	{
+		v1.POST("/login", authMiddleware.LoginHandler)
+		// Refresh time can be longer than token timeout
+		v1.GET("/refresh_token", authMiddleware.RefreshHandler)
+	}
 	registerBaseRouter(v1, authMiddleware)
-	registerDictRouter(v1, authMiddleware)
-	//registerSysUserRouter(v1, authMiddleware)
-	//registerUserCenterRouter(v1, authMiddleware)
 }

 func registerBaseRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
-	api := sys_menu.SysMenu{}
-	api2 := sys_dept.SysDept{}
+	api := apis.SysMenu{}
+	api2 := apis.SysDept{}
 	v1auth := v1.Group("").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
 	{
-		//v1auth.GET("/getinfo", system.GetInfo)
 		v1auth.GET("/roleMenuTreeselect/:roleId", api.GetMenuTreeSelect)
-		v1.GET("/menuTreeselect", api.GetMenuTreeSelect)
+		//v1.GET("/menuTreeselect", api.GetMenuTreeSelect)
 		v1auth.GET("/roleDeptTreeselect/:roleId", api2.GetDeptTreeRoleSelect)
-		//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(middleware.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{}
-	m := monitor.Monitor{}
-	setting := v1.Group("/setting")
-	{
-		setting.GET("", api.GetSetting)
-		setting.POST("", api.CreateOrUpdateSetting)
-		setting.GET("/serverInfo", m.ServerInfo)
-	}
-}
-
-func registerPublicRouter(v1 *gin.RouterGroup) {
-	p := v1.Group("/public")
-	{
-		file := public.File{}
-		p.POST("/uploadFile", file.UploadFile)
-	}
-}
@@ -3,9 +3,9 @@ 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/app/admin/apis"
 	"go-admin/common/actions"
-	middleware2 "go-admin/common/middleware"
+	"go-admin/common/middleware"
 )

 func init() {
@@ -14,24 +14,26 @@ func init() {

 // 需认证的路由代码
 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())
+	api := apis.SysUser{}
+	r := v1.Group("/sys-user").Use(authMiddleware.MiddlewareFunc()).Use(middleware.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)
+		r.GET("", api.GetPage)
+		r.GET("/:id", api.Get)
+		r.POST("", api.Insert)
+		r.PUT("", api.Update)
+		r.DELETE("", api.Delete)
 	}

-	user := v1.Group("/user").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole()).Use(actions.PermissionAction())
+	user := v1.Group("/user").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()).Use(actions.PermissionAction())
 	{
-		user.GET("/profile", api.GetSysUserProfile)
-		user.POST("/avatar", api.InsetSysUserAvatar)
-		user.PUT("/pwd", api.SysUserUpdatePwd)
+		user.GET("/profile", api.GetProfile)
+		user.POST("/avatar", api.InsetAvatar)
+		user.PUT("/pwd/set", api.UpdatePwd)
+		user.PUT("/pwd/reset", api.ResetPwd)
+		user.PUT("/status", api.UpdateStatus)
 	}
 	v1auth := v1.Group("").Use(authMiddleware.MiddlewareFunc())
 	{
 		v1auth.GET("/getinfo", api.GetInfo)
 	}
-}
+}
@@ -0,0 +1,96 @@
+package dto
+
+import (
+	"go-admin/app/admin/models"
+	"go-admin/common/dto"
+	common "go-admin/common/models"
+)
+
+// SysApiGetPageReq 功能列表请求参数
+type SysApiGetPageReq struct {
+	dto.Pagination `search:"-"`
+	Title          string `form:"title"  search:"type:contains;column:title;table:sys_api" comment:"标题"`
+	Path           string `form:"path"  search:"type:contains;column:path;table:sys_api" comment:"地址"`
+	Action         string `form:"action"  search:"type:exact;column:action;table:sys_api" comment:"类型"`
+	ParentId       string `form:"parentId"  search:"type:exact;column:parent_id;table:sys_api" comment:"按钮id"`
+	SysApiOrder
+}
+
+type SysApiOrder struct {
+	TitleOrder     string `search:"type:order;column:title;table:sys_api" form:"titleOrder"`
+	PathOrder      string `search:"type:order;column:path;table:sys_api" form:"pathOrder"`
+	CreatedAtOrder string `search:"type:order;column:created_at;table:sys_api" form:"createdAtOrder"`
+}
+
+func (m *SysApiGetPageReq) GetNeedSearch() interface{} {
+	return *m
+}
+
+// SysApiInsertReq 功能创建请求参数
+type SysApiInsertReq struct {
+	Id     int    `json:"-" comment:"编码"` // 编码
+	Handle string `json:"handle" comment:"handle"`
+	Title  string `json:"title" comment:"标题"`
+	Path   string `json:"path" comment:"地址"`
+	Type   string `json:"type" comment:""`
+	Action string `json:"action" comment:"类型"`
+	common.ControlBy
+}
+
+func (s *SysApiInsertReq) Generate(model *models.SysApi) {
+	model.Handle = s.Handle
+	model.Title = s.Title
+	model.Path = s.Path
+	model.Type = s.Type
+	model.Action = s.Action
+}
+
+func (s *SysApiInsertReq) GetId() interface{} {
+	return s.Id
+}
+
+// SysApiUpdateReq 功能更新请求参数
+type SysApiUpdateReq struct {
+	Id     int    `uri:"id" comment:"编码"` // 编码
+	Handle string `json:"handle" comment:"handle"`
+	Title  string `json:"title" comment:"标题"`
+	Path   string `json:"path" comment:"地址"`
+	Type   string `json:"type" comment:""`
+	Action string `json:"action" comment:"类型"`
+	common.ControlBy
+}
+
+func (s *SysApiUpdateReq) Generate(model *models.SysApi) {
+	if s.Id != 0 {
+		model.Id = s.Id
+	}
+	model.Handle = s.Handle
+	model.Title = s.Title
+	model.Path = s.Path
+	model.Type = s.Type
+	model.Action = s.Action
+}
+
+func (s *SysApiUpdateReq) GetId() interface{} {
+	return s.Id
+}
+
+// SysApiGetReq 功能获取请求参数
+type SysApiGetReq struct {
+	Id int `uri:"id"`
+}
+
+func (s *SysApiGetReq) GetId() interface{} {
+	return s.Id
+}
+
+
+// SysApiDeleteReq 功能删除请求参数
+type SysApiDeleteReq struct {
+	Ids []int `json:"ids"`
+}
+
+func (s *SysApiDeleteReq) GetId() interface{} {
+	return s.Ids
+}
+
@@ -1,104 +0,0 @@
-package dto
-
-import (
-	"errors"
-	vd "github.com/bytedance/go-tagexpr/v2/validator"
-	"github.com/gin-gonic/gin"
-	"github.com/go-admin-team/go-admin-core/sdk/api"
-
-	"go-admin/app/admin/models"
-	"go-admin/common/dto"
-	common "go-admin/common/models"
-)
-
-type SysCategorySearch struct {
-	dto.Pagination `search:"-"`
-	Name           string `form:"name" search:"type:exact;column:name;table:sys_category" comment:"名称" vd:"?"`
-	Status         string `form:"status" search:"type:exact;column:status;table:sys_category" comment:"状态" vd:"?"`
-	CateId         int    `form:"cateId" search:"type:exact;column:cate_id;table:sys_category" comment:"分类id" vd:"?"`
-}
-
-func (m *SysCategorySearch) GetNeedSearch() interface{} {
-	return *m
-}
-
-func (m *SysCategorySearch) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-
-	err := ctx.ShouldBind(m)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
-	}
-
-	if err = vd.Validate(m); err != nil {
-		log.Errorf("Validate error: %s", err.Error())
-		return err
-	}
-	return err
-}
-
-func (m *SysCategorySearch) Generate() dto.Index {
-	o := *m
-	return &o
-}
-
-type SysCategoryControl struct {
-	ID     int    `uri:"Id" comment:"标识"`
-	Name   string `json:"name" comment:"名称" vd:"len($)>0 && $!=' '; msg:'invalid name: 不能是空字符串'"`
-	Img    string `json:"img" comment:"图标" vd:"?"`
-	Sort   int    `json:"sort" comment:"排序" vd:"?"`
-	Status int    `json:"status" comment:"状态" vd:"$>0; msg:'invalid status: 状态无效'"`
-	Remark string `json:"remark" comment:"备注" vd:"?"`
-}
-
-func (s *SysCategoryControl) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-	err := ctx.ShouldBindUri(s)
-	if err != nil {
-		log.Errorf("ShouldBindUri error: %s", err.Error())
-		return errors.New("数据绑定出错")
-	}
-	err = ctx.ShouldBind(s)
-	if err != nil {
-		log.Errorf("ShouldBind error: %s", err.Error())
-		err = errors.New("数据绑定出错")
-	}
-	if err1 := vd.Validate(s); err != nil {
-		log.Errorf("Validate error: %s", err1.Error())
-		return err1
-	}
-	return err
-}
-
-func (s *SysCategoryControl) Generate() dto.Control {
-	cp := *s
-	return &cp
-}
-
-func (s *SysCategoryControl) GenerateM() (common.ActiveRecord, error) {
-	return &models.SysCategory{
-		Model:  common.Model{Id: s.ID},
-		Name:   s.Name,
-		Img:    s.Img,
-		Sort:   s.Sort,
-		Status: s.Status,
-		Remark: s.Remark,
-	}, nil
-}
-
-func (s *SysCategoryControl) GetId() interface{} {
-	return s.ID
-}
-
-type SysCategoryById struct {
-	dto.ObjectById `vd:"?"`
-}
-
-func (s *SysCategoryById) Generate() dto.Control {
-	cp := *s
-	return &cp
-}
-
-func (s *SysCategoryById) GenerateM() (common.ActiveRecord, error) {
-	return &models.SysCategory{}, nil
-}
@@ -1,123 +1,112 @@
 package dto

 import (
-	"encoding/json"
-
-	"github.com/gin-gonic/gin"
-	"github.com/gin-gonic/gin/binding"
-	"github.com/go-admin-team/go-admin-core/sdk/api"
-
-	"go-admin/app/admin/models/system"
+	"go-admin/app/admin/models"
 	"go-admin/common/dto"
 	common "go-admin/common/models"
 )

-// SysConfigSearch 列表或者搜索使用结构体
-type SysConfigSearch struct {
+// SysConfigGetPageReq 列表或者搜索使用结构体
+type SysConfigGetPageReq struct {
 	dto.Pagination `search:"-"`
-	ConfigName     string `form:"configName" search:"type:contains;column:config_name;table:sys_config" comment:""`
-	ConfigKey      string `form:"configKey" search:"type:contains;column:config_key;table:sys_config" comment:""`
-	ConfigType     string `form:"configType" search:"type:exact;column:config_type;table:sys_config" comment:""`
-	IsFrontend     int    `form:"isFrontend" search:"type:exact;column:is_frontend;table:sys_config" comment:""`
+	ConfigName     string `form:"configName" search:"type:contains;column:config_name;table:sys_config"`
+	ConfigKey      string `form:"configKey" search:"type:contains;column:config_key;table:sys_config"`
+	ConfigType     string `form:"configType" search:"type:exact;column:config_type;table:sys_config"`
+	IsFrontend     int    `form:"isFrontend" search:"type:exact;column:is_frontend;table:sys_config"`
+	SysConfigOrder
 }

-func (m *SysConfigSearch) GetNeedSearch() interface{} {
+type SysConfigOrder struct {
+	IdOrder         string `search:"type:order;column:id;table:sys_config" form:"idOrder"`
+	ConfigNameOrder string `search:"type:order;column:config_name;table:sys_config" form:"configNameOrder"`
+	ConfigKeyOrder  string `search:"type:order;column:config_key;table:sys_config" form:"configKeyOrder"`
+	ConfigTypeOrder string `search:"type:order;column:config_type;table:sys_config" form:"configTypeOrder"`
+	CreatedAtOrder  string `search:"type:order;column:created_at;table:sys_config" form:"createdAtOrder"`
+}
+
+func (m *SysConfigGetPageReq) GetNeedSearch() interface{} {
 	return *m
 }

-// Bind 映射上下文中的结构体数据
-func (m *SysConfigSearch) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-	err := ctx.ShouldBind(m)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
-	}
-	return err
+type SysConfigGetToSysAppReq struct {
+	IsFrontend     int    `form:"isFrontend" search:"type:exact;column:is_frontend;table:sys_config"`
+}
+
+func (m *SysConfigGetToSysAppReq) GetNeedSearch() interface{} {
+	return *m
 }

 // SysConfigControl 增、改使用的结构体
 type SysConfigControl struct {
-	ID          int    `uri:"Id" comment:"编码"` // 编码
+	Id          int    `uri:"Id" comment:"编码"` // 编码
 	ConfigName  string `json:"configName" comment:""`
 	ConfigKey   string `uri:"configKey" json:"configKey" comment:""`
 	ConfigValue string `json:"configValue" comment:""`
 	ConfigType  string `json:"configType" comment:""`
 	IsFrontend  int    `json:"isFrontend"`
 	Remark      string `json:"remark" comment:""`
-}
-
-// Bind 映射上下文中的结构体数据
-func (s *SysConfigControl) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-	err := ctx.ShouldBindUri(s)
-	if err != nil {
-		log.Debugf("ShouldBindUri error: %s", err.Error())
-		return err
-	}
-	err = ctx.ShouldBindBodyWith(s, binding.JSON)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
-	}
-	var jsonStr []byte
-	jsonStr, err = json.Marshal(s)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
-	}
-	ctx.Set("body", string(jsonStr))
-	return err
+	common.ControlBy
 }

 // Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型
-func (s *SysConfigControl) Generate() (*system.SysConfig, error) {
-	return &system.SysConfig{
-		Model:       common.Model{Id: s.ID},
-		ConfigName:  s.ConfigName,
-		ConfigKey:   s.ConfigKey,
-		ConfigValue: s.ConfigValue,
-		ConfigType:  s.ConfigType,
-		IsFrontend:  s.IsFrontend,
-		Remark:      s.Remark,
-	}, nil
+func (s *SysConfigControl) Generate(model *models.SysConfig) {
+	if s.Id == 0 {
+		model.Model = common.Model{Id: s.Id}
+	}
+	model.ConfigName = s.ConfigName
+	model.ConfigKey = s.ConfigKey
+	model.ConfigValue = s.ConfigValue
+	model.ConfigType = s.ConfigType
+	model.IsFrontend = s.IsFrontend
+	model.Remark = s.Remark
+
 }

 // GetId 获取数据对应的ID
 func (s *SysConfigControl) GetId() interface{} {
-	return s.ID
-}
-
-// SysConfigById 获取单个或者删除的结构体
-type SysConfigById struct {
-	Id         int   `uri:"id"`
-	Ids        []int `json:"ids"`
-}
-
-func (s *SysConfigById) Generate() *SysConfigById {
-	cp := *s
-	return &cp
-}
-
-func (s *SysConfigById) GetId() interface{} {
-	if len(s.Ids) > 0 {
-		s.Ids = append(s.Ids, s.Id)
-		return s.Ids
-	}
 	return s.Id
 }

-func (s *SysConfigById) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-	err := ctx.ShouldBindUri(s)
-	if err != nil {
-		log.Debugf("ShouldBindUri error: %s", err.Error())
-		return err
-	}
-	err = ctx.ShouldBind(s)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
-	}
-	return err
+// GetSetSysConfigReq 增、改使用的结构体
+type GetSetSysConfigReq struct {
+	ConfigKey   string `json:"configKey" comment:""`
+	ConfigValue string `json:"configValue" comment:""`
 }

-func (s *SysConfigById) GenerateM() (*system.SysConfig, error) {
-	return &system.SysConfig{}, nil
+// Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型
+func (s *GetSetSysConfigReq) Generate(model *models.SysConfig) {
+	model.ConfigValue = s.ConfigValue
+}
+
+type UpdateSetSysConfigReq map[string]string
+
+// SysConfigByKeyReq 根据Key获取配置
+type SysConfigByKeyReq struct {
+	ConfigKey string `uri:"configKey" search:"type:contains;column:config_key;table:sys_config"`
+}
+
+func (m *SysConfigByKeyReq) GetNeedSearch() interface{} {
+	return *m
+}
+
+type GetSysConfigByKEYForServiceResp struct {
+	ConfigKey   string `json:"configKey" comment:""`
+	ConfigValue string `json:"configValue" comment:""`
+}
+
+type SysConfigGetReq struct {
+	Id int `uri:"id"`
+}
+
+func (s *SysConfigGetReq) GetId() interface{} {
+	return s.Id
+}
+
+type SysConfigDeleteReq struct {
+	Ids []int `json:"ids"`
+	common.ControlBy
+}
+
+func (s *SysConfigDeleteReq) GetId() interface{} {
+	return s.Ids
 }
@@ -1,95 +0,0 @@
-package dto
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/go-admin-team/go-admin-core/sdk/api"
-
-	"go-admin/app/admin/models"
-	"go-admin/common/dto"
-	common "go-admin/common/models"
-)
-
-type SysContentSearch struct {
-	dto.Pagination `search:"-"`
-	CateId         string `form:"cateId" search:"type:exact;column:cate_id;table:sys_content" comment:"分类"`
-	Name           string `form:"name" search:"type:contains;column:name;table:sys_content" comment:"名称"`
-	Status         string `form:"status" search:"type:exact;column:status;table:sys_content" comment:"状态"`
-}
-
-func (m *SysContentSearch) GetNeedSearch() interface{} {
-	return *m
-}
-
-func (m *SysContentSearch) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-	err := ctx.ShouldBind(m)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
-	}
-	return err
-}
-
-func (m *SysContentSearch) Generate() dto.Index {
-	o := *m
-	return &o
-}
-
-type SysContentControl struct {
-	ID      int    `uri:"ID" comment:""` //
-	CateId  int    `json:"cateId" comment:""`
-	Name    string `json:"name" comment:""`
-	Status  int    `json:"status" comment:""`
-	Img     string `json:"img" comment:""`
-	Content string `json:"content" comment:""`
-	Remark  string `json:"remark" comment:""`
-	Sort    int    `json:"sort" comment:""`
-}
-
-func (s *SysContentControl) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-	err := ctx.ShouldBindUri(s)
-	if err != nil {
-		log.Debugf("ShouldBindUri error: %s", err.Error())
-		return err
-	}
-	err = ctx.ShouldBind(s)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
-	}
-	return err
-}
-
-func (s *SysContentControl) Generate() dto.Control {
-	cp := *s
-	return &cp
-}
-
-func (s *SysContentControl) GenerateM() (common.ActiveRecord, error) {
-	return &models.SysContent{
-		Model:   common.Model{s.ID},
-		CateId:  s.CateId,
-		Name:    s.Name,
-		Status:  s.Status,
-		Img:     s.Img,
-		Content: s.Content,
-		Remark:  s.Remark,
-		Sort:    s.Sort,
-	}, nil
-}
-
-func (s *SysContentControl) GetId() interface{} {
-	return s.ID
-}
-
-type SysContentById struct {
-	dto.ObjectById
-}
-
-func (s *SysContentById) Generate() dto.Control {
-	cp := *s
-	return &cp
-}
-
-func (s *SysContentById) GenerateM() (common.ActiveRecord, error) {
-	return &models.SysContent{}, nil
-}
@@ -1,19 +1,12 @@
 package dto

 import (
-	"encoding/json"
-
-	"github.com/gin-gonic/gin"
-	"github.com/gin-gonic/gin/binding"
-	"github.com/go-admin-team/go-admin-core/sdk/api"
-
-	"go-admin/app/admin/models/system"
-	"go-admin/common/dto"
+	"go-admin/app/admin/models"
+	common "go-admin/common/models"
 )

-// SysConfigSearch 列表或者搜索使用结构体
-type SysDeptSearch struct {
-	dto.Pagination `search:"-"`
+// SysDeptGetPageReq 列表或者搜索使用结构体
+type SysDeptGetPageReq struct {
 	DeptId         int    `form:"deptId" search:"type:exact;column:dept_id;table:sys_dept" comment:"id"`       //id
 	ParentId       int    `form:"parentId" search:"type:exact;column:parent_id;table:sys_dept" comment:"上级部门"` //上级部门
 	DeptPath       string `form:"deptPath" search:"type:exact;column:dept_path;table:sys_dept" comment:""`     //路径
@@ -25,105 +18,89 @@ type SysDeptSearch struct {
 	Status         string `form:"status" search:"type:exact;column:status;table:sys_dept" comment:"状态"`        //状态
 }

-func (m *SysDeptSearch) GetNeedSearch() interface{} {
+func (m *SysDeptGetPageReq) GetNeedSearch() interface{} {
 	return *m
 }

-// Bind 映射上下文中的结构体数据
-func (m *SysDeptSearch) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-	err := ctx.ShouldBind(m)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
-	}
-	return err
+type SysDeptInsertReq struct {
+	DeptId   int    `uri:"id" comment:"编码"`                                         // 编码
+	ParentId int    `json:"parentId" comment:"上级部门" vd:"?"`                         //上级部门
+	DeptPath string `json:"deptPath" comment:""`                                    //路径
+	DeptName string `json:"deptName" comment:"部门名称" vd:"len($)>0"`                  //部门名称
+	Sort     int    `json:"sort" comment:"排序" vd:"?"`                               //排序
+	Leader   string `json:"leader" comment:"负责人" vd:"@:len($)>0; msg:'leader不能为空'"` //负责人
+	Phone    string `json:"phone" comment:"手机" vd:"?"`                              //手机
+	Email    string `json:"email" comment:"邮箱" vd:"?"`                              //邮箱
+	Status   int    `json:"status" comment:"状态" vd:"$>0"`                           //状态
+	common.ControlBy
 }

-// SysConfigControl 增、改使用的结构体
-type SysDeptControl struct {
-	DeptId   int    `uri:"id" comment:"编码"`          // 编码
-	ParentId int    `form:"parentId" comment:"上级部门"` //上级部门
-	DeptPath string `form:"deptPath" comment:""`     //路径
-	DeptName string `form:"deptName" comment:"部门名称"` //部门名称
-	Sort     int    `form:"sort" comment:"排序"`       //排序
-	Leader   string `form:"leader" comment:"负责人"`    //负责人
-	Phone    string `form:"phone" comment:"手机"`      //手机
-	Email    string `form:"email" comment:"邮箱"`      //邮箱
-	Status   string `form:"status" comment:"状态"`     //状态
-}
-
-// Bind 映射上下文中的结构体数据
-func (s *SysDeptControl) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-	err := ctx.ShouldBindUri(s)
-	if err != nil {
-		log.Debugf("ShouldBindUri error: %s", err.Error())
-		return err
+func (s *SysDeptInsertReq) Generate(model *models.SysDept) {
+	if s.DeptId != 0 {
+		model.DeptId = s.DeptId
 	}
-	err = ctx.ShouldBindBodyWith(s, binding.JSON)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
-	}
-	var jsonStr []byte
-	jsonStr, err = json.Marshal(s)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
-	}
-	ctx.Set("body", string(jsonStr))
-	return err
-}
-
-// Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型
-func (s *SysDeptControl) Generate() (*system.SysDept, error) {
-	return &system.SysDept{
-		DeptId:   s.DeptId,
-		DeptName: s.DeptName,
-		ParentId: s.ParentId,
-		DeptPath: s.DeptPath,
-		Sort:     s.Sort,
-		Leader:   s.Leader,
-		Phone:    s.Phone,
-		Email:    s.Email,
-		Status:   s.Status,
-	}, nil
+	model.DeptName = s.DeptName
+	model.ParentId = s.ParentId
+	model.DeptPath = s.DeptPath
+	model.Sort = s.Sort
+	model.Leader = s.Leader
+	model.Phone = s.Phone
+	model.Email = s.Email
+	model.Status = s.Status
 }

 // GetId 获取数据对应的ID
-func (s *SysDeptControl) GetId() interface{} {
+func (s *SysDeptInsertReq) GetId() interface{} {
 	return s.DeptId
 }

-// SysConfigById 获取单个或者删除的结构体
-type SysDeptById struct {
-	Id  int   `uri:"id"`
-	Ids []int `json:"ids"`
+type SysDeptUpdateReq struct {
+	DeptId   int    `uri:"id" comment:"编码"`                                         // 编码
+	ParentId int    `json:"parentId" comment:"上级部门" vd:"?"`                         //上级部门
+	DeptPath string `json:"deptPath" comment:""`                                    //路径
+	DeptName string `json:"deptName" comment:"部门名称" vd:"len($)>0"`                  //部门名称
+	Sort     int    `json:"sort" comment:"排序" vd:"?"`                               //排序
+	Leader   string `json:"leader" comment:"负责人" vd:"@:len($)>0; msg:'leader不能为空'"` //负责人
+	Phone    string `json:"phone" comment:"手机" vd:"?"`                              //手机
+	Email    string `json:"email" comment:"邮箱" vd:"?"`                              //邮箱
+	Status   int    `json:"status" comment:"状态" vd:"$>0"`                           //状态
+	common.ControlBy
 }

-func (s *SysDeptById) Generate() *SysDeptById {
-	cp := *s
-	return &cp
+// Generate 结构体数据转化 从 SysDeptControl 至 SysDept 对应的模型
+func (s *SysDeptUpdateReq) Generate(model *models.SysDept) {
+	if s.DeptId != 0 {
+		model.DeptId = s.DeptId
+	}
+	model.DeptName = s.DeptName
+	model.ParentId = s.ParentId
+	model.DeptPath = s.DeptPath
+	model.Sort = s.Sort
+	model.Leader = s.Leader
+	model.Phone = s.Phone
+	model.Email = s.Email
+	model.Status = s.Status
 }

-func (s *SysDeptById) GetId() interface{} {
+// GetId 获取数据对应的ID
+func (s *SysDeptUpdateReq) GetId() interface{} {
+	return s.DeptId
+}
+
+type SysDeptGetReq struct {
+	Id int `uri:"id"`
+}
+
+func (s *SysDeptGetReq) GetId() interface{} {
 	return s.Id
 }

-func (s *SysDeptById) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-	err := ctx.ShouldBindUri(s)
-	if err != nil {
-		log.Debugf("ShouldBindUri error: %s", err.Error())
-		return err
-	}
-	err = ctx.ShouldBind(s)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
-	}
-	return err
+type SysDeptDeleteReq struct {
+	Ids []int `json:"ids"`
 }

-func (s *SysDeptById) GenerateM() (*system.SysDept, error) {
-	return &system.SysDept{}, nil
+func (s *SysDeptDeleteReq) GetId() interface{} {
+	return s.Ids
 }

 type DeptLabel struct {
@@ -1,17 +1,12 @@
 package dto

 import (
-	"net/http"
-
-	"github.com/gin-gonic/gin"
-	"github.com/go-admin-team/go-admin-core/sdk/api"
-
-	"go-admin/app/admin/models/system"
+	"go-admin/app/admin/models"
 	"go-admin/common/dto"
 	common "go-admin/common/models"
 )

-type SysDictDataSearch struct {
+type SysDictDataGetPageReq struct {
 	dto.Pagination `search:"-"`
 	Id             int    `form:"id" search:"type:exact;column:dict_code;table:sys_dict_data" comment:""`
 	DictLabel      string `form:"dictLabel" search:"type:contains;column:dict_label;table:sys_dict_data" comment:""`
@@ -20,25 +15,49 @@ type SysDictDataSearch struct {
 	Status         string `form:"status" search:"type:exact;column:status;table:sys_dict_data" comment:""`
 }

-func (m *SysDictDataSearch) GetNeedSearch() interface{} {
+func (m *SysDictDataGetPageReq) GetNeedSearch() interface{} {
 	return *m
 }

-func (m *SysDictDataSearch) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-	err := ctx.ShouldBind(m)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
-	}
-	return err
+type SysDictDataGetAllResp struct {
+	DictLabel string `json:"label"`
+	DictValue string `json:"value"`
 }

-func (m *SysDictDataSearch) Generate() dto.Index {
-	o := *m
-	return &o
+type SysDictDataInsertReq struct {
+	Id        int    `json:"-" comment:""`
+	DictSort  int    `json:"dictSort" comment:""`
+	DictLabel string `json:"dictLabel" comment:""`
+	DictValue string `json:"dictValue" comment:""`
+	DictType  string `json:"dictType" comment:""`
+	CssClass  string `json:"cssClass" comment:""`
+	ListClass string `json:"listClass" comment:""`
+	IsDefault string `json:"isDefault" comment:""`
+	Status    int    `json:"status" comment:""`
+	Default   string `json:"default" comment:""`
+	Remark    string `json:"remark" comment:""`
+	common.ControlBy
 }

-type SysDictDataControl struct {
+func (s *SysDictDataInsertReq) Generate(model *models.SysDictData) {
+	model.DictCode = s.Id
+	model.DictSort = s.DictSort
+	model.DictLabel = s.DictLabel
+	model.DictValue = s.DictValue
+	model.DictType = s.DictType
+	model.CssClass = s.CssClass
+	model.ListClass = s.ListClass
+	model.IsDefault = s.IsDefault
+	model.Status = s.Status
+	model.Default = s.Default
+	model.Remark = s.Remark
+}
+
+func (s *SysDictDataInsertReq) GetId() interface{} {
+	return s.Id
+}
+
+type SysDictDataUpdateReq struct {
 	Id        int    `uri:"dictCode" comment:""`
 	DictSort  int    `json:"dictSort" comment:""`
 	DictLabel string `json:"dictLabel" comment:""`
@@ -47,80 +66,43 @@ type SysDictDataControl struct {
 	CssClass  string `json:"cssClass" comment:""`
 	ListClass string `json:"listClass" comment:""`
 	IsDefault string `json:"isDefault" comment:""`
-	Status    string `json:"status" comment:""`
+	Status    int    `json:"status" comment:""`
 	Default   string `json:"default" comment:""`
 	Remark    string `json:"remark" comment:""`
+	common.ControlBy
 }

-func (s *SysDictDataControl) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-	err := ctx.ShouldBindUri(s)
-	if err != nil {
-		log.Debugf("ShouldBindUri error: %s", err.Error())
-		return err
-	}
-	err = ctx.ShouldBind(s)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
-	}
-	return err
+func (s *SysDictDataUpdateReq) Generate(model *models.SysDictData) {
+	model.DictCode = s.Id
+	model.DictSort = s.DictSort
+	model.DictLabel = s.DictLabel
+	model.DictValue = s.DictValue
+	model.DictType = s.DictType
+	model.CssClass = s.CssClass
+	model.ListClass = s.ListClass
+	model.IsDefault = s.IsDefault
+	model.Status = s.Status
+	model.Default = s.Default
+	model.Remark = s.Remark
 }

-func (s *SysDictDataControl) Generate() dto.Control {
-	cp := *s
-	return &cp
-}
-
-func (s *SysDictDataControl) GenerateM() (common.ActiveRecord, error) {
-	return &system.SysDictData{
-		DictCode:  s.Id,
-		DictSort:  s.DictSort,
-		DictLabel: s.DictLabel,
-		DictValue: s.DictValue,
-		DictType:  s.DictType,
-		CssClass:  s.CssClass,
-		ListClass: s.ListClass,
-		IsDefault: s.IsDefault,
-		Status:    s.Status,
-		Default:   s.Default,
-		Remark:    s.Remark,
-	}, nil
-}
-
-func (s *SysDictDataControl) GetId() interface{} {
+func (s *SysDictDataUpdateReq) GetId() interface{} {
 	return s.Id
 }

-type SysDictDataById struct {
-	Id  int   `uri:"dictCode"`
-	Ids []int `json:"ids"`
+type SysDictDataGetReq struct {
+	Id int `uri:"dictCode"`
 }

-func (s *SysDictDataById) Bind(ctx *gin.Context) error {
-	if ctx.Request.Method == http.MethodDelete {
-		err := ctx.ShouldBind(&s.Ids)
-		if err != nil {
-			return err
-		}
-		if len(s.Ids) > 0 {
-			return nil
-		}
-	}
-	return ctx.ShouldBindUri(s)
-}
-
-func (s *SysDictDataById) GetId() interface{} {
-	if len(s.Ids) > 0 {
-		return s.Ids
-	}
+func (s *SysDictDataGetReq) GetId() interface{} {
 	return s.Id
 }

-func (s *SysDictDataById) Generate() dto.Control {
-	cp := *s
-	return &cp
+type SysDictDataDeleteReq struct {
+	Ids              []int `json:"ids"`
+	common.ControlBy `json:"-"`
 }

-func (s *SysDictDataById) GenerateM() (common.ActiveRecord, error) {
-	return &system.SysDictData{}, nil
+func (s *SysDictDataDeleteReq) GetId() interface{} {
+	return s.Ids
 }
@@ -1,15 +1,13 @@
 package dto

 import (
-	"github.com/gin-gonic/gin"
+	"go-admin/app/admin/models"

-	"github.com/go-admin-team/go-admin-core/sdk/api"
-	"go-admin/app/admin/models/system"
 	"go-admin/common/dto"
 	common "go-admin/common/models"
 )

-type SysDictTypeSearch struct {
+type SysDictTypeGetPageReq struct {
 	dto.Pagination `search:"-"`
 	DictId         []int  `form:"dictId" search:"type:in;column:dict_id;table:sys_dict_type"`
 	DictName       string `form:"dictName" search:"type:icontains;column:dict_name;table:sys_dict_type"`
@@ -17,79 +15,75 @@ type SysDictTypeSearch struct {
 	Status         int    `form:"status" search:"type:exact;column:status;table:sys_dict_type"`
 }

-func (m *SysDictTypeSearch) GetNeedSearch() interface{} {
+type SysDictTypeOrder struct {
+	DictIdOrder string `search:"type:order;column:dict_id;table:sys_dict_type" form:"dictIdOrder"`
+}
+
+func (m *SysDictTypeGetPageReq) GetNeedSearch() interface{} {
 	return *m
 }

-func (m *SysDictTypeSearch) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-	err := ctx.ShouldBind(m)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
+type SysDictTypeInsertReq struct {
+	Id       int    `uri:"id"`
+	DictName string `json:"dictName"`
+	DictType string `json:"dictType"`
+	Status   int    `json:"status"`
+	Remark   string `json:"remark"`
+	common.ControlBy
+}
+
+func (s *SysDictTypeInsertReq) Generate(model *models.SysDictType) {
+	if s.Id != 0 {
+		model.ID = s.Id
 	}
-	return err
+	model.DictName = s.DictName
+	model.DictType = s.DictType
+	model.Status = s.Status
+	model.Remark = s.Remark
+
 }

-func (m *SysDictTypeSearch) Generate() dto.Index {
-	o := *m
-	return &o
-}
-
-type SysDictTypeControl struct {
-	Id int `uri:"id" comment:""` //
-
-	DictName string `json:"dictName" comment:""`
-
-	DictType string `json:"dictType" comment:""`
-
-	Status string `json:"status" comment:""`
-
-	Remark string `json:"remark" comment:""`
-}
-
-func (s *SysDictTypeControl) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-	err := ctx.ShouldBindUri(s)
-	if err != nil {
-		log.Debugf("ShouldBindUri error: %s", err.Error())
-		return err
-	}
-	err = ctx.ShouldBind(s)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
-	}
-	return err
-}
-
-func (s *SysDictTypeControl) Generate() dto.Control {
-	cp := *s
-	return &cp
-}
-
-func (s *SysDictTypeControl) GenerateM() (common.ActiveRecord, error) {
-	return &system.SysDictType{
-
-		ID:       s.Id,
-		DictName: s.DictName,
-		DictType: s.DictType,
-		Status:   s.Status,
-		Remark:   s.Remark,
-	}, nil
-}
-
-func (s *SysDictTypeControl) GetId() interface{} {
+func (s *SysDictTypeInsertReq) GetId() interface{} {
 	return s.Id
 }

-type SysDictTypeById struct {
-	dto.ObjectById
+type SysDictTypeUpdateReq struct {
+	Id       int    `uri:"id"`
+	DictName string `json:"dictName"`
+	DictType string `json:"dictType"`
+	Status   int    `json:"status"`
+	Remark   string `json:"remark"`
+	common.ControlBy
 }

-func (s *SysDictTypeById) Generate() dto.Control {
-	cp := *s
-	return &cp
+func (s *SysDictTypeUpdateReq) Generate(model *models.SysDictType) {
+	if s.Id != 0 {
+		model.ID = s.Id
+	}
+	model.DictName = s.DictName
+	model.DictType = s.DictType
+	model.Status = s.Status
+	model.Remark = s.Remark
+
 }

-func (s *SysDictTypeById) GenerateM() (common.ActiveRecord, error) {
-	return &system.SysDictType{}, nil
+func (s *SysDictTypeUpdateReq) GetId() interface{} {
+	return s.Id
+}
+
+type SysDictTypeGetReq struct {
+	Id int `uri:"id"`
+}
+
+func (s *SysDictTypeGetReq) GetId() interface{} {
+	return s.Id
+}
+
+type SysDictTypeDeleteReq struct {
+	Ids []int `json:"ids"`
+	common.ControlBy
+}
+
+func (s *SysDictTypeDeleteReq) GetId() interface{} {
+	return s.Ids
 }
@@ -1,99 +0,0 @@
-package dto
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/go-admin-team/go-admin-core/sdk/api"
-
-	"go-admin/app/admin/models"
-	"go-admin/common/dto"
-	common "go-admin/common/models"
-)
-
-type SysFileDirSearch struct {
-	dto.Pagination `search:"-"`
-
-	ID    int    `form:"Id" search:"type:exact;column:id;table:sys_file_dir" comment:"标识"`
-	Label string `form:"label" search:"type:exact;column:label;table:sys_file_dir" comment:"目录名称"`
-	PId   string `form:"pId" search:"type:exact;column:p_id;table:sys_file_dir" comment:"上级目录"`
-	//Sort  string `form:"sort" search:"type:exact;column:sort;table:sys_file_dir" comment:"排序"`
-	Path string `form:"path" search:"type:exact;column:path;table:sys_file_dir" comment:"路径"`
-}
-
-func (m *SysFileDirSearch) GetNeedSearch() interface{} {
-	return *m
-}
-
-func (m *SysFileDirSearch) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-	err := ctx.ShouldBind(m)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
-	}
-	return err
-}
-
-func (m *SysFileDirSearch) Generate() dto.Index {
-	o := *m
-	return &o
-}
-
-type SysFileDirControl struct {
-	ID       int    `uri:"Id" comment:"标识"` // 标识
-	Label    string `json:"label" comment:"目录名称"`
-	PId      int    `json:"pId" comment:"上级目录"`
-	Sort     string `json:"sort" comment:"排序"`
-	Path     string `json:"path" comment:"路径"`
-	CreateBy int    `json:"-"`
-	UpdateBy int    `json:"-"`
-}
-
-func (s *SysFileDirControl) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-	err := ctx.ShouldBindUri(s)
-	if err != nil {
-		log.Debugf("ShouldBindUri error: %s", err.Error())
-		return err
-	}
-	err = ctx.ShouldBind(s)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
-	}
-	return err
-}
-
-func (s *SysFileDirControl) Generate() dto.Control {
-	cp := *s
-	return &cp
-}
-
-func (s *SysFileDirControl) GenerateM() (common.ActiveRecord, error) {
-	return &models.SysFileDir{
-		Model: common.Model{Id: s.ID},
-		Label: s.Label,
-		PId:   s.PId,
-		//Sort:  s.Sort,
-		Path: s.Path,
-		ControlBy: common.ControlBy{
-			CreateBy: s.CreateBy,
-			UpdateBy: s.UpdateBy,
-		},
-	}, nil
-}
-
-func (s *SysFileDirControl) GetId() interface{} {
-	return s.ID
-}
-
-type SysFileDirById struct {
-	dto.ObjectById
-	UpdateBy int `json:"-"`
-}
-
-func (s *SysFileDirById) Generate() dto.Control {
-	cp := *s
-	return &cp
-}
-
-func (s *SysFileDirById) GenerateM() (common.ActiveRecord, error) {
-	return &models.SysFileDir{}, nil
-}
@@ -1,52 +0,0 @@
-package dto
-
-import (
-	"go-admin/app/admin/models"
-	"go-admin/common/dto"
-	common "go-admin/common/models"
-)
-
-type SysFileInfoSearch struct {
-	dto.Pagination `search:"-"`
-	ID             int    `form:"Id" search:"type:exact;column:id;table:sys_file_info" comment:"标识"`
-	Type           string `form:"type" search:"type:exact;column:type;table:sys_file_info" comment:"类型"`
-	Name           string `form:"name" search:"type:exact;column:name;table:sys_file_info" comment:"名称"`
-	PId            string `form:"pId" search:"type:exact;column:p_id;table:sys_file_info" comment:"目录"`
-	Source         string `form:"source" search:"type:exact;column:source;table:sys_file_info" comment:"来源"`
-}
-
-func (m *SysFileInfoSearch) GetNeedSearch() interface{} {
-	return *m
-}
-
-type SysFileInfoControl struct {
-	ID       int    `uri:"id" comment:"标识"` // 标识
-	Type     string `json:"type" comment:"类型"`
-	Name     string `json:"name" comment:"名称"`
-	Size     string `json:"size" comment:"大小"`
-	PId      int    `json:"pId" comment:"目录"`
-	Source   string `json:"source" comment:"来源"`
-	Url      string `json:"url" comment:"地址"`
-	FullUrl  string `json:"fullUrl" comment:"全地址"`
-	CreateBy int    `json:"-"`
-	UpdateBy int    `json:"-"`
-}
-
-func (s *SysFileInfoControl) Generate() (*models.SysFileInfo, error) {
-	return &models.SysFileInfo{
-		Model:     common.Model{Id: s.ID},
-		Type:      s.Type,
-		Name:      s.Name,
-		Size:      s.Size,
-		PId:       s.PId,
-		Source:    s.Source,
-		Url:       s.Url,
-		FullUrl:   s.FullUrl,
-		ControlBy: common.ControlBy{CreateBy: s.CreateBy, UpdateBy: s.UpdateBy},
-	}, nil
-}
-
-type SysFileInfoById struct {
-	dto.ObjectById
-	UpdateBy int `json:"-"`
-}
@@ -3,35 +3,28 @@ package dto
 import (
 	"time"

-	"github.com/gin-gonic/gin"
-	"github.com/go-admin-team/go-admin-core/sdk/api"
-
-	"go-admin/app/admin/models/system"
 	"go-admin/common/dto"
-	common "go-admin/common/models"
 )

-type SysLoginLogSearch struct {
+type SysLoginLogGetPageReq struct {
 	dto.Pagination `search:"-"`
 	Username       string `form:"username" search:"type:exact;column:username;table:sys_login_log" comment:"用户名"`
 	Status         string `form:"status" search:"type:exact;column:status;table:sys_login_log" comment:"状态"`
 	Ipaddr         string `form:"ipaddr" search:"type:exact;column:ipaddr;table:sys_login_log" comment:"ip地址"`
 	LoginLocation  string `form:"loginLocation" search:"type:exact;column:login_location;table:sys_login_log" comment:"归属地"`
+	BeginTime      string `form:"beginTime" search:"type:gte;column:ctime;table:sys_login_log" comment:"创建时间"`
+	EndTime        string `form:"endTime" search:"type:lte;column:ctime;table:sys_login_log" comment:"创建时间"`
+	SysLoginLogOrder
 }

-func (m *SysLoginLogSearch) GetNeedSearch() interface{} {
+type SysLoginLogOrder struct {
+	CreatedAtOrder string `search:"type:order;column:created_at;table:sys_login_log" form:"createdAtOrder"`
+}
+
+func (m *SysLoginLogGetPageReq) GetNeedSearch() interface{} {
 	return *m
 }

-func (m *SysLoginLogSearch) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-	err := ctx.ShouldBind(m)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
-	}
-	return err
-}
-
 type SysLoginLogControl struct {
 	ID            int       `uri:"Id" comment:"主键"` // 主键
 	Username      string    `json:"username" comment:"用户名"`
@@ -46,68 +39,19 @@ type SysLoginLogControl struct {
 	Msg           string    `json:"msg" comment:"信息"`
 }

-func (s *SysLoginLogControl) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-	err := ctx.ShouldBindUri(s)
-	if err != nil {
-		log.Debugf("ShouldBindUri error: %s", err.Error())
-		return err
-	}
-	err = ctx.ShouldBind(s)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
-	}
-	return err
+type SysLoginLogGetReq struct {
+	Id int `uri:"id"`
 }

-func (s *SysLoginLogControl) Generate() (*system.SysLoginLog, error) {
-	return &system.SysLoginLog{
-		Model:         common.Model{Id: s.ID},
-		Username:      s.Username,
-		Status:        s.Status,
-		Ipaddr:        s.Ipaddr,
-		LoginLocation: s.LoginLocation,
-		Browser:       s.Browser,
-		Os:            s.Os,
-		Platform:      s.Platform,
-		LoginTime:     s.LoginTime,
-		Remark:        s.Remark,
-		Msg:           s.Msg,
-	}, nil
-}
-
-func (s *SysLoginLogControl) GetId() interface{} {
-	return s.ID
-}
-
-type SysLoginLogById struct {
-	Id  int   `uri:"id"`
-	Ids []int `json:"ids"`
-}
-
-func (s *SysLoginLogById) GetId() interface{} {
+func (s *SysLoginLogGetReq) GetId() interface{} {
 	return s.Id
 }

-func (s *SysLoginLogById) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-	err := ctx.ShouldBindUri(s)
-	if err != nil {
-		log.Debugf("ShouldBindUri error: %s", err.Error())
-		return err
-	}
-	err = ctx.ShouldBind(&s.Ids)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
-	}
-	return err
+// SysLoginLogDeleteReq 功能删除请求参数
+type SysLoginLogDeleteReq struct {
+	Ids []int `json:"ids"`
 }

-func (s *SysLoginLogById) Generate() *SysLoginLogById {
-	cp := *s
-	return &cp
-}
-
-func (s *SysLoginLogById) GenerateM() (*system.SysLoginLog, error) {
-	return &system.SysLoginLog{}, nil
-}
+func (s *SysLoginLogDeleteReq) GetId() interface{} {
+	return s.Ids
+}
@@ -1,152 +1,156 @@
 package dto

 import (
-	"encoding/json"
+	"go-admin/app/admin/models"
+	common "go-admin/common/models"

-	"github.com/gin-gonic/gin"
-	"github.com/gin-gonic/gin/binding"
-	"github.com/go-admin-team/go-admin-core/sdk/api"
-
-	"go-admin/app/admin/models/system"
 	"go-admin/common/dto"
 )

-// SysMenuSearch 列表或者搜索使用结构体
-type SysMenuSearch struct {
+// SysMenuGetPageReq 列表或者搜索使用结构体
+type SysMenuGetPageReq struct {
 	dto.Pagination `search:"-"`
-	ParentId       int    `form:"parentId" search:"type:exact;column:parent_id;table:sys_dept" comment:"上级部门"` //上级部门
-	DeptPath       string `form:"deptPath" search:"type:exact;column:dept_path;table:sys_dept" comment:""`     //路径
-	DeptName       string `form:"deptName" search:"type:exact;column:dept_name;table:sys_dept" comment:"部门名称"` //部门名称
-	Sort           int    `form:"sort" search:"type:exact;column:sort;table:sys_dept" comment:"排序"`            //排序
-	Leader         string `form:"leader" search:"type:exact;column:leader;table:sys_dept" comment:"负责人"`       //负责人
-	Phone          string `form:"phone" search:"type:exact;column:phone;table:sys_dept" comment:"手机"`          //手机
-	Email          string `form:"email" search:"type:exact;column:email;table:sys_dept" comment:"邮箱"`          //邮箱
-	Status         string `form:"status" search:"type:exact;column:status;table:sys_dept" comment:"状态"`        //状态
+	Title          string `form:"title" search:"type:contains;column:title;table:sys_menu" comment:"菜单名称"`  // 菜单名称
+	Visible        int    `form:"visible" search:"type:exact;column:visible;table:sys_menu" comment:"显示状态"` // 显示状态
 }

-func (m *SysMenuSearch) GetNeedSearch() interface{} {
+func (m *SysMenuGetPageReq) GetNeedSearch() interface{} {
 	return *m
 }

-// Bind 映射上下文中的结构体数据
-func (m *SysMenuSearch) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-	err := ctx.ShouldBind(m)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
-	}
-	return err
+type SysMenuInsertReq struct {
+	MenuId     int             `uri:"id" comment:"编码"`            // 编码
+	MenuName   string          `form:"menuName" comment:"菜单name"` //菜单name
+	Title      string          `form:"title" comment:"显示名称"`      //显示名称
+	Icon       string          `form:"icon" comment:"图标"`         //图标
+	Path       string          `form:"path" comment:"路径"`         //路径
+	Paths      string          `form:"paths" comment:"id路径"`      //id路径
+	MenuType   string          `form:"menuType" comment:"菜单类型"`   //菜单类型
+	SysApi     []models.SysApi `form:"sysApi"`
+	Apis       []int           `form:"apis"`
+	Action     string          `form:"action" comment:"请求方式"`      //请求方式
+	Permission string          `form:"permission" comment:"权限编码"`  //权限编码
+	ParentId   int             `form:"parentId" comment:"上级菜单"`    //上级菜单
+	NoCache    bool            `form:"noCache" comment:"是否缓存"`     //是否缓存
+	Breadcrumb string          `form:"breadcrumb" comment:"是否面包屑"` //是否面包屑
+	Component  string          `form:"component" comment:"组件"`     //组件
+	Sort       int             `form:"sort" comment:"排序"`          //排序
+	Visible    string          `form:"visible" comment:"是否显示"`     //是否显示
+	IsFrame    string          `form:"isFrame" comment:"是否frame"`  //是否frame
+	common.ControlBy
 }

-// SysConfigControl 增、改使用的结构体
-type SysMenuControl struct {
-	MenuId     int    `uri:"id" comment:"编码"`             // 编码
-	MenuName   string `form:"menuName" comment:"菜单name"`  //菜单name
-	Title      string `form:"title" comment:"显示名称"`       //显示名称
-	Icon       string `form:"icon" comment:"图标"`          //图标
-	Path       string `form:"path" comment:"路径"`          //路径
-	Paths      string `form:"paths" comment:"id路径"`       //id路径
-	MenuType   string `form:"menuType" comment:"菜单类型"`    //菜单类型
-	Action     string `form:"action" comment:"请求方式"`      //请求方式
-	Permission string `form:"permission" comment:"权限编码"`  //权限编码
-	ParentId   int    `form:"parentId" comment:"上级菜单"`    //上级菜单
-	NoCache    bool   `form:"noCache" comment:"是否缓存"`     //是否缓存
-	Breadcrumb string `form:"breadcrumb" comment:"是否面包屑"` //是否面包屑
-	Component  string `form:"component" comment:"组件"`     //组件
-	Sort       int    `form:"sort" comment:"排序"`          //排序
-	Visible    string `form:"visible" comment:"是否显示"`     //是否显示
-	IsFrame    string `form:"isFrame" comment:"是否frame"`  //是否frame
+func (s *SysMenuInsertReq) Generate(model *models.SysMenu) {
+	if s.MenuId != 0 {
+		model.MenuId = s.MenuId
+	}
+	model.MenuName = s.MenuName
+	model.Title = s.Title
+	model.Icon = s.Icon
+	model.Path = s.Path
+	model.Paths = s.Paths
+	model.MenuType = s.MenuType
+	model.Action = s.Action
+	model.SysApi = s.SysApi
+	model.Permission = s.Permission
+	model.ParentId = s.ParentId
+	model.NoCache = s.NoCache
+	model.Breadcrumb = s.Breadcrumb
+	model.Component = s.Component
+	model.Sort = s.Sort
+	model.Visible = s.Visible
+	model.IsFrame = s.IsFrame
+	if s.CreateBy != 0 {
+		model.CreateBy = s.CreateBy
+	}
+	if s.UpdateBy != 0 {
+		model.UpdateBy = s.UpdateBy
+	}
 }

-// Bind 映射上下文中的结构体数据
-func (s *SysMenuControl) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-	err := ctx.ShouldBindUri(s)
-	if err != nil {
-		log.Debugf("ShouldBindUri error: %s", err.Error())
-		return err
-	}
-	err = ctx.ShouldBindBodyWith(s, binding.JSON)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
-	}
-	var jsonStr []byte
-	jsonStr, err = json.Marshal(s)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
-	}
-	ctx.Set("body", string(jsonStr))
-	return err
-}
-
-// Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型
-func (s *SysMenuControl) Generate() (*system.SysMenu, error) {
-	return &system.SysMenu{
-		MenuId:     s.MenuId,
-		MenuName:   s.MenuName,
-		Title:      s.Title,
-		Icon:       s.Icon,
-		Path:       s.Path,
-		Paths:      s.Paths,
-		MenuType:   s.MenuType,
-		Action:     s.Action,
-		Permission: s.Permission,
-		ParentId:   s.ParentId,
-		NoCache:    s.NoCache,
-		Breadcrumb: s.Breadcrumb,
-		Component:  s.Component,
-		Sort:       s.Sort,
-		Visible:    s.Visible,
-		IsFrame:    s.IsFrame,
-	}, nil
-}
-
-// GetId 获取数据对应的ID
-func (s *SysMenuControl) GetId() interface{} {
+func (s *SysMenuInsertReq) GetId() interface{} {
 	return s.MenuId
 }

-// SysConfigById 获取单个或者删除的结构体
-type SysMenuById struct {
-	Id  int   `uri:"id"`
-	Ids []int `json:"ids"`
+type SysMenuUpdateReq struct {
+	MenuId     int             `uri:"id" comment:"编码"`            // 编码
+	MenuName   string          `form:"menuName" comment:"菜单name"` //菜单name
+	Title      string          `form:"title" comment:"显示名称"`      //显示名称
+	Icon       string          `form:"icon" comment:"图标"`         //图标
+	Path       string          `form:"path" comment:"路径"`         //路径
+	Paths      string          `form:"paths" comment:"id路径"`      //id路径
+	MenuType   string          `form:"menuType" comment:"菜单类型"`   //菜单类型
+	SysApi     []models.SysApi `form:"sysApi"`
+	Apis       []int           `form:"apis"`
+	Action     string          `form:"action" comment:"请求方式"`      //请求方式
+	Permission string          `form:"permission" comment:"权限编码"`  //权限编码
+	ParentId   int             `form:"parentId" comment:"上级菜单"`    //上级菜单
+	NoCache    bool            `form:"noCache" comment:"是否缓存"`     //是否缓存
+	Breadcrumb string          `form:"breadcrumb" comment:"是否面包屑"` //是否面包屑
+	Component  string          `form:"component" comment:"组件"`     //组件
+	Sort       int             `form:"sort" comment:"排序"`          //排序
+	Visible    string          `form:"visible" comment:"是否显示"`     //是否显示
+	IsFrame    string          `form:"isFrame" comment:"是否frame"`  //是否frame
+	common.ControlBy
 }

-func (s *SysMenuById) Generate() *SysMenuById {
-	cp := *s
-	return &cp
+func (s *SysMenuUpdateReq) Generate(model *models.SysMenu) {
+	if s.MenuId != 0 {
+		model.MenuId = s.MenuId
+	}
+	model.MenuName = s.MenuName
+	model.Title = s.Title
+	model.Icon = s.Icon
+	model.Path = s.Path
+	model.Paths = s.Paths
+	model.MenuType = s.MenuType
+	model.Action = s.Action
+	model.SysApi = s.SysApi
+	model.Permission = s.Permission
+	model.ParentId = s.ParentId
+	model.NoCache = s.NoCache
+	model.Breadcrumb = s.Breadcrumb
+	model.Component = s.Component
+	model.Sort = s.Sort
+	model.Visible = s.Visible
+	model.IsFrame = s.IsFrame
+	if s.CreateBy != 0 {
+		model.CreateBy = s.CreateBy
+	}
+	if s.UpdateBy != 0 {
+		model.UpdateBy = s.UpdateBy
+	}
 }

-func (s *SysMenuById) GetId() interface{} {
+func (s *SysMenuUpdateReq) GetId() interface{} {
+	return s.MenuId
+}
+
+type SysMenuGetReq struct {
+	Id int `uri:"id"`
+}
+
+func (s *SysMenuGetReq) GetId() interface{} {
 	return s.Id
 }

-func (s *SysMenuById) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-	err := ctx.ShouldBindUri(s)
-	if err != nil {
-		log.Debugf("ShouldBindUri error: %s", err.Error())
-		return err
-	}
-	err = ctx.ShouldBind(s)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
-	}
-	return err
+type SysMenuDeleteReq struct {
+	Ids []int `json:"ids"`
+	common.ControlBy
 }

-func (s *SysMenuById) GenerateM() (*system.SysMenu, error) {
-	return &system.SysMenu{}, nil
+func (s *SysMenuDeleteReq) GetId() interface{} {
+	return s.Ids
 }

 type MenuLabel struct {
-	Id       int         `json:"id" gorm:"-"`
-	Label    string      `json:"label" gorm:"-"`
-	Children []MenuLabel `json:"children" gorm:"-"`
+	Id       int         `json:"id,omitempty" gorm:"-"`
+	Label    string      `json:"label,omitempty" gorm:"-"`
+	Children []MenuLabel `json:"children,omitempty" gorm:"-"`
 }

 type MenuRole struct {
-	system.SysMenus
+	models.SysMenu
 	IsSelect bool `json:"is_select" gorm:"-"`
 }

@@ -3,37 +3,32 @@ package dto
 import (
 	"time"

-	"github.com/gin-gonic/gin"
-	"github.com/go-admin-team/go-admin-core/sdk/api"
-
-	"go-admin/app/admin/models/system"
+	"go-admin/app/admin/models"
 	"go-admin/common/dto"
 	common "go-admin/common/models"
 )

-type SysOperaLogSearch struct {
+type SysOperaLogGetPageReq struct {
 	dto.Pagination `search:"-"`
-
-	Title         string `form:"title" search:"type:contains;column:title;table:sys_opera_log" comment:"操作模块"`
-	Method        string `form:"method" search:"type:contains;column:method;table:sys_opera_log" comment:"函数"`
-	RequestMethod string `form:"requestMethod" search:"type:contains;column:request_method;table:sys_opera_log" comment:"请求方式"`
-	OperUrl       string `form:"operUrl" search:"type:contains;column:oper_url;table:sys_opera_log" comment:"访问地址"`
-	OperIp        string `form:"operIp" search:"type:exact;column:oper_ip;table:sys_opera_log" comment:"客户端ip"`
+	Title          string `form:"title" search:"type:contains;column:title;table:sys_opera_log" comment:"操作模块"`
+	Method         string `form:"method" search:"type:contains;column:method;table:sys_opera_log" comment:"函数"`
+	RequestMethod  string `form:"requestMethod" search:"type:contains;column:request_method;table:sys_opera_log" comment:"请求方式"`
+	OperUrl        string `form:"operUrl" search:"type:contains;column:oper_url;table:sys_opera_log" comment:"访问地址"`
+	OperIp         string `form:"operIp" search:"type:exact;column:oper_ip;table:sys_opera_log" comment:"客户端ip"`
+	Status         int    `form:"status" search:"type:exact;column:status;table:sys_opera_log" comment:"状态"`
+	BeginTime      string `form:"beginTime" search:"type:gte;column:ctime;table:sys_opera_log" comment:"创建时间"`
+	EndTime        string `form:"endTime" search:"type:lte;column:ctime;table:sys_opera_log" comment:"创建时间"`
+	SysOperaLogOrder
 }

-func (m *SysOperaLogSearch) GetNeedSearch() interface{} {
+type SysOperaLogOrder struct {
+	CreatedAtOrder string `search:"type:order;column:created_at;table:sys_opera_log" form:"createdAtOrder"`
+}
+
+func (m *SysOperaLogGetPageReq) GetNeedSearch() interface{} {
 	return *m
 }

-func (m *SysOperaLogSearch) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-	err := ctx.ShouldBind(m)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
-	}
-	return err
-}
-
 type SysOperaLogControl struct {
 	ID            int       `uri:"Id" comment:"编码"` // 编码
 	Title         string    `json:"title" comment:"操作模块"`
@@ -56,22 +51,8 @@ type SysOperaLogControl struct {
 	UserAgent     string    `json:"userAgent" comment:"ua"`
 }

-func (s *SysOperaLogControl) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-	err := ctx.ShouldBindUri(s)
-	if err != nil {
-		log.Debugf("ShouldBindUri error: %s", err.Error())
-		return err
-	}
-	err = ctx.ShouldBind(s)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
-	}
-	return err
-}
-
-func (s *SysOperaLogControl) Generate() (*system.SysOperaLog, error) {
-	return &system.SysOperaLog{
+func (s *SysOperaLogControl) Generate() (*models.SysOperaLog, error) {
+	return &models.SysOperaLog{
 		Model:         common.Model{Id: s.ID},
 		Title:         s.Title,
 		BusinessType:  s.BusinessType,
@@ -98,33 +79,19 @@ func (s *SysOperaLogControl) GetId() interface{} {
 	return s.ID
 }

-type SysOperaLogById struct {
-	Id  int   `uri:"id"`
-	Ids []int `json:"ids"`
+type SysOperaLogGetReq struct {
+	Id int `uri:"id"`
 }

-func (s *SysOperaLogById) GetId() interface{} {
-	if len(s.Ids) > 0 {
-		s.Ids = append(s.Ids, s.Id)
-		return s.Ids
-	}
+func (s *SysOperaLogGetReq) GetId() interface{} {
 	return s.Id
 }

-func (s *SysOperaLogById) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-	err := ctx.ShouldBindUri(s)
-	if err != nil {
-		log.Debugf("ShouldBindUri error: %s", err.Error())
-		return err
-	}
-	err = ctx.ShouldBind(&s.Ids)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
-	}
-	return err
+// SysOperaLogDeleteReq 功能删除请求参数
+type SysOperaLogDeleteReq struct {
+	Ids []int `json:"ids"`
 }

-func (s *SysOperaLogById) SetUpdateBy(id int) {
-
+func (s *SysOperaLogDeleteReq) GetId() interface{} {
+	return s.Ids
 }
@@ -1,118 +1,111 @@
 package dto

 import (
-	"encoding/json"
+	"go-admin/app/admin/models"
+	common "go-admin/common/models"

-	"github.com/gin-gonic/gin"
-	"github.com/gin-gonic/gin/binding"
-	"github.com/go-admin-team/go-admin-core/sdk/api"
-
-	"go-admin/app/admin/models/system"
 	"go-admin/common/dto"
 )

-// SysPostSearch 列表或者搜索使用结构体
-type SysPostSearch struct {
+// SysPostPageReq 列表或者搜索使用结构体
+type SysPostPageReq struct {
 	dto.Pagination `search:"-"`
-	PostId         int    `form:"postId" search:"type:exact;column:post_id;table:sys_post" comment:"id"`     // id
-	PostName       string `form:"postName" search:"type:exact;column:post_name;table:sys_post" comment:"名称"` // 名称
-	PostCode       string `form:"postCode" search:"type:exact;column:post_code;table:sys_post" comment:"编码"` // 编码
-	Sort           int    `form:"sort" search:"type:exact;column:sort;table:sys_post" comment:"排序"`          // 排序
-	Status         int    `form:"status" search:"type:exact;column:status;table:sys_post" comment:"状态"`      // 状态
-	Remark         string `form:"remark" search:"type:exact;column:remark;table:sys_post" comment:"备注"`      // 备注
+	PostId         int    `form:"postId" search:"type:exact;column:post_id;table:sys_post" comment:"id"`        // id
+	PostName       string `form:"postName" search:"type:contains;column:post_name;table:sys_post" comment:"名称"` // 名称
+	PostCode       string `form:"postCode" search:"type:contains;column:post_code;table:sys_post" comment:"编码"` // 编码
+	Sort           int    `form:"sort" search:"type:exact;column:sort;table:sys_post" comment:"排序"`             // 排序
+	Status         int    `form:"status" search:"type:exact;column:status;table:sys_post" comment:"状态"`         // 状态
+	Remark         string `form:"remark" search:"type:exact;column:remark;table:sys_post" comment:"备注"`         // 备注
 }

-func (m *SysPostSearch) GetNeedSearch() interface{} {
+func (m *SysPostPageReq) GetNeedSearch() interface{} {
 	return *m
 }

-// Bind 映射上下文中的结构体数据
-func (m *SysPostSearch) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-	err := ctx.ShouldBind(m)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
-	}
-	return err
+// SysPostInsertReq 增使用的结构体
+type SysPostInsertReq struct {
+	PostId   int    `uri:"id"  comment:"id"`
+	PostName string `form:"postName"  comment:"名称"`
+	PostCode string `form:"postCode" comment:"编码"`
+	Sort     int    `form:"sort" comment:"排序"`
+	Status   int    `form:"status"   comment:"状态"`
+	Remark   string `form:"remark"   comment:"备注"`
+	common.ControlBy
 }

-// SysConfigControl 增、改使用的结构体
-type SysPostControl struct {
-	PostId   int    `uri:"id"  comment:"id"`        // id
-	PostName string `form:"postName"  comment:"名称"` // 名称
-	PostCode string `form:"postCode" comment:"编码"`  // 编码
-	Sort     int    `form:"sort" comment:"排序"`      // 排序
-	Status   int    `form:"status"   comment:"状态"`  // 状态
-	Remark   string `form:"remark"   comment:"备注"`  // 备注
-}
-
-// Bind 映射上下文中的结构体数据
-func (s *SysPostControl) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-	err := ctx.ShouldBindUri(s)
-	if err != nil {
-		log.Debugf("ShouldBindUri error: %s", err.Error())
-		return err
+func (s *SysPostInsertReq) Generate(model *models.SysPost) {
+	model.PostName = s.PostName
+	model.PostCode = s.PostCode
+	model.Sort = s.Sort
+	model.Status = s.Status
+	model.Remark = s.Remark
+	if s.ControlBy.UpdateBy != 0 {
+		model.UpdateBy = s.UpdateBy
 	}
-	err = ctx.ShouldBindBodyWith(s, binding.JSON)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
+	if s.ControlBy.CreateBy != 0 {
+		model.CreateBy = s.CreateBy
 	}
-	var jsonStr []byte
-	jsonStr, err = json.Marshal(s)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
-	}
-	ctx.Set("body", string(jsonStr))
-	return err
-}
-
-// Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型
-func (s *SysPostControl) Generate() (*system.SysPost, error) {
-	return &system.SysPost{
-		PostId:   s.PostId,
-		PostName: s.PostName,
-		PostCode: s.PostCode,
-		Sort:     s.Sort,
-		Status:   s.Status,
-		Remark:   s.Remark,
-	}, nil
 }

 // GetId 获取数据对应的ID
-func (s *SysPostControl) GetId() interface{} {
+func (s *SysPostInsertReq) GetId() interface{} {
 	return s.PostId
 }

-// SysConfigById 获取单个或者删除的结构体
-type SysPostById struct {
-	Id  int   `uri:"id"`
-	Ids []int `json:"ids"`
+// SysPostUpdateReq 改使用的结构体
+type SysPostUpdateReq struct {
+	PostId   int    `uri:"id"  comment:"id"`
+	PostName string `form:"postName"  comment:"名称"`
+	PostCode string `form:"postCode" comment:"编码"`
+	Sort     int    `form:"sort" comment:"排序"`
+	Status   int    `form:"status"   comment:"状态"`
+	Remark   string `form:"remark"   comment:"备注"`
+	common.ControlBy
 }

-func (s *SysPostById) Generate() *SysPostById {
-	cp := *s
-	return &cp
+func (s *SysPostUpdateReq) Generate(model *models.SysPost) {
+	model.PostId = s.PostId
+	model.PostName = s.PostName
+	model.PostCode = s.PostCode
+	model.Sort = s.Sort
+	model.Status = s.Status
+	model.Remark = s.Remark
+	if s.ControlBy.UpdateBy != 0 {
+		model.UpdateBy = s.UpdateBy
+	}
+	if s.ControlBy.CreateBy != 0 {
+		model.CreateBy = s.CreateBy
+	}
 }

-func (s *SysPostById) GetId() interface{} {
+func (s *SysPostUpdateReq) GetId() interface{} {
+	return s.PostId
+}
+
+// SysPostGetReq 获取单个的结构体
+type SysPostGetReq struct {
+	Id int `uri:"id"`
+}
+
+func (s *SysPostGetReq) GetId() interface{} {
 	return s.Id
 }

-func (s *SysPostById) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-	err := ctx.ShouldBindUri(s)
-	if err != nil {
-		log.Debugf("ShouldBindUri error: %s", err.Error())
-		return err
-	}
-	err = ctx.ShouldBind(s)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
-	}
-	return err
+// SysPostDeleteReq 删除的结构体
+type SysPostDeleteReq struct {
+	Ids []int `json:"ids"`
+	common.ControlBy
 }

-func (s *SysPostById) GenerateM() (*system.SysPost, error) {
-	return &system.SysPost{}, nil
+func (s *SysPostDeleteReq) Generate(model *models.SysPost) {
+	if s.ControlBy.UpdateBy != 0 {
+		model.UpdateBy = s.UpdateBy
+	}
+	if s.ControlBy.CreateBy != 0 {
+		model.CreateBy = s.CreateBy
+	}
+}
+
+func (s *SysPostDeleteReq) GetId() interface{} {
+	return s.Ids
 }
@@ -1,18 +1,13 @@
 package dto

 import (
-	"encoding/json"
+	"go-admin/app/admin/models"
+	common "go-admin/common/models"

-	"github.com/gin-gonic/gin"
-	"github.com/gin-gonic/gin/binding"
-	"github.com/go-admin-team/go-admin-core/sdk/api"
-
-	"go-admin/app/admin/models/system"
 	"go-admin/common/dto"
 )

-// SysRoleSearch 列表或者搜索使用结构体
-type SysRoleSearch struct {
+type SysRoleGetPageReq struct {
 	dto.Pagination `search:"-"`

 	RoleId    int    `form:"roleId" search:"type:exact;column:role_id;table:sys_role" comment:"角色编码"`     // 角色编码
@@ -26,92 +21,127 @@ type SysRoleSearch struct {
 	DataScope string `form:"dataScope" search:"type:exact;column:data_scope;table:sys_role" comment:"是否管理员"`
 }

-func (m *SysRoleSearch) GetNeedSearch() interface{} {
+type SysRoleOrder struct {
+	RoleIdOrder    string `search:"type:order;column:role_id;table:sys_role" form:"roleIdOrder"`
+	RoleNameOrder  string `search:"type:order;column:role_name;table:sys_role" form:"roleNameOrder"`
+	RoleSortOrder  string `search:"type:order;column:role_sort;table:sys_role" form:"usernameOrder"`
+	StatusOrder    string `search:"type:order;column:status;table:sys_role" form:"statusOrder"`
+	CreatedAtOrder string `search:"type:order;column:created_at;table:sys_role" form:"createdAtOrder"`
+}
+
+func (m *SysRoleGetPageReq) GetNeedSearch() interface{} {
 	return *m
 }

-// Bind 映射上下文中的结构体数据
-func (m *SysRoleSearch) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-	err := ctx.ShouldBind(m)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
-	}
-	return err
+type SysRoleInsertReq struct {
+	RoleId    int              `uri:"id" comment:"角色编码"`        // 角色编码
+	RoleName  string           `form:"roleName" comment:"角色名称"` // 角色名称
+	Status    string           `form:"status" comment:"状态"`     // 状态
+	RoleKey   string           `form:"roleKey" comment:"角色代码"`  // 角色代码
+	RoleSort  int              `form:"roleSort" comment:"角色排序"` // 角色排序
+	Flag      string           `form:"flag" comment:"标记"`       // 标记
+	Remark    string           `form:"remark" comment:"备注"`     // 备注
+	Admin     bool             `form:"admin" comment:"是否管理员"`
+	DataScope string           `form:"dataScope"`
+	SysMenu   []models.SysMenu `form:"sysMenu"`
+	MenuIds   []int            `form:"menuIds"`
+	SysDept   []models.SysDept `form:"sysDept"`
+	DeptIds   []int            `form:"deptIds"`
+	common.ControlBy
 }

-// SysConfigControl 增、改使用的结构体
-type SysRoleControl struct {
-	RoleId    int    `uri:"id" comment:"角色编码"`        // 角色编码
-	RoleName  string `form:"roleName" comment:"角色名称"` // 角色名称
-	Status    string `form:"status" comment:"状态"`     // 状态
-	RoleKey   string `form:"roleKey" comment:"角色代码"`  // 角色代码
-	RoleSort  int    `form:"roleSort" comment:"角色排序"` // 角色排序
-	Flag      string `form:"flag" comment:"标记"`       // 标记
-	Remark    string `form:"remark" comment:"备注"`     // 备注
-	Admin     bool   `form:"admin" comment:"是否管理员"`
-	DataScope string `form:"dataScope"`
-	MenuIds   []int  `json:"menuIds"`
+func (s *SysRoleInsertReq) Generate(model *models.SysRole) {
+	if s.RoleId != 0 {
+		model.RoleId = s.RoleId
+	}
+	model.RoleName = s.RoleName
+	model.Status = s.Status
+	model.RoleKey = s.RoleKey
+	model.RoleSort = s.RoleSort
+	model.Flag = s.Flag
+	model.Remark = s.Remark
+	model.Admin = s.Admin
+	model.DataScope = s.DataScope
+	model.SysMenu = &s.SysMenu
+	model.SysDept = s.SysDept
 }

-// Bind 映射上下文中的结构体数据
-func (s *SysRoleControl) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-	err := ctx.ShouldBindBodyWith(s, binding.JSON)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
-	}
-	err = ctx.ShouldBindUri(s)
-	if err != nil {
-		log.Debugf("ShouldBindUri error: %s", err.Error())
-		return err
-	}
-	var jsonStr []byte
-	jsonStr, err = json.Marshal(s)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
-	}
-	ctx.Set("body", string(jsonStr))
-	return err
-}
-
-// Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型
-func (s *SysRoleControl) Generate() (*system.SysRole, error) {
-	return &system.SysRole{
-		RoleId:    s.RoleId,
-		RoleName:  s.RoleName,
-		Status:    s.Status,
-		RoleKey:   s.RoleKey,
-		RoleSort:  s.RoleSort,
-		Flag:      s.Flag,
-		Remark:    s.Remark,
-		Admin:     s.Admin,
-		DataScope: s.DataScope,
-		MenuIds:   s.MenuIds,
-	}, nil
-}
-
-// GetId 获取数据对应的ID
-func (s *SysRoleControl) GetId() interface{} {
+func (s *SysRoleInsertReq) GetId() interface{} {
 	return s.RoleId
 }

-// SysConfigById 获取单个或者删除的结构体
-type SysRoleById struct {
-	dto.ObjectById
+type SysRoleUpdateReq struct {
+	RoleId    int              `uri:"id" comment:"角色编码"`        // 角色编码
+	RoleName  string           `form:"roleName" comment:"角色名称"` // 角色名称
+	Status    string           `form:"status" comment:"状态"`     // 状态
+	RoleKey   string           `form:"roleKey" comment:"角色代码"`  // 角色代码
+	RoleSort  int              `form:"roleSort" comment:"角色排序"` // 角色排序
+	Flag      string           `form:"flag" comment:"标记"`       // 标记
+	Remark    string           `form:"remark" comment:"备注"`     // 备注
+	Admin     bool             `form:"admin" comment:"是否管理员"`
+	DataScope string           `form:"dataScope"`
+	SysMenu   []models.SysMenu `form:"sysMenu"`
+	MenuIds   []int            `form:"menuIds"`
+	SysDept   []models.SysDept `form:"sysDept"`
+	DeptIds   []int            `form:"deptIds"`
+	common.ControlBy
 }

-func (s *SysRoleById) Generate() *SysRoleById {
-	cp := *s
-	return &cp
+func (s *SysRoleUpdateReq) Generate(model *models.SysRole) {
+	if s.RoleId != 0 {
+		model.RoleId = s.RoleId
+	}
+	model.RoleName = s.RoleName
+	model.Status = s.Status
+	model.RoleKey = s.RoleKey
+	model.RoleSort = s.RoleSort
+	model.Flag = s.Flag
+	model.Remark = s.Remark
+	model.Admin = s.Admin
+	model.DataScope = s.DataScope
+	model.SysMenu = &s.SysMenu
+	model.SysDept = s.SysDept
 }

-func (s *SysRoleById) GetId() interface{} {
+func (s *SysRoleUpdateReq) GetId() interface{} {
+	return s.RoleId
+}
+
+type UpdateStatusReq struct {
+	RoleId int    `form:"roleId" comment:"角色编码"` // 角色编码
+	Status string `form:"status" comment:"状态"`   // 状态
+	common.ControlBy
+}
+
+func (s *UpdateStatusReq) Generate(model *models.SysRole) {
+	if s.RoleId != 0 {
+		model.RoleId = s.RoleId
+	}
+	model.Status = s.Status
+}
+
+func (s *UpdateStatusReq) GetId() interface{} {
+	return s.RoleId
+}
+
+type SysRoleByName struct {
+	RoleName string `form:"role"` // 角色编码
+}
+
+type SysRoleGetReq struct {
+	Id int `uri:"id"`
+}
+
+func (s *SysRoleGetReq) GetId() interface{} {
 	return s.Id
 }

-func (s *SysRoleById) GenerateM() (*system.SysRole, error) {
-	return &system.SysRole{}, nil
+type SysRoleDeleteReq struct {
+	Ids []int `json:"ids"`
+}
+
+func (s *SysRoleDeleteReq) GetId() interface{} {
+	return s.Ids
 }

 // RoleDataScopeReq 角色数据权限修改
@@ -121,6 +151,14 @@ type RoleDataScopeReq struct {
 	DeptIds   []int  `json:"deptIds"`
 }

+func (s *RoleDataScopeReq) Generate(model *models.SysRole) {
+	if s.RoleId != 0 {
+		model.RoleId = s.RoleId
+	}
+	model.DataScope = s.DataScope
+	model.DeptIds = s.DeptIds
+}
+
 type DeptIdList struct {
 	DeptId int `json:"DeptId"`
-}
+}
@@ -1,88 +0,0 @@
-package dto
-
-import (
-	"encoding/json"
-
-	"github.com/gin-gonic/gin"
-	"github.com/go-admin-team/go-admin-core/sdk/api"
-
-	"go-admin/app/admin/models"
-)
-
-// SysConfigControl 增、改使用的结构体
-type SysSettingControl struct {
-	SettingsId int    `json:"settings_id" binding:"required"` // 头像
-	Name       string `json:"name" binding:"required"`        // 名称
-	Logo       string `json:"logo" binding:"required"`        // 头像
-}
-
-// Bind 映射上下文中的结构体数据
-func (s *SysSettingControl) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-
-	err := ctx.ShouldBind(s)
-	if err != nil {
-		log.Errorf("ShouldBind error: %s", err.Error())
-		return err
-	}
-
-	err = ctx.ShouldBindUri(s)
-	if err != nil {
-		log.Errorf("ShouldBindUri error: %s", err.Error())
-		return err
-	}
-	var jsonStr []byte
-	jsonStr, err = json.Marshal(s)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
-	}
-	ctx.Set("body", string(jsonStr))
-	return err
-}
-
-// Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型
-func (s *SysSettingControl) Generate() (*models.SysSetting, error) {
-	return &models.SysSetting{
-		SettingsId: s.SettingsId,
-		Name:       s.Name,
-		Logo:       s.Logo,
-	}, nil
-}
-
-// GetId 获取数据对应的ID
-func (s *SysSettingControl) GetId() interface{} {
-	return s.SettingsId
-}
-
-// SysConfigById 获取单个或者删除的结构体
-type SysSettingById struct {
-	Id  int   `uri:"id"`
-	Ids []int `json:"ids"`
-}
-
-func (s *SysSettingById) Generate() *SysSettingById {
-	cp := *s
-	return &cp
-}
-
-func (s *SysSettingById) GetId() interface{} {
-	return s.Id
-}
-
-func (s *SysSettingById) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-	err := ctx.ShouldBindUri(s)
-	if err != nil {
-		log.Debugf("ShouldBindUri error: %s", err.Error())
-		return err
-	}
-	err = ctx.ShouldBind(s)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
-	}
-	return err
-}
-
-func (s *SysSettingById) GenerateM() (*models.SysSetting, error) {
-	return &models.SysSetting{}, nil
-}
@@ -1,118 +1,188 @@
 package dto

 import (
-	"github.com/gin-gonic/gin"
-	"github.com/go-admin-team/go-admin-core/sdk/api"
+	"go-admin/app/admin/models"

-	"go-admin/app/admin/models/system"
 	"go-admin/common/dto"
 	common "go-admin/common/models"
 )

-type SysUserSearch struct {
+type SysUserGetPageReq struct {
 	dto.Pagination `search:"-"`
-	UserId         int    `form:"UserId" search:"type:exact;column:user_id;table:sys_user" comment:"用户ID"`
+	UserId         int    `form:"userId" search:"type:exact;column:user_id;table:sys_user" comment:"用户ID"`
 	Username       string `form:"username" search:"type:contains;column:username;table:sys_user" comment:"用户名"`
 	NickName       string `form:"nickName" search:"type:contains;column:nick_name;table:sys_user" comment:"昵称"`
 	Phone          string `form:"phone" search:"type:contains;column:phone;table:sys_user" comment:"手机号"`
 	RoleId         string `form:"roleId" search:"type:exact;column:role_id;table:sys_user" comment:"角色ID"`
 	Sex            string `form:"sex" search:"type:exact;column:sex;table:sys_user" comment:"性别"`
 	Email          string `form:"email" search:"type:contains;column:email;table:sys_user" comment:"邮箱"`
-	DeptId         string `form:"deptId" search:"type:exact;column:dept_id;table:sys_user" comment:"部门"`
 	PostId         string `form:"postId" search:"type:exact;column:post_id;table:sys_user" comment:"岗位"`
 	Status         string `form:"status" search:"type:exact;column:status;table:sys_user" comment:"状态"`
+	DeptJoin       `search:"type:left;on:dept_id:dept_id;table:sys_user;join:sys_dept"`
+	SysUserOrder
 }

-func (m *SysUserSearch) GetNeedSearch() interface{} {
+type SysUserOrder struct {
+	UserIdOrder    string `search:"type:order;column:user_id;table:sys_user" form:"userIdOrder"`
+	UsernameOrder  string `search:"type:order;column:username;table:sys_user" form:"usernameOrder"`
+	StatusOrder    string `search:"type:order;column:status;table:sys_user" form:"statusOrder"`
+	CreatedAtOrder string `search:"type:order;column:created_at;table:sys_user" form:"createdAtOrder"`
+}
+
+type DeptJoin struct {
+	DeptId string `search:"type:contains;column:dept_path;table:sys_dept" form:"deptId"`
+}
+
+func (m *SysUserGetPageReq) GetNeedSearch() interface{} {
 	return *m
 }

-func (m *SysUserSearch) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-	err := ctx.ShouldBind(m)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
+type ResetSysUserPwdReq struct {
+	UserId   int    `json:"userId" comment:"用户ID" vd:"$>0"` // 用户ID
+	Password string `json:"password" comment:"密码" vd:"len($)>0"`
+	common.ControlBy
+}
+
+func (s *ResetSysUserPwdReq) GetId() interface{} {
+	return s.UserId
+}
+
+func (s *ResetSysUserPwdReq) Generate(model *models.SysUser) {
+	if s.UserId != 0 {
+		model.UserId = s.UserId
 	}
-	return err
+	model.Password = s.Password
 }

-func (m *SysUserSearch) Generate() dto.Index {
-	o := *m
-	return &o
+type UpdateSysUserAvatarReq struct {
+	UserId int    `json:"userId" comment:"用户ID" vd:"len($)>0"` // 用户ID
+	Avatar string `json:"avatar" comment:"头像" vd:"len($)>0"`
+	common.ControlBy
 }

-type SysUserControl struct {
+func (s *UpdateSysUserAvatarReq) GetId() interface{} {
+	return s.UserId
+}
+
+func (s *UpdateSysUserAvatarReq) Generate(model *models.SysUser) {
+	if s.UserId != 0 {
+		model.UserId = s.UserId
+	}
+	model.Avatar = s.Avatar
+}
+
+type UpdateSysUserStatusReq struct {
+	UserId int    `json:"userId" comment:"用户ID" vd:"$>0"` // 用户ID
+	Status string `json:"status" comment:"状态" vd:"len($)>0"`
+	common.ControlBy
+}
+
+func (s *UpdateSysUserStatusReq) GetId() interface{} {
+	return s.UserId
+}
+
+func (s *UpdateSysUserStatusReq) Generate(model *models.SysUser) {
+	if s.UserId != 0 {
+		model.UserId = s.UserId
+	}
+	model.Status = s.Status
+}
+
+type SysUserInsertReq struct {
 	UserId   int    `json:"userId" comment:"用户ID"` // 用户ID
-	Username string `json:"username" comment:"用户名"`
+	Username string `json:"username" comment:"用户名" vd:"len($)>0"`
 	Password string `json:"password" comment:"密码"`
-	NickName string `json:"nickName" comment:"昵称"`
-	Phone    string `json:"phone" comment:"手机号"`
+	NickName string `json:"nickName" comment:"昵称" vd:"len($)>0"`
+	Phone    string `json:"phone" comment:"手机号" vd:"len($)>0"`
 	RoleId   int    `json:"roleId" comment:"角色ID"`
 	Avatar   string `json:"avatar" comment:"头像"`
 	Sex      string `json:"sex" comment:"性别"`
-	Email    string `json:"email" comment:"邮箱"`
-	DeptId   int    `json:"deptId" comment:"部门"`
+	Email    string `json:"email" comment:"邮箱" vd:"len($)>0,email"`
+	DeptId   int    `json:"deptId" comment:"部门" vd:"$>0"`
 	PostId   int    `json:"postId" comment:"岗位"`
 	Remark   string `json:"remark" comment:"备注"`
-	Status   string `json:"status" comment:"状态"`
+	Status   string `json:"status" comment:"状态" vd:"len($)>0" default:"1"`
+	common.ControlBy
 }

-func (s *SysUserControl) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-	//err := ctx.ShouldBindUri(s)
-	//if err != nil {
-	//	log.Debugf("ShouldBindUri error: %s", err.Error())
-	//	return err
-	//}
-	err := ctx.ShouldBind(s)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
+func (s *SysUserInsertReq) Generate(model *models.SysUser) {
+	if s.UserId != 0 {
+		model.UserId = s.UserId
 	}
-	return err
+	model.Username = s.Username
+	model.Password = s.Password
+	model.NickName = s.NickName
+	model.Phone = s.Phone
+	model.RoleId = s.RoleId
+	model.Avatar = s.Avatar
+	model.Sex = s.Sex
+	model.Email = s.Email
+	model.DeptId = s.DeptId
+	model.PostId = s.PostId
+	model.Remark = s.Remark
+	model.Status = s.Status
 }

-func (s *SysUserControl) Generate() dto.Control {
-	cp := *s
-	return &cp
+func (s *SysUserInsertReq) GetId() interface{} {
+	return s.UserId
 }

-func (s *SysUserControl) GenerateM() (common.ActiveRecord, error) {
-	return &system.SysUser{
-		UserId:   s.UserId,
-		Username: s.Username,
-		Password: s.Password,
-		NickName: s.NickName,
-		Phone:    s.Phone,
-		RoleId:   s.RoleId,
-		Avatar:   s.Avatar,
-		Sex:      s.Sex,
-		Email:    s.Email,
-		DeptId:   s.DeptId,
-		PostId:   s.PostId,
-		Remark:   s.Remark,
-		Status:   s.Status,
-	}, nil
+type SysUserUpdateReq struct {
+	UserId   int    `json:"userId" comment:"用户ID"` // 用户ID
+	Username string `json:"username" comment:"用户名" vd:"len($)>0"`
+	NickName string `json:"nickName" comment:"昵称" vd:"len($)>0"`
+	Phone    string `json:"phone" comment:"手机号" vd:"len($)>0"`
+	RoleId   int    `json:"roleId" comment:"角色ID"`
+	Avatar   string `json:"avatar" comment:"头像"`
+	Sex      string `json:"sex" comment:"性别"`
+	Email    string `json:"email" comment:"邮箱" vd:"len($)>0,email"`
+	DeptId   int    `json:"deptId" comment:"部门" vd:"$>0"`
+	PostId   int    `json:"postId" comment:"岗位"`
+	Remark   string `json:"remark" comment:"备注"`
+	Status   string `json:"status" comment:"状态" default:"1"`
+	common.ControlBy
 }

-func (s *SysUserControl) GetId() interface{} {
+func (s *SysUserUpdateReq) Generate(model *models.SysUser) {
+	if s.UserId != 0 {
+		model.UserId = s.UserId
+	}
+	model.Username = s.Username
+	model.NickName = s.NickName
+	model.Phone = s.Phone
+	model.RoleId = s.RoleId
+	model.Avatar = s.Avatar
+	model.Sex = s.Sex
+	model.Email = s.Email
+	model.DeptId = s.DeptId
+	model.PostId = s.PostId
+	model.Remark = s.Remark
+	model.Status = s.Status
+}
+
+func (s *SysUserUpdateReq) GetId() interface{} {
 	return s.UserId
 }

 type SysUserById struct {
 	dto.ObjectById
+	common.ControlBy
 }

-func (s *SysUserById) Generate() dto.Control {
-	cp := *s
-	return &cp
+func (s *SysUserById) GetId() interface{} {
+	if len(s.Ids) > 0 {
+		s.Ids = append(s.Ids, s.Id)
+		return s.Ids
+	}
+	return s.Id
 }

 func (s *SysUserById) GenerateM() (common.ActiveRecord, error) {
-	return &system.SysUser{}, nil
+	return &models.SysUser{}, nil
 }

 // PassWord 密码
 type PassWord struct {
-	NewPassword string `json:"newPassword" binding:"required"`
-	OldPassword string `json:"oldPassword" binding:"required"`
-}
+	NewPassword string `json:"newPassword" vd:"len($)>0"`
+	OldPassword string `json:"oldPassword" vd:"len($)>0"`
+}
@@ -1,98 +0,0 @@
-package dto
-
-import (
-	"time"
-
-	"github.com/gin-gonic/gin"
-	"github.com/go-admin-team/go-admin-core/sdk/api"
-
-	"go-admin/app/admin/models"
-	"go-admin/common/dto"
-	common "go-admin/common/models"
-)
-
-type SysChinaAreaDataSearch struct {
-	dto.Pagination `search:"-"`
-	PId            string `form:"pId" search:"type:exact;column:p_id;table:sys_china_area_data" comment:"上级编码"`
-	Name           string `form:"name" search:"type:exact;column:name;table:sys_china_area_data" comment:"名称"`
-}
-
-func (m *SysChinaAreaDataSearch) GetNeedSearch() interface{} {
-	return *m
-}
-
-func (m *SysChinaAreaDataSearch) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-	err := ctx.ShouldBind(m)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
-	}
-	return err
-}
-
-type SysChinaAreaDataControl struct {
-	Id         int       `uri:"id" comment:"编码"` // 编码
-	PId        string    `json:"pId" comment:"上级编码"`
-	Name       string    `json:"name" comment:"名称"`
-	CreateTime time.Time `json:"createTime" comment:""`
-	UpdateTime time.Time `json:"updateTime" comment:""`
-	DeleteTime time.Time `json:"deleteTime" comment:""`
-}
-
-func (s *SysChinaAreaDataControl) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-	err := ctx.ShouldBindUri(s)
-	if err != nil {
-		log.Debugf("ShouldBindUri error: %s", err.Error())
-		return err
-	}
-	err = ctx.ShouldBind(s)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
-	}
-	return err
-}
-
-func (s *SysChinaAreaDataControl) Generate() (*models.SysChinaAreaData, error) {
-	return &models.SysChinaAreaData{
-
-		Model:      common.Model{Id: s.Id},
-		PId:        s.PId,
-		Name:       s.Name,
-	}, nil
-}
-
-func (s *SysChinaAreaDataControl) GetId() interface{} {
-	return s.Id
-}
-
-type SysChinaAreaDataById struct {
-	Id  int   `uri:"id"`
-	Ids []int `json:"ids"`
-}
-
-func (s *SysChinaAreaDataById) GetId() interface{} {
-	if len(s.Ids) > 0 {
-		s.Ids = append(s.Ids, s.Id)
-		return s.Ids
-	}
-	return s.Id
-}
-
-func (s *SysChinaAreaDataById) Bind(ctx *gin.Context) error {
-	log := api.GetRequestLogger(ctx)
-	err := ctx.ShouldBindUri(s)
-	if err != nil {
-		log.Debugf("ShouldBindUri error: %s", err.Error())
-		return err
-	}
-	err = ctx.ShouldBind(s)
-	if err != nil {
-		log.Debugf("ShouldBind error: %s", err.Error())
-	}
-	return err
-}
-
-func (s *SysChinaAreaDataById) SetUpdateBy(id int) {
-
-}
@@ -0,0 +1,110 @@
+package service
+
+import (
+	"errors"
+	"fmt"
+
+	"github.com/go-admin-team/go-admin-core/sdk/runtime"
+	"github.com/go-admin-team/go-admin-core/sdk/service"
+	"gorm.io/gorm"
+
+	"go-admin/app/admin/models"
+	"go-admin/app/admin/service/dto"
+	"go-admin/common/actions"
+	cDto "go-admin/common/dto"
+)
+
+type SysApi struct {
+	service.Service
+}
+
+// GetPage 获取SysApi列表
+func (e *SysApi) GetPage(c *dto.SysApiGetPageReq, p *actions.DataPermission, list *[]models.SysApi, count *int64) error {
+	var err error
+	var data models.SysApi
+
+	err = e.Orm.Debug().Model(&data).
+		Scopes(
+			cDto.MakeCondition(c.GetNeedSearch()),
+			cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
+			actions.Permission(data.TableName(), p),
+		).
+		Find(list).Limit(-1).Offset(-1).
+		Count(count).Error
+	if err != nil {
+		e.Log.Errorf("Service GetSysApiPage error:%s", err)
+		return err
+	}
+	return nil
+}
+
+// Get 获取SysApi对象with id
+func (e *SysApi) Get(d *dto.SysApiGetReq, p *actions.DataPermission, model *models.SysApi) *SysApi {
+	var data models.SysApi
+	err := e.Orm.Model(&data).
+		Scopes(
+			actions.Permission(data.TableName(), p),
+		).
+		First(model, d.GetId()).Error
+	if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
+		err = errors.New("查看对象不存在或无权查看")
+		e.Log.Errorf("Service GetSysApi error:%s", err)
+		_ = e.AddError(err)
+		return e
+	}
+	if err != nil {
+		e.Log.Errorf("db error:%s", err)
+		_ = e.AddError(err)
+		return e
+	}
+	return e
+}
+
+// Update 修改SysApi对象
+func (e *SysApi) Update(c *dto.SysApiUpdateReq, p *actions.DataPermission) error {
+	var model = models.SysApi{}
+	db := e.Orm.Debug().First(&model, c.GetId())
+	if db.RowsAffected == 0 {
+		return errors.New("无权更新该数据")
+	}
+	c.Generate(&model)
+	db = e.Orm.Save(&model)
+	if err := db.Error; err != nil {
+		e.Log.Errorf("Service UpdateSysApi error:%s", err)
+		return err
+	}
+
+	return nil
+}
+
+// Remove 删除SysApi
+func (e *SysApi) Remove(d *dto.SysApiDeleteReq, p *actions.DataPermission) error {
+	var data models.SysApi
+
+	db := e.Orm.Model(&data).
+		Scopes(
+			actions.Permission(data.TableName(), p),
+		).Delete(&data, d.GetId())
+	if err := db.Error; err != nil {
+		e.Log.Errorf("Service RemoveSysApi error:%s", err)
+		return err
+	}
+	if db.RowsAffected == 0 {
+		return errors.New("无权删除该数据")
+	}
+	return nil
+}
+
+// CheckStorageSysApi 创建SysApi对象
+func (e *SysApi) CheckStorageSysApi(c *[]runtime.Router) error {
+	for _, v := range *c {
+		err := e.Orm.Debug().Where(models.SysApi{Path: v.RelativePath, Action: v.HttpMethod}).
+			Attrs(models.SysApi{Handle: v.Handler}).
+			FirstOrCreate(&models.SysApi{}).Error
+		if err != nil {
+			err := fmt.Errorf("Service CheckStorageSysApi error: %s \r\n ", err.Error())
+			return err
+		}
+	}
+	return nil
+}
--- a/Show More
+++ b/Show More