feat✨: 修改版本号

Dev

.github/workflows/dev-lwx.yml

@@ -1,60 +0,0 @@
-name: build
-
-on:
-  push:
-    branches: [ dev-lwx ]
-  pull_request:
-    branches: [ dev-lwx ]
-
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-    - name: Set up Go 1.15
-      uses: actions/setup-go@v1
-      with:
-        go-version: 1.15
-      id: go
-
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
-    - name: Get dependencies
-      run: |
-        go get -v -t -d ./...
-        if [ -f Gopkg.toml ]; then
-            curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
-            dep ensure
-        fi
-    - name: Build
-      run: |
-        CGO_ENABLED=0 GOOS=linux go build -ldflags="-w -s" -a -installsuffix cgo -o go-admin .
-        mv go-admin ./scripts
-
-    - uses: Azure/docker-login@v1
-      with:
-        login-server: registry.cn-shanghai.aliyuncs.com
-        username: ${{ secrets.REGISTRY_USERNAME }}
-        password: ${{ secrets.REGISTRY_PASSWORD }}
-    - run: |
-        docker build ./scripts -t registry.cn-shanghai.aliyuncs.com/go-admin-team/go-admin:${{ github.sha }}
-        docker push registry.cn-shanghai.aliyuncs.com/go-admin-team/go-admin:${{ github.sha }}
-    - uses: Azure/k8s-set-context@v1
-      with:
-        kubeconfig: ${{ secrets.KUBE_CONFIG }}
-
-    - uses: Azure/k8s-create-secret@v1
-      with:
-        namespace: 'go-admin'
-        container-registry-url: registry.cn-shanghai.aliyuncs.com
-        container-registry-username: ${{ secrets.REGISTRY_USERNAME }}
-        container-registry-password: ${{ secrets.REGISTRY_PASSWORD }}
-        secret-name: aliyuncs-k8s-secret
-
-    - uses: Azure/k8s-deploy@v1
-      with:
-        namespace: 'go-admin'
-        manifests: 'scripts/k8s/deploy.yml'
-        images: 'registry.cn-shanghai.aliyuncs.com/go-admin-team/go-admin:${{ github.sha }}'
-        imagepullsecrets: 'aliyuncs-k8s-secret'
-        kubectl-version: 'latest'

.github/workflows/go.yml

@@ -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:
 
@@ -13,22 +16,47 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - name: Set up Go 1.14
-      uses: actions/setup-go@v1
+    - name: Set up Go 1.15
+      uses: actions/setup-go@v3
       with:
-        go-version: 1.14
+        go-version: 1.15
       id: go
 
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Get dependencies
-      run: |
-        go get -v -t -d ./...
-        if [ -f Gopkg.toml ]; then
-            curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
-            dep ensure
-        fi
-
+      run: go mod tidy
     - name: Build
-      run: go build -v .
+      run: make build
+
+    - name: Log in to the Container registry
+      uses: docker/login-action@v2
+      if: startsWith(${{github.ref}}, 'refs/tags/')
+      with:
+        registry: ${{ env.REGISTRY }}
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Extract metadata (tags, labels) for Docker
+      id: meta
+      if: startsWith(${{github.ref}}, 'refs/tags/')
+      uses: docker/metadata-action@v4
+      with:
+        images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+        flavor: |
+          latest=auto
+        tags: |
+          type=schedule
+          type=ref,event=tag
+          type=sha,prefix=,format=long,enable=true,priority=100
+
+    - name: Build and push Docker image
+      uses: docker/build-push-action@v3
+      if: startsWith(${{github.ref}}, 'refs/tags/')
+      with:
+        context: .
+        file: scripts/Dockerfile
+        push: true
+        tags: ${{ steps.meta.outputs.tags }}
+        labels: ${{ steps.meta.outputs.labels }}

.github/workflows/mirror.yaml

@@ -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 }}

Dockerfile

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

LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 wenjianzhang
+Copyright (c) 2020 go-admin-team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -2,9 +2,11 @@ PROJECT:=go-admin
 
 .PHONY: build
 build:
-	CGO_ENABLED=0 go build -o go-admin main.go
+	CGO_ENABLED=0 go build -ldflags="-w -s" -a -installsuffix -o go-admin .
+build-linux:
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -a -installsuffix -o go-admin .
 build-sqlite:
-	go build -tags sqlite3 -o go-admin main.go
+	go build -tags sqlite3 -ldflags="-w -s" -a -installsuffix -o go-admin .
 #.PHONY: test
 #test:
 #	go test -v ./... -cover

README.Zh-cn.md

@@ -1,6 +1,6 @@
 # go-admin
 
-  <img align="right" width="320" src="https://gitee.com/mydearzwj/image/raw/master/img/go-admin.svg">
+  <img align="right" width="320" src="https://raw.githubusercontent.com/wenjianzhang/image/a44d60756c9fdedbd70f6bff076a31cbf314936a/img/go-admin.svg">
 
 
 [![Build Status](https://github.com/wenjianzhang/go-admin/workflows/build/badge.svg)](https://github.com/go-admin-team/go-admin)
@@ -74,9 +74,9 @@
 
 ### 轻松实现go-admin写出第一个应用 - 文档教程
 
-[步骤一 - 基础内容介绍](http://doc.zhangwj.com/go-admin-site/guide/intro/tutorial01.html)
+[步骤一 - 基础内容介绍](https://doc.zhangwj.com/guide/intro/tutorial01.html)
 
-[步骤二 - 实际应用 - 编写增删改查](http://doc.zhangwj.com/go-admin-site/guide/intro/tutorial02.html)
+[步骤二 - 实际应用 - 编写增删改查](https://doc.zhangwj.com/guide/intro/tutorial02.html)
 
 ### 手把手教你从入门到放弃 - 视频教程
 
@@ -158,7 +158,7 @@ D:\Code\go-admin>go build
 cgo: exec gcc: exec: "gcc": executable file not found in %PATH%
 ```
 
-[解决cgo问题进入](https://doc.go-admin.dev/guide/other/faq.html#_5-cgo-exec-missing-cc-exec-missing-cc-file-does-not-exist)
+[解决cgo问题进入](https://doc.go-admin.dev/zh-CN/guide/faq#cgo-%E7%9A%84%E9%97%AE%E9%A2%98)
 
 :::
 
@@ -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进行调试
@@ -182,6 +182,13 @@ $ ./go-admin server -c config/settings.yml
 $ go-admin.exe server -c config/settings.yml
 ```
 
+#### sys_api 表的数据如何添加
+
+在项目启动时，使用`-a true` 系统会自动添加缺少的接口数据
+```bash
+./go-admin server -c config/settings.yml -a true
+```
+
 #### 使用docker 编译启动
 
 ```shell
@@ -232,14 +239,14 @@ npm run dev
 ## 📨 互动
 
 <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>
@@ -284,4 +291,4 @@ npm run dev
 
 [MIT](https://github.com/go-admin-team/go-admin/blob/master/LICENSE.md)
 
-Copyright (c) 2020 wenjianzhang
+Copyright (c) 2020 wenjianzhang

README.md

@@ -1,7 +1,7 @@
 
 # go-admin
 
-<img align="right" width="320" src="https://gitee.com/mydearzwj/image/raw/master/img/go-admin.svg">
+<img align="right" width="320" src="https://raw.githubusercontent.com/wenjianzhang/image/a44d60756c9fdedbd70f6bff076a31cbf314936a/img/go-admin.svg">
 
 
 [![Build Status](https://github.com/wenjianzhang/go-admin/workflows/build/badge.svg)](https://github.com/go-admin-team/go-admin)
@@ -68,9 +68,9 @@ At the same time, a series of tutorials including videos and documents are provi
 
 ### Easily implement go-admin to write the first application-documentation tutorial
 
-[Step 1 - basic content introduction](http://doc.zhangwj.com/go-admin-site/guide/intro/tutorial01.html)
+[Step 1 - basic content introduction](https://doc.zhangwj.com/guide/intro/tutorial01.html)
 
-[Step 2 - Practical application - writing database operations](http://doc.zhangwj.com/go-admin-site/guide/intro/tutorial02.html)
+[Step 2 - Practical application - writing database operations](https://doc.zhangwj.com/guide/intro/tutorial02.html)
 
 ### Teach you from getting started to giving up-video tutorial
 
@@ -152,7 +152,7 @@ D:\Code\go-admin>go build
 cgo: exec gcc: exec: "gcc": executable file not found in %PATH%
 ```
 
-[Solve the cgo problem and enter](https://doc.go-admin.dev/guide/other/faq.html#_5-cgo-exec-missing-cc-exec-missing-cc-file-does-not-exist)
+[Solve the cgo problem and enter](https://doc.go-admin.dev/guide/faq#cgo-%E7%9A%84%E9%97%AE%E9%A2%98)
 
 :::
 
@@ -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

app/admin/apis/captcha.go

@@ -10,6 +10,12 @@ 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 {

app/admin/apis/go_admin.go

@@ -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)
 }

app/admin/apis/sys_api.go

@@ -32,7 +32,7 @@ type SysApi struct {
 // @Security Bearer
 func (e SysApi) GetPage(c *gin.Context) {
 	s := service.SysApi{}
-	req := dto.SysApiSearch{}
+	req := dto.SysApiGetPageReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.Form).
@@ -64,7 +64,7 @@ func (e SysApi) GetPage(c *gin.Context) {
 // @Router /api/v1/sys-api/{id} [get]
 // @Security Bearer
 func (e SysApi) Get(c *gin.Context) {
-	req := dto.SysApiById{}
+	req := dto.SysApiGetReq{}
 	s := service.SysApi{}
 	err := e.MakeContext(c).
 		MakeOrm().
@@ -92,12 +92,12 @@ func (e SysApi) Get(c *gin.Context) {
 // @Tags 接口管理
 // @Accept application/json
 // @Product application/json
-// @Param data body dto.SysApiControl true "body"
+// @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.SysApiControl{}
+	req := dto.SysApiUpdateReq{}
 	s := service.SysApi{}
 	err := e.MakeContext(c).
 		MakeOrm().
@@ -122,23 +122,22 @@ func (e SysApi) Update(c *gin.Context) {
 // @Summary 删除接口管理
 // @Description 删除接口管理
 // @Tags 接口管理
-// @Param ids body []int false "ids"
+// @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.SysApiById{}
+	req := dto.SysApiDeleteReq{}
 	s := service.SysApi{}
 	err := e.MakeContext(c).
 		MakeOrm().
-		Bind(&req, binding.Form).
+		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.Remove(&req, p)
 	if err != nil {

app/admin/apis/sys_config.go

@@ -30,7 +30,7 @@ type SysConfig struct {
 // @Security Bearer
 func (e SysConfig) GetPage(c *gin.Context) {
 	s := service.SysConfig{}
-	req := dto.SysConfigSearch{}
+	req := dto.SysConfigGetPageReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.Form).
@@ -60,7 +60,7 @@ func (e SysConfig) GetPage(c *gin.Context) {
 // @Router /api/v1/sys-config/{id} [get]
 // @Security Bearer
 func (e SysConfig) Get(c *gin.Context) {
-	req := dto.SysConfigById{}
+	req := dto.SysConfigGetReq{}
 	s := service.SysConfig{}
 	err := e.MakeContext(c).
 		MakeOrm().
@@ -158,7 +158,7 @@ func (e SysConfig) Update(c *gin.Context) {
 // @Security Bearer
 func (e SysConfig) Delete(c *gin.Context) {
 	s := service.SysConfig{}
-	req := dto.SysConfigById{}
+	req := dto.SysConfigDeleteReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON, nil).
@@ -179,15 +179,14 @@ func (e SysConfig) Delete(c *gin.Context) {
 	e.OK(req.GetId(), "删除成功")
 }
 
-// GetSysConfigBySysApp 获取系统配置信息
-// @Summary 获取系统前台配置信息，主要注意这里不在验证数据权限
-// @Description 获取系统配置信息，主要注意这里不在验证数据权限
+// Get2SysApp 获取系统配置信息
+// @Summary 获取系统前台配置信息，主要注意这里不在验证权限
+// @Description 获取系统配置信息，主要注意这里不在验证权限
 // @Tags 配置管理
 // @Success 200 {object} response.Response{data=map[string]string} "{"code": 200, "data": [...]}"
 // @Router /api/v1/app-config [get]
-// @Security Bearer
-func (e SysConfig) GetSysConfigBySysApp(c *gin.Context) {
-	req := dto.SysConfigSearch{}
+func (e SysConfig) Get2SysApp(c *gin.Context) {
+	req := dto.SysConfigGetToSysAppReq{}
 	s := service.SysConfig{}
 	err := e.MakeContext(c).
 		MakeOrm().

app/admin/apis/sys_dept.go

@@ -29,10 +29,10 @@ type SysDept struct {
 // @Security Bearer
 func (e SysDept) GetPage(c *gin.Context) {
 	s := service.SysDept{}
-	req := dto.SysDeptSearch{}
+	req := dto.SysDeptGetPageReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
-		Bind(&req, binding.Form).
+		Bind(&req).
 		MakeService(&s.Service).
 		Errors
 	if err != nil {
@@ -50,17 +50,16 @@ func (e SysDept) GetPage(c *gin.Context) {
 }
 
 // Get
-// @Summary 部门列表数据
+// @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) Get(c *gin.Context) {
 	s := service.SysDept{}
-	req := dto.SysDeptById{}
+	req := dto.SysDeptGetReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON, nil).
@@ -88,17 +87,17 @@ func (e SysDept) Get(c *gin.Context) {
 // @Tags 部门
 // @Accept  application/json
 // @Product application/json
-// @Param data body dto.SysDeptControl true "data"
+// @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.SysDeptControl{}
+	req := dto.SysDeptInsertReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
-		Bind(&req, binding.JSON, nil).
+		Bind(&req, binding.JSON).
 		MakeService(&s.Service).
 		Errors
 	if err != nil {
@@ -124,17 +123,17 @@ func (e SysDept) Insert(c *gin.Context) {
 // @Accept  application/json
 // @Product application/json
 // @Param id path int true "id"
-// @Param data body dto.SysDeptControl true "body"
+// @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.SysDeptControl{}
+	req := dto.SysDeptUpdateReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
-		Bind(&req, binding.JSON, nil).
+		Bind(&req).
 		MakeService(&s.Service).
 		Errors
 	if err != nil {
@@ -155,13 +154,14 @@ func (e SysDept) Update(c *gin.Context) {
 // @Summary 删除部门
 // @Description 删除数据
 // @Tags 部门
-// @Param data body dto.SysDeptById true "body"
+// @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.SysDeptById{}
+	req := dto.SysDeptDeleteReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON, nil).
@@ -184,7 +184,7 @@ func (e SysDept) Delete(c *gin.Context) {
 // Get2Tree 用户管理 左侧部门树
 func (e SysDept) Get2Tree(c *gin.Context) {
 	s := service.SysDept{}
-	req := dto.SysDeptSearch{}
+	req := dto.SysDeptGetPageReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req,binding.Form).

app/admin/apis/sys_dict_data.go

@@ -1,14 +1,12 @@
 package apis
 
 import (
-	"github.com/gin-gonic/gin/binding"
-	"go-admin/app/admin/models"
-	"net/http"
-
 	"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"
@@ -32,7 +30,7 @@ type SysDictData struct {
 // @Security Bearer
 func (e SysDictData) GetPage(c *gin.Context) {
 	s := service.SysDictData{}
-	req := dto.SysDictDataSearch{}
+	req := dto.SysDictDataGetPageReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.Form).
@@ -55,7 +53,7 @@ func (e SysDictData) GetPage(c *gin.Context) {
 	e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
 }
 
-// GetSysDictData
+// Get
 // @Summary 通过编码获取字典数据
 // @Description 获取JSON
 // @Tags 字典数据
@@ -65,7 +63,7 @@ func (e SysDictData) GetPage(c *gin.Context) {
 // @Security Bearer
 func (e SysDictData) Get(c *gin.Context) {
 	s := service.SysDictData{}
-	req := dto.SysDictDataById{}
+	req := dto.SysDictDataGetReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, nil).
@@ -82,27 +80,26 @@ func (e SysDictData) Get(c *gin.Context) {
 	err = s.Get(&req, &object)
 	if err != nil {
 		e.Logger.Warnf("Get error: %s", err.Error())
-		e.Error(http.StatusInternalServerError, err, "查询失败")
+		e.Error(500, err, "查询失败")
 		return
 	}
 
 	e.OK(object, "查询成功")
 }
 
-// InsertSysDictData
+// Insert
 // @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": "添加失败"}"
+// @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.SysDictDataControl{}
+	req := dto.SysDictDataInsertReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON).
@@ -123,20 +120,19 @@ func (e SysDictData) Insert(c *gin.Context) {
 	e.OK(req.GetId(), "创建成功")
 }
 
-// UpdateSysDictData
+// Update
 // @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": "添加失败"}"
+// @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.SysDictDataControl{}
+	req := dto.SysDictDataUpdateReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON, nil).
@@ -156,18 +152,17 @@ func (e SysDictData) Update(c *gin.Context) {
 	e.OK(req.GetId(), "更新成功")
 }
 
-// DeleteSysDictData
+// Delete
 // @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]
+// @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.SysDictDataById{}
+	req := dto.SysDictDataDeleteReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON, nil).
@@ -187,21 +182,20 @@ func (e SysDictData) Delete(c *gin.Context) {
 	e.OK(req.GetId(), "删除成功")
 }
 
-// GetSysDictDataAll 数据字典根据key获取 业务页面使用
+// GetAll 数据字典根据key获取 业务页面使用
 // @Summary 数据字典根据key获取
 // @Description 数据字典根据key获取
 // @Tags 字典数据
 // @Param dictType query int true "dictType"
-// @Success 200 {string} string	"{"code": 200, "message": "删除成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "删除失败"}"
+// @Success 200 {object} response.Response{data=[]dto.SysDictDataGetAllResp}  "{"code": 200, "data": [...]}"
 // @Router /api/v1/dict-data/option-select [get]
 // @Security Bearer
-func (e SysDictData) GetSysDictDataAll(c *gin.Context) {
+func (e SysDictData) GetAll(c *gin.Context) {
 	s := service.SysDictData{}
-	req := dto.SysDictDataSearch{}
+	req := dto.SysDictDataGetPageReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
-		Bind(&req, binding.Form).
+		Bind(&req).
 		MakeService(&s.Service).
 		Errors
 	if err != nil {
@@ -215,5 +209,12 @@ func (e SysDictData) GetSysDictDataAll(c *gin.Context) {
 		e.Error(500, err, "查询失败")
 		return
 	}
-	e.OK(list, "查询成功")
-}
+	l := make([]dto.SysDictDataGetAllResp, 0)
+	for _, i := range list {
+		d := dto.SysDictDataGetAllResp{}
+		e.Translate(i, &d)
+		l = append(l, d)
+	}
+
+	e.OK(l,"查询成功")
+}

app/admin/apis/sys_dict_type.go

@@ -1,14 +1,13 @@
 package apis
 
 import (
-	"github.com/gin-gonic/gin/binding"
-	"go-admin/app/admin/models"
-	"net/http"
-
+	"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"
@@ -32,7 +31,7 @@ type SysDictType struct {
 // @Security Bearer
 func (e SysDictType) GetPage(c *gin.Context) {
 	s := service.SysDictType{}
-	req := dto.SysDictTypeSearch{}
+	req :=dto.SysDictTypeGetPageReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.Form).
@@ -63,7 +62,7 @@ func (e SysDictType) GetPage(c *gin.Context) {
 // @Security Bearer
 func (e SysDictType) Get(c *gin.Context) {
 	s := service.SysDictType{}
-	req := dto.SysDictTypeById{}
+	req :=dto.SysDictTypeGetReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, nil).
@@ -89,14 +88,13 @@ func (e SysDictType) Get(c *gin.Context) {
 // @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": "添加失败"}"
+// @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.SysDictTypeControl{}
+	req :=dto.SysDictTypeInsertReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON).
@@ -111,7 +109,7 @@ func (e SysDictType) Insert(c *gin.Context) {
 	err = s.Insert(&req)
 	if err != nil {
 		e.Logger.Error(err)
-		e.Error(500, err, "创建失败")
+		e.Error(500, err,fmt.Sprintf(" 创建字典类型失败，详情：%s", err.Error()))
 		return
 	}
 	e.OK(req.GetId(), "创建成功")
@@ -123,21 +121,20 @@ func (e SysDictType) Insert(c *gin.Context) {
 // @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": "添加失败"}"
+// @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.SysDictTypeControl{}
+	req :=dto.SysDictTypeUpdateReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON, nil).
 		MakeService(&s.Service).
 		Errors
 	if err != nil {
-		e.Error(http.StatusInternalServerError, err, err.Error())
+		e.Error(500, err, err.Error())
 		e.Logger.Error(err)
 		return
 	}
@@ -154,13 +151,13 @@ func (e SysDictType) Update(c *gin.Context) {
 // @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]
+// @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.SysDictTypeById{}
+	req :=dto.SysDictTypeDeleteReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON, nil).
@@ -192,7 +189,7 @@ func (e SysDictType) Delete(c *gin.Context) {
 // @Security Bearer
 func (e SysDictType) GetAll(c *gin.Context) {
 	s := service.SysDictType{}
-	req := dto.SysDictTypeSearch{}
+	req :=dto.SysDictTypeGetPageReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.Form).
@@ -206,7 +203,7 @@ func (e SysDictType) GetAll(c *gin.Context) {
 	list := make([]models.SysDictType, 0)
 	err = s.GetAll(&req, &list)
 	if err != nil {
-		e.Error(500, err, "查询失败")
+		e.Error(500, err, err.Error())
 		return
 	}
 	e.OK(list, "查询成功")

app/admin/apis/sys_login_log.go

@@ -4,7 +4,6 @@ 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"
@@ -30,7 +29,7 @@ type SysLoginLog struct {
 // @Security Bearer
 func (e SysLoginLog) GetPage(c *gin.Context) {
 	s := service.SysLoginLog{}
-	req := dto.SysLoginLogSearch {}
+	req :=dto.SysLoginLogGetPageReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.Form).
@@ -51,7 +50,7 @@ func (e SysLoginLog) GetPage(c *gin.Context) {
 	e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
 }
 
-// GetSysLoginLog 登录日志通过id获取
+// Get 登录日志通过id获取
 // @Summary 登录日志通过id获取
 // @Description 获取JSON
 // @Tags 登录日志
@@ -61,10 +60,10 @@ func (e SysLoginLog) GetPage(c *gin.Context) {
 // @Security Bearer
 func (e SysLoginLog) Get(c *gin.Context) {
 	s := service.SysLoginLog{}
-	req := dto.SysLoginLogById{}
+	req :=dto.SysLoginLogGetReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
-		Bind(&req, binding.JSON, nil).
+		Bind(&req).
 		MakeService(&s.Service).
 		Errors
 	if err != nil {
@@ -81,16 +80,17 @@ func (e SysLoginLog) Get(c *gin.Context) {
 	e.OK(object, "查询成功")
 }
 
-// DeleteSysLoginLog 登录日志删除
+// Delete 登录日志删除
 // @Summary 登录日志删除
 // @Description 登录日志删除
 // @Tags 登录日志
-// @Param data body dto.SysLoginLogById true "body"
+// @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.SysLoginLogById{}
+	req :=dto.SysLoginLogDeleteReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON, nil).
@@ -101,7 +101,6 @@ func (e SysLoginLog) Delete(c *gin.Context) {
 		e.Error(500, err, err.Error())
 		return
 	}
-	req.SetUpdateBy(user.GetUserId(c))
 	err = s.Remove(&req)
 	if err != nil {
 		e.Error(500, err, "删除失败")

app/admin/apis/sys_menu.go

@@ -1,13 +1,11 @@
 package apis
 
 import (
-	"github.com/gin-gonic/gin/binding"
-	"go-admin/app/admin/models"
-	"net/http"
-
 	"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"
@@ -22,13 +20,12 @@ type SysMenu struct {
 // @Description 获取JSON
 // @Tags 菜单
 // @Param menuName query string false "menuName"
-// @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.SysMenuSearch{}
+	req := dto.SysMenuGetPageReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.Form).
@@ -57,7 +54,7 @@ func (e SysMenu) GetPage(c *gin.Context) {
 // @Router /api/v1/menu/{id} [get]
 // @Security Bearer
 func (e SysMenu) Get(c *gin.Context) {
-	req := dto.SysMenuById{}
+	req := dto.SysMenuGetReq{}
 	s := new(service.SysMenu)
 	err := e.MakeContext(c).
 		MakeOrm().
@@ -85,12 +82,12 @@ func (e SysMenu) Get(c *gin.Context) {
 // @Tags 菜单
 // @Accept  application/json
 // @Product application/json
-// @Param data body dto.SysMenuControl true "data"
+// @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.SysMenuControl{}
+	req := dto.SysMenuInsertReq{}
 	s := new(service.SysMenu)
 	err := e.MakeContext(c).
 		MakeOrm().
@@ -119,12 +116,12 @@ func (e SysMenu) Insert(c *gin.Context) {
 // @Accept  application/json
 // @Product application/json
 // @Param id path int true "id"
-// @Param data body dto.SysMenuControl true "body"
+// @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.SysMenuControl{}
+	req := dto.SysMenuUpdateReq{}
 	s := new(service.SysMenu)
 	err := e.MakeContext(c).
 		MakeOrm().
@@ -150,11 +147,12 @@ func (e SysMenu) Update(c *gin.Context) {
 // @Summary 删除菜单
 // @Description 删除数据
 // @Tags 菜单
-// @Param data body dto.SysMenuById true "body"
+// @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.SysMenuById)
+	control := new(dto.SysMenuDeleteReq)
 	s := new(service.SysMenu)
 	err := e.MakeContext(c).
 		MakeOrm().
@@ -169,7 +167,7 @@ func (e SysMenu) Delete(c *gin.Context) {
 	err = s.Remove(control).Error
 	if err != nil {
 		e.Logger.Errorf("RemoveSysMenu error, %s", err)
-		e.Error(http.StatusInternalServerError, err, "删除失败")
+		e.Error(500, err, "删除失败")
 		return
 	}
 	e.OK(control.GetId(), "删除成功")
@@ -197,43 +195,50 @@ func (e SysMenu) GetMenuRole(c *gin.Context) {
 	result, err := s.SetMenuRole(user.GetRoleName(c))
 
 	if err != nil {
-		e.Error(http.StatusInternalServerError, err, "查询失败")
+		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)
-	err := e.MakeContext(c).
-		MakeOrm().
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-	var data models.RoleMenu
-	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, "")
-}
+//// 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 角色修改使用的菜单列表
@@ -248,7 +253,7 @@ func (e SysMenu) GetMenuIDS(c *gin.Context) {
 func (e SysMenu) GetMenuTreeSelect(c *gin.Context) {
 	m := service.SysMenu{}
 	r := service.SysRole{}
-	req := dto.SelectRole{}
+	req :=dto.SelectRole{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		MakeService(&m.Service).

app/admin/apis/sys_opera_log.go

@@ -1,12 +1,11 @@
 package apis
 
 import (
-	"github.com/gin-gonic/gin/binding"
-	"go-admin/app/admin/models"
-	"net/http"
-
+	"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"
 )
@@ -32,7 +31,7 @@ type SysOperaLog struct {
 // @Security Bearer
 func (e SysOperaLog) GetPage(c *gin.Context) {
 	s := service.SysOperaLog{}
-	req := new(dto.SysOperaLogSearch)
+	req := new(dto.SysOperaLogGetPageReq)
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(req, binding.Form).
@@ -49,7 +48,7 @@ func (e SysOperaLog) GetPage(c *gin.Context) {
 
 	err = s.GetPage(req, &list, &count)
 	if err != nil {
-		e.Error(http.StatusUnprocessableEntity, err, "查询失败")
+		e.Error(500, err, "查询失败")
 		return
 	}
 
@@ -66,7 +65,7 @@ func (e SysOperaLog) GetPage(c *gin.Context) {
 // @Security Bearer
 func (e SysOperaLog) Get(c *gin.Context) {
 	s := new(service.SysOperaLog)
-	req := dto.SysOperaLogById{}
+	req :=dto.SysOperaLogGetReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, nil).
@@ -91,15 +90,16 @@ func (e SysOperaLog) Get(c *gin.Context) {
 // @Summary 删除操作日志
 // @Description 删除数据
 // @Tags 操作日志
-// @Param data body dto.SysOperaLogById true "body"
+// @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 := new(dto.SysOperaLogById)
+	req :=dto.SysOperaLogDeleteReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
-		Bind(req, binding.Form).
+		Bind(&req, binding.JSON).
 		MakeService(&s.Service).
 		Errors
 	if err != nil {
@@ -108,10 +108,11 @@ func (e SysOperaLog) Delete(c *gin.Context) {
 		return
 	}
 
-	err = s.Remove(req)
+	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(), "删除成功")
-}
+}

app/admin/apis/sys_post.go

@@ -1,10 +1,10 @@
 package apis
 
 import (
-	"github.com/gin-gonic/gin/binding"
-	"net/http"
-
+	"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"
@@ -31,7 +31,7 @@ type SysPost struct {
 // @Security Bearer
 func (e SysPost) GetPage(c *gin.Context) {
 	s := service.SysPost{}
-	req := dto.SysPostSearch{}
+	req :=dto.SysPostPageReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.Form).
@@ -46,9 +46,9 @@ func (e SysPost) GetPage(c *gin.Context) {
 	list := make([]models.SysPost, 0)
 	var count int64
 
-	err = s.GetSysPostPage(&req, &list, &count)
+	err = s.GetPage(&req, &list, &count)
 	if err != nil {
-		e.Error(http.StatusUnprocessableEntity, err, "查询失败")
+		e.Error(500, err, "查询失败")
 		return
 	}
 
@@ -59,13 +59,13 @@ func (e SysPost) GetPage(c *gin.Context) {
 // @Summary 获取岗位信息
 // @Description 获取JSON
 // @Tags 岗位
-// @Param postId path int true "postId"
+// @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.SysPostById{}
+	req :=dto.SysPostGetReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, nil).
@@ -78,9 +78,9 @@ func (e SysPost) Get(c *gin.Context) {
 	}
 	var object models.SysPost
 
-	err = s.GetSysPost(&req, &object)
+	err = s.Get(&req, &object)
 	if err != nil {
-		e.Error(500, err, "查询失败")
+		e.Error(500, err, fmt.Sprintf("岗位信息获取失败！错误详情：%s", err.Error()))
 		return
 	}
 
@@ -93,14 +93,13 @@ func (e SysPost) Get(c *gin.Context) {
 // @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": "添加失败"}"
+// @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.SysPostControl{}
+	req :=dto.SysPostInsertReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON).
@@ -112,9 +111,9 @@ func (e SysPost) Insert(c *gin.Context) {
 		return
 	}
 	req.SetCreateBy(user.GetUserId(c))
-	err = s.InsertSysPost(&req)
+	err = s.Insert(&req)
 	if err != nil {
-		e.Error(500, err, "创建失败")
+		e.Error(500, err, fmt.Sprintf("新建岗位失败！错误详情：%s", err.Error()))
 		return
 	}
 	e.OK(req.GetId(), "创建成功")
@@ -126,14 +125,13 @@ func (e SysPost) Insert(c *gin.Context) {
 // @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]
+// @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.SysPostControl{}
+	req :=dto.SysPostUpdateReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON, nil).
@@ -147,9 +145,9 @@ func (e SysPost) Update(c *gin.Context) {
 
 	req.SetUpdateBy(user.GetUserId(c))
 
-	err = s.UpdateSysPost(&req)
+	err = s.Update(&req)
 	if err != nil {
-		e.Logger.Error(err)
+		e.Error(500, err, fmt.Sprintf("岗位更新失败！错误详情：%s", err.Error()))
 		return
 	}
 	e.OK(req.GetId(), "更新成功")
@@ -159,16 +157,16 @@ func (e SysPost) Update(c *gin.Context) {
 // @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]
+// @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.SysPostById{}
+	req :=dto.SysPostDeleteReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
-		Bind(&req, binding.JSON, nil).
+		Bind(&req, binding.JSON).
 		MakeService(&s.Service).
 		Errors
 	if err != nil {
@@ -177,9 +175,9 @@ func (e SysPost) Delete(c *gin.Context) {
 		return
 	}
 	req.SetUpdateBy(user.GetUserId(c))
-	err = s.RemoveSysPost(&req)
+	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(), "删除成功")

app/admin/apis/sys_role.go

@@ -2,10 +2,11 @@ package apis
 
 import (
 	"fmt"
+	"net/http"
+
 	"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"
@@ -14,7 +15,6 @@ import (
 
 	"go-admin/app/admin/service"
 	"go-admin/app/admin/service/dto"
-	"go-admin/common/global"
 )
 
 type SysRole struct {
@@ -35,7 +35,7 @@ type SysRole struct {
 // @Security Bearer
 func (e SysRole) GetPage(c *gin.Context) {
 	s := service.SysRole{}
-	req := dto.SysRoleSearch{}
+	req := dto.SysRoleGetPageReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.Form).
@@ -69,7 +69,7 @@ func (e SysRole) GetPage(c *gin.Context) {
 // @Security Bearer
 func (e SysRole) Get(c *gin.Context) {
 	s := service.SysRole{}
-	req := dto.SysRoleById{}
+	req := dto.SysRoleGetReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, nil).
@@ -98,13 +98,13 @@ func (e SysRole) Get(c *gin.Context) {
 // @Tags 角色/Role
 // @Accept  application/json
 // @Product application/json
-// @Param data body dto.SysRoleControl true "data"
+// @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.SysRoleControl{}
+	req := dto.SysRoleInsertReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON).
@@ -125,14 +125,10 @@ func (e SysRole) Insert(c *gin.Context) {
 	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, "")
+		e.Error(500, err, "创建失败,"+err.Error())
 		return
 	}
+
 	e.OK(req.GetId(), "创建成功")
 }
 
@@ -142,13 +138,13 @@ func (e SysRole) Insert(c *gin.Context) {
 // @Tags 角色/Role
 // @Accept  application/json
 // @Product application/json
-// @Param data body dto.SysRoleControl true "body"
+// @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.SysRoleControl{}
+	req := dto.SysRoleUpdateReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, nil, binding.JSON).
@@ -168,11 +164,7 @@ func (e SysRole) Update(c *gin.Context) {
 		e.Logger.Error(err)
 		return
 	}
-	_, err = global.LoadPolicy(c)
-	if err != nil {
-		e.Error(http.StatusInternalServerError, err, "")
-		return
-	}
+
 	e.OK(req.GetId(), "更新成功")
 }
 
@@ -180,13 +172,13 @@ func (e SysRole) Update(c *gin.Context) {
 // @Summary 删除用户角色
 // @Description 删除数据
 // @Tags 角色/Role
-// @Param data body dto.SysRoleById true "body"
+// @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.SysRoleById{}
+	req := dto.SysRoleDeleteReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON).
@@ -198,17 +190,14 @@ func (e SysRole) Delete(c *gin.Context) {
 		return
 	}
 
-	err = s.Remove(&req)
+	cb := sdk.Runtime.GetCasbinKey(c.Request.Host)
+	err = s.Remove(&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, fmt.Sprintf("删除角色 %v 失败，失败信息 %s", req.Id, err.Error()))
-		return
-	}
+
 	e.OK(req.GetId(), fmt.Sprintf("删除角色角色 %v 状态成功！", req.GetId()))
 }
 
@@ -227,12 +216,12 @@ func (e SysRole) Update2Status(c *gin.Context) {
 	req := dto.UpdateStatusReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
-		Bind(&req, nil, binding.JSON).
+		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()))
+		e.Error(500, err, fmt.Sprintf("更新角色状态失败，失败原因：%s ", err.Error()))
 		return
 	}
 	req.SetUpdateBy(user.GetUserId(c))
@@ -255,7 +244,7 @@ func (e SysRole) Update2Status(c *gin.Context) {
 // @Router /api/v1/role-status/{id} [put]
 // @Security Bearer
 func (e SysRole) Update2DataScope(c *gin.Context) {
-	s := &service.SysRole{}
+	s := service.SysRole{}
 	req := dto.RoleDataScopeReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
@@ -273,9 +262,9 @@ func (e SysRole) Update2DataScope(c *gin.Context) {
 		DeptIds:   req.DeptIds,
 	}
 	data.UpdateBy = user.GetUserId(c)
-	err = s.UpdateDataScope(data)
+	err = s.UpdateDataScope(&req).Error
 	if err != nil {
-		e.Error(http.StatusInternalServerError, err, "")
+		e.Error(500, err, fmt.Sprintf("更新角色数据权限失败！错误详情：%s", err.Error()))
 		return
 	}
 	e.OK(nil, "操作成功")

app/admin/apis/sys_user.go

@@ -2,7 +2,9 @@ package apis
 
 import (
 	"github.com/gin-gonic/gin/binding"
+	"github.com/go-admin-team/go-admin-core/sdk/config"
 	"go-admin/app/admin/models"
+	"golang.org/x/crypto/bcrypt"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
@@ -30,10 +32,10 @@ type SysUser struct {
 // @Security Bearer
 func (e SysUser) GetPage(c *gin.Context) {
 	s := service.SysUser{}
-	req := dto.SysUserSearch{}
+	req := dto.SysUserGetPageReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
-		Bind(&req, binding.Form).
+		Bind(&req).
 		MakeService(&s.Service).
 		Errors
 	if err != nil {
@@ -48,7 +50,7 @@ func (e SysUser) GetPage(c *gin.Context) {
 	list := make([]models.SysUser, 0)
 	var count int64
 
-	err = s.GetSysUserPage(&req, p, &list, &count)
+	err = s.GetPage(&req, p, &list, &count)
 	if err != nil {
 		e.Error(500, err, "查询失败")
 		return
@@ -63,7 +65,7 @@ func (e SysUser) GetPage(c *gin.Context) {
 // @Tags 用户
 // @Param userId path int true "用户编码"
 // @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/sysUser/{userId} [get]
+// @Router /api/v1/sys-user/{userId} [get]
 // @Security Bearer
 func (e SysUser) Get(c *gin.Context) {
 	s := service.SysUser{}
@@ -81,7 +83,7 @@ func (e SysUser) Get(c *gin.Context) {
 	var object models.SysUser
 	//数据权限检查
 	p := actions.GetPermissionFromContext(c)
-	err = s.GetSysUser(&req, p, &object)
+	err = s.Get(&req, p, &object)
 	if err != nil {
 		e.Error(http.StatusUnprocessableEntity, err, "查询失败")
 		return
@@ -95,12 +97,13 @@ func (e SysUser) Get(c *gin.Context) {
 // @Tags 用户
 // @Accept  application/json
 // @Product application/json
-// @Param data body dto.SysUserControl true "用户数据"
+// @Param data body dto.SysUserInsertReq true "用户数据"
 // @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/sysUser [post]
+// @Router /api/v1/sys-user [post]
+// @Security Bearer
 func (e SysUser) Insert(c *gin.Context) {
 	s := service.SysUser{}
-	req := dto.SysUserControl{}
+	req := dto.SysUserInsertReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON).
@@ -113,7 +116,7 @@ func (e SysUser) Insert(c *gin.Context) {
 	}
 	// 设置创建人
 	req.SetCreateBy(user.GetUserId(c))
-	err = s.InsertSysUser(&req)
+	err = s.Insert(&req)
 	if err != nil {
 		e.Logger.Error(err)
 		e.Error(500, err, err.Error())
@@ -129,15 +132,16 @@ func (e SysUser) Insert(c *gin.Context) {
 // @Tags 用户
 // @Accept  application/json
 // @Product application/json
-// @Param data body dto.SysUserControl true "body"
+// @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.SysUserControl{}
+	req := dto.SysUserUpdateReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
-		Bind(&req, binding.JSON, nil).
+		Bind(&req).
 		MakeService(&s.Service).
 		Errors
 	if err != nil {
@@ -151,7 +155,7 @@ func (e SysUser) Update(c *gin.Context) {
 	//数据权限检查
 	p := actions.GetPermissionFromContext(c)
 
-	err = s.UpdateSysUser(&req, p)
+	err = s.Update(&req, p)
 	if err != nil {
 		e.Logger.Error(err)
 		return
@@ -166,6 +170,7 @@ func (e SysUser) Update(c *gin.Context) {
 // @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{}
@@ -186,7 +191,7 @@ func (e SysUser) Delete(c *gin.Context) {
 	// 数据权限检查
 	p := actions.GetPermissionFromContext(c)
 
-	err = s.RemoveSysUser(&req, p)
+	err = s.Remove(&req, p)
 	if err != nil {
 		e.Logger.Error(err)
 		return
@@ -202,9 +207,10 @@ func (e SysUser) Delete(c *gin.Context) {
 // @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.SysUserControl{}
+	req := dto.UpdateSysUserAvatarReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		MakeService(&s.Service).
@@ -233,7 +239,7 @@ func (e SysUser) InsetAvatar(c *gin.Context) {
 	req.UserId = p.UserId
 	req.Avatar = "/" + filPath
 
-	err = s.UpdateSysUser(&req, p)
+	err = s.UpdateAvatar(&req, p)
 	if err != nil {
 		e.Logger.Error(err)
 		return
@@ -250,6 +256,7 @@ func (e SysUser) InsetAvatar(c *gin.Context) {
 // @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{}
@@ -269,7 +276,7 @@ func (e SysUser) UpdateStatus(c *gin.Context) {
 	//数据权限检查
 	p := actions.GetPermissionFromContext(c)
 
-	err = s.UpdateSysUserStatus(&req, p)
+	err = s.UpdateStatus(&req, p)
 	if err != nil {
 		e.Logger.Error(err)
 		return
@@ -286,6 +293,7 @@ func (e SysUser) UpdateStatus(c *gin.Context) {
 // @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{}
@@ -305,23 +313,30 @@ func (e SysUser) ResetPwd(c *gin.Context) {
 	//数据权限检查
 	p := actions.GetPermissionFromContext(c)
 
-	err = s.ResetSysUserPwd(&req, p)
+	if req.UserId == 1 && config.ApplicationConfig.Mode == "demo" {
+		req.Password = "123456"
+	}
+	err = s.ResetPwd(&req, p)
 	if err != nil {
 		e.Logger.Error(err)
 		return
 	}
-	e.OK(req.GetId(), "更新成功")
+	if req.UserId == 1 && config.ApplicationConfig.Mode == "demo" {
+		e.OK(req.GetId(), "admin:现在使用的预览环境，休想改掉我！否则会影响其他朋友体验的哦！可以创建其他用户体验该功能！")
+	} else {
+		e.OK(req.GetId(), "更新成功")
+	}
 }
 
 // UpdatePwd
-// @Summary 重置密码
+// @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]
+// @Router /api/v1/user/pwd/set [put]
 // @Security Bearer
 func (e SysUser) UpdatePwd(c *gin.Context) {
 	s := service.SysUser{}
@@ -339,14 +354,26 @@ func (e SysUser) UpdatePwd(c *gin.Context) {
 
 	// 数据权限检查
 	p := actions.GetPermissionFromContext(c)
+	if user.GetUserId(c) == 1 && config.ApplicationConfig.Mode == "demo" {
+		req.NewPassword = "123456"
+	}
 
-	err = s.UpdateSysUserPwd(user.GetUserId(c), req.OldPassword, req.NewPassword, p)
+	var hash []byte
+	if hash, err = bcrypt.GenerateFromPassword([]byte(req.NewPassword), bcrypt.DefaultCost); err != nil {
+		req.NewPassword = string(hash)
+	}
+
+	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, "密码修改成功")
+	if user.GetUserId(c) == 1 && config.ApplicationConfig.Mode == "demo" {
+		e.OK(nil, "admin:现在使用的预览环境，休想改掉我！否则会影响其他朋友体验的哦！可以创建其他用户体验该功能！")
+	} else {
+		e.OK(nil, "密码修改成功")
+	}
 }
 
 // GetProfile
@@ -374,7 +401,7 @@ func (e SysUser) GetProfile(c *gin.Context) {
 	sysUser := models.SysUser{}
 	roles := make([]models.SysRole, 0)
 	posts := make([]models.SysPost, 0)
-	err = s.GetSysUserProfile(&req, &sysUser, &roles, &posts)
+	err = s.GetProfile(&req, &sysUser, &roles, &posts)
 	if err != nil {
 		e.Logger.Errorf("get user profile error, %s", err.Error())
 		e.Error(500, err, "获取用户信息失败")
@@ -397,8 +424,10 @@ func (e SysUser) GetProfile(c *gin.Context) {
 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 {
@@ -413,21 +442,20 @@ func (e SysUser) GetInfo(c *gin.Context) {
 	permissions[0] = "*:*:*"
 	var buttons = make([]string, 1)
 	buttons[0] = "*:*:*"
-	RoleMenu := models.RoleMenu{}
-	RoleMenu.RoleId = user.GetRoleId(c)
+
 	var mp = make(map[string]interface{})
 	mp["roles"] = roles
 	if user.GetRoleName(c) == "admin" || user.GetRoleName(c) == "系统管理员" {
 		mp["permissions"] = permissions
 		mp["buttons"] = buttons
 	} else {
-		list, _ := RoleMenu.GetPermis(e.Orm)
+		list, _ := r.GetById(user.GetRoleId(c))
 		mp["permissions"] = list
 		mp["buttons"] = list
 	}
 	sysUser := models.SysUser{}
 	req.Id = user.GetUserId(c)
-	err = s.GetSysUser(&req, p, &sysUser)
+	err = s.Get(&req, p, &sysUser)
 	if err != nil {
 		e.Error(http.StatusUnauthorized, err, "登录失败")
 		return
@@ -441,5 +469,6 @@ func (e SysUser) GetInfo(c *gin.Context) {
 	mp["userId"] = sysUser.UserId
 	mp["deptId"] = sysUser.DeptId
 	mp["name"] = sysUser.NickName
+	mp["code"] = 200
 	e.OK(mp, "")
-}
+}

app/admin/models/datascope.go

@@ -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
+//	}
+//}

app/admin/models/menu.go

@@ -1,154 +0,0 @@
-package models
-
-//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) 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(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
-//}

app/admin/models/role.go

@@ -1,241 +0,0 @@
-package models
-
-//type SysRole struct {
-//	RoleId    int    `json:"roleId" gorm:"primaryKey;autoIncrement"` // 角色编码
-//	RoleName  string `json:"roleName" gorm:"size:128;"`              // 角色名称
-//	Status    string `json:"status" gorm:"size:4;"`                  //
-//	RoleKey   string `json:"roleKey" gorm:"size:128;"`               //角色代码
-//	RoleSort  int    `json:"roleSort" gorm:""`                       //角色排序
-//	Flag      string `json:"flag" gorm:"size:128;"`                  //
-//	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
-//}

app/admin/models/role_dept.go

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

app/admin/models/role_menu.go

@@ -1,171 +0,0 @@
-package models
-
-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
-
-}

app/admin/models/sys_api.go

@@ -1,10 +1,14 @@
 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"
@@ -58,8 +62,21 @@ func SaveSysApi(message storage.Messager) (err error) {
 				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}).
+					Attrs(SysApi{Handle: v.Handler, Title: apiTitle}).
 					FirstOrCreate(&SysApi{}).
 					//Update("handle", v.Handler).
 					Error

app/admin/models/sys_dept.go

@@ -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:"-"`

app/admin/models/sys_dict_data.go

@@ -5,9 +5,6 @@ import (
 )
 
 type SysDictData struct {
-	models.ControlBy
-	models.ModelTime
-
 	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"`
@@ -16,9 +13,11 @@ type SysDictData struct {
 	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    string `json:"status" gorm:"size:4;comment:Status"`
+	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 {

app/admin/models/sys_dict_type.go

@@ -5,14 +5,13 @@ import (
 )
 
 type SysDictType struct {
-	models.ControlBy
-	models.ModelTime
-
 	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   string `json:"status" gorm:"size:4;comment:Status"`
+	Status   int    `json:"status" gorm:"size:4;comment:Status"`
 	Remark   string `json:"remark" gorm:"size:255;comment:Remark"`
+	models.ControlBy
+	models.ModelTime
 }
 
 func (SysDictType) TableName() string {

app/admin/models/sys_opera_log.go

@@ -57,24 +57,32 @@ func SaveOperaLog(message storage.Messager) (err error) {
 	if db == nil {
 		err = errors.New("db not exist")
 		log.Errorf("host[%s]'s %s", message.GetPrefix(), err.Error())
-		return err
+		// 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())
-		return err
+		// 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())
-		return err
+		// 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())
-		return err
+		// Log writing to the database ignores error
+		return nil
 	}
 	return nil
 }

app/admin/models/sys_role.go

@@ -15,6 +15,7 @@ type SysRole struct {
 	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

app/admin/models/sys_user.go

@@ -7,8 +7,6 @@ import (
 )
 
 type SysUser struct {
-	models.ControlBy
-	models.ModelTime
 	UserId   int      `gorm:"primaryKey;autoIncrement;comment:编码"  json:"userId"`
 	Username string   `json:"username" gorm:"size:64;comment:用户名"`
 	Password string   `json:"-" gorm:"size:128;comment:密码"`
@@ -27,6 +25,8 @@ type SysUser struct {
 	PostIds  []int    `json:"postIds" gorm:"-"`
 	RoleIds  []int    `json:"roleIds" gorm:"-"`
 	Dept     *SysDept `json:"dept"`
+	models.ControlBy
+	models.ModelTime
 }
 
 func (SysUser) TableName() string {

app/admin/router/sys_config.go

@@ -31,7 +31,7 @@ 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())

app/admin/router/sys_dept.go

@@ -21,7 +21,7 @@ func registerSysDeptRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddle
 		r.GET("/:id", api.Get)
 		r.POST("", api.Insert)
 		r.PUT("/:id", api.Update)
-		r.DELETE("/:id", api.Delete)
+		r.DELETE("", api.Delete)
 	}
 
 	r1 := v1.Group("").Use(authMiddleware.MiddlewareFunc())

app/admin/router/sys_dict.go

@@ -32,6 +32,6 @@ func registerDictRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddlewar
 	}
 	opSelect := v1.Group("/dict-data").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
 	{
-		opSelect.GET("/option-select", dataApi.GetSysDictDataAll)
+		opSelect.GET("/option-select", dataApi.GetAll)
 	}
 }

app/admin/router/sys_post.go

@@ -20,6 +20,6 @@ func registerSyPostRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddlew
 		r.GET("/:id", api.Get)
 		r.POST("", api.Insert)
 		r.PUT("/:id", api.Update)
-		r.DELETE("/:id", api.Delete)
+		r.DELETE("", api.Delete)
 	}
 }

app/admin/router/sys_router.go

@@ -1,6 +1,7 @@
 package router
 
 import (
+	"github.com/go-admin-team/go-admin-core/sdk/config"
 	"go-admin/app/admin/apis"
 	"mime"
 
@@ -21,7 +22,9 @@ func InitSysRouter(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware) *gin.Rou
 	// 静态文件
 	sysStaticFileRouter(g)
 	// swagger；注意：生产环境可以注释掉
-	sysSwaggerRouter(g)
+	if config.ApplicationConfig.Mode != "prod" {
+		sysSwaggerRouter(g)
+	}
 	// 需要认证
 	sysCheckRoleRouterInit(g, authMiddleware)
 	return g
@@ -33,7 +36,9 @@ func sysBaseRouter(r *gin.RouterGroup) {
 	go ws.WebsocketManager.SendService()
 	go ws.WebsocketManager.SendAllService()
 
-	r.GET("/", apis.HelloWorld)
+	if config.ApplicationConfig.Mode != "prod" {
+		r.GET("/", apis.GoAdmin)
+	}
 	r.GET("/info", handler.Ping)
 }
 
@@ -43,7 +48,9 @@ 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) {
@@ -51,16 +58,19 @@ func sysSwaggerRouter(r *gin.RouterGroup) {
 }
 
 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)
 }
 
 func registerBaseRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {

app/admin/router/sys_user.go

@@ -28,7 +28,7 @@ func registerSysUserRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddle
 	{
 		user.GET("/profile", api.GetProfile)
 		user.POST("/avatar", api.InsetAvatar)
-		user.PUT("/pwd", api.UpdatePwd)
+		user.PUT("/pwd/set", api.UpdatePwd)
 		user.PUT("/pwd/reset", api.ResetPwd)
 		user.PUT("/status", api.UpdateStatus)
 	}

app/admin/service/dto/sys_api.go

@@ -6,7 +6,8 @@ import (
 	common "go-admin/common/models"
 )
 
-type SysApiSearch struct {
+// 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:"地址"`
@@ -21,11 +22,35 @@ type SysApiOrder struct {
 	CreatedAtOrder string `search:"type:order;column:created_at;table:sys_api" form:"createdAtOrder"`
 }
 
-func (m *SysApiSearch) GetNeedSearch() interface{} {
+func (m *SysApiGetPageReq) GetNeedSearch() interface{} {
 	return *m
 }
 
-type SysApiControl struct {
+// 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:"标题"`
@@ -35,7 +60,7 @@ type SysApiControl struct {
 	common.ControlBy
 }
 
-func (s *SysApiControl) Generate(model *models.SysApi) {
+func (s *SysApiUpdateReq) Generate(model *models.SysApi) {
 	if s.Id != 0 {
 		model.Id = s.Id
 	}
@@ -46,28 +71,26 @@ func (s *SysApiControl) Generate(model *models.SysApi) {
 	model.Action = s.Action
 }
 
-func (s *SysApiControl) GetId() interface{} {
+func (s *SysApiUpdateReq) GetId() interface{} {
 	return s.Id
 }
 
-type SysApiById struct {
-	dto.ObjectById
-	common.ControlBy
+// SysApiGetReq 功能获取请求参数
+type SysApiGetReq struct {
+	Id int `uri:"id"`
 }
 
-func (s *SysApiById) GetId() interface{} {
-	if len(s.Ids) > 0 {
-		s.Ids = append(s.Ids, s.Id)
-		return s.Ids
-	}
+func (s *SysApiGetReq) GetId() interface{} {
 	return s.Id
 }
 
-func (s *SysApiById) Generate() dto.Control {
-	o := *s
-	return &o
+
+// SysApiDeleteReq 功能删除请求参数
+type SysApiDeleteReq struct {
+	Ids []int `json:"ids"`
 }
 
-func (s *SysApiById) GenerateM() (common.ActiveRecord, error) {
-	return &models.SysApi{}, nil
+func (s *SysApiDeleteReq) GetId() interface{} {
+	return s.Ids
 }
+

app/admin/service/dto/sys_config.go

@@ -6,8 +6,8 @@ import (
 	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"`
 	ConfigKey      string `form:"configKey" search:"type:contains;column:config_key;table:sys_config"`
@@ -24,7 +24,15 @@ type SysConfigOrder struct {
 	CreatedAtOrder  string `search:"type:order;column:created_at;table:sys_config" form:"createdAtOrder"`
 }
 
-func (m *SysConfigSearch) GetNeedSearch() interface{} {
+func (m *SysConfigGetPageReq) GetNeedSearch() interface{} {
+	return *m
+}
+
+type SysConfigGetToSysAppReq struct {
+	IsFrontend     int    `form:"isFrontend" search:"type:exact;column:is_frontend;table:sys_config"`
+}
+
+func (m *SysConfigGetToSysAppReq) GetNeedSearch() interface{} {
 	return *m
 }
 
@@ -86,22 +94,19 @@ type GetSysConfigByKEYForServiceResp struct {
 	ConfigValue string `json:"configValue" comment:""`
 }
 
-// SysConfigById 获取单个或者删除的结构体
-type SysConfigById struct {
-	Id  int   `uri:"id"`
+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 *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 *SysConfigDeleteReq) GetId() interface{} {
+	return s.Ids
 }

app/admin/service/dto/sys_dept.go

@@ -3,13 +3,10 @@ package dto
 import (
 	"go-admin/app/admin/models"
 	common "go-admin/common/models"
-
-	"go-admin/common/dto"
 )
 
-// SysDeptSearch 列表或者搜索使用结构体
-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:""`     //路径
@@ -21,27 +18,24 @@ 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
 }
 
-
-// SysDeptControl 增、改使用的结构体
-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:"状态"`     //状态
+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
 }
 
-// Generate 结构体数据转化 从 SysDeptControl 至 SysDept 对应的模型
-func (s *SysDeptControl) Generate(model *models.SysDept) {
+func (s *SysDeptInsertReq) Generate(model *models.SysDept) {
 	if s.DeptId != 0 {
 		model.DeptId = s.DeptId
 	}
@@ -56,35 +50,61 @@ func (s *SysDeptControl) Generate(model *models.SysDept) {
 }
 
 // GetId 获取数据对应的ID
-func (s *SysDeptControl) GetId() interface{} {
+func (s *SysDeptInsertReq) GetId() interface{} {
 	return s.DeptId
 }
 
-// SysDeptById 获取单个或者删除的结构体
-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
-}
-
-func (s *SysDeptById) GetId() interface{} {
-	if len(s.Ids) > 0 {
-		s.Ids = append(s.Ids, s.Id)
-		return s.Ids
+// 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
+}
+
+// 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) GenerateM() (*models.SysDept, error) {
-	return &models.SysDept{}, nil
+type SysDeptDeleteReq struct {
+	Ids []int `json:"ids"`
+}
+
+func (s *SysDeptDeleteReq) GetId() interface{} {
+	return s.Ids
 }
 
 type DeptLabel struct {
 	Id       int         `gorm:"-" json:"id"`
 	Label    string      `gorm:"-" json:"label"`
 	Children []DeptLabel `gorm:"-" json:"children"`
-}
+}

app/admin/service/dto/sys_dict_data.go

@@ -6,7 +6,7 @@ import (
 	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:""`
@@ -15,12 +15,17 @@ 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
 }
 
-type SysDictDataControl struct {
-	Id        int    `uri:"dictCode" comment:""`
+type SysDictDataGetAllResp struct {
+	DictLabel string `json:"label"`
+	DictValue string `json:"value"`
+}
+
+type SysDictDataInsertReq struct {
+	Id        int    `json:"-" comment:""`
 	DictSort  int    `json:"dictSort" comment:""`
 	DictLabel string `json:"dictLabel" comment:""`
 	DictValue string `json:"dictValue" comment:""`
@@ -28,14 +33,13 @@ 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) Generate(model *models.SysDictData) {
-
+func (s *SysDictDataInsertReq) Generate(model *models.SysDictData) {
 	model.DictCode = s.Id
 	model.DictSort = s.DictSort
 	model.DictLabel = s.DictLabel
@@ -49,24 +53,56 @@ func (s *SysDictDataControl) Generate(model *models.SysDictData) {
 	model.Remark = s.Remark
 }
 
-func (s *SysDictDataControl) GetId() interface{} {
+func (s *SysDictDataInsertReq) GetId() interface{} {
 	return s.Id
 }
 
-type SysDictDataById struct {
-	Id  int   `uri:"dictCode"`
-	Ids []int `json:"ids"`
+type SysDictDataUpdateReq struct {
+	Id        int    `uri:"dictCode" 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
 }
 
-func (s *SysDictDataById) GetId() interface{} {
-	if len(s.Ids) > 0 {
-		s.Ids = append(s.Ids, s.Id)
-		return s.Ids
-	}
+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 *SysDictDataUpdateReq) GetId() interface{} {
 	return s.Id
 }
 
-func (s *SysDictDataById) GenerateM() (common.ActiveRecord, error) {
-	return &models.SysDictData{}, nil
+type SysDictDataGetReq struct {
+	Id int `uri:"dictCode"`
+}
+
+func (s *SysDictDataGetReq) GetId() interface{} {
+	return s.Id
+}
+
+type SysDictDataDeleteReq struct {
+	Ids              []int `json:"ids"`
+	common.ControlBy `json:"-"`
+}
+
+func (s *SysDictDataDeleteReq) GetId() interface{} {
+	return s.Ids
 }

app/admin/service/dto/sys_dict_type.go

@@ -7,7 +7,7 @@ import (
 	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"`
@@ -19,20 +19,20 @@ type SysDictTypeOrder struct {
 	DictIdOrder string `search:"type:order;column:dict_id;table:sys_dict_type" form:"dictIdOrder"`
 }
 
-func (m *SysDictTypeSearch) GetNeedSearch() interface{} {
+func (m *SysDictTypeGetPageReq) GetNeedSearch() interface{} {
 	return *m
 }
 
-type SysDictTypeControl struct {
+type SysDictTypeInsertReq struct {
 	Id       int    `uri:"id"`
 	DictName string `json:"dictName"`
 	DictType string `json:"dictType"`
-	Status   string `json:"status"`
+	Status   int    `json:"status"`
 	Remark   string `json:"remark"`
 	common.ControlBy
 }
 
-func (s *SysDictTypeControl) Generate(model *models.SysDictType) {
+func (s *SysDictTypeInsertReq) Generate(model *models.SysDictType) {
 	if s.Id != 0 {
 		model.ID = s.Id
 	}
@@ -43,28 +43,47 @@ func (s *SysDictTypeControl) Generate(model *models.SysDictType) {
 
 }
 
-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) GetId() interface{} {
-	if len(s.Ids) > 0 {
-		s.Ids = append(s.Ids, s.Id)
-		return s.Ids
-	}
+func (s *SysDictTypeUpdateReq) GetId() interface{} {
 	return s.Id
 }
 
-func (s *SysDictTypeById) GenerateM() (common.ActiveRecord, error) {
-	return &models.SysDictType{}, nil
+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
 }

app/admin/service/dto/sys_login_log.go

@@ -1,14 +1,12 @@
 package dto
 
 import (
-	"go-admin/app/admin/models"
 	"time"
 
 	"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:"状态"`
@@ -16,13 +14,14 @@ type SysLoginLogSearch struct {
 	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
 }
 
 type SysLoginLogOrder struct {
-	HandleOrder string `search:"type:order;column:created_at;table:sys_login_log" form:"createdAtOrder"`
+	CreatedAtOrder string `search:"type:order;column:created_at;table:sys_login_log" form:"createdAtOrder"`
 }
 
-func (m *SysLoginLogSearch) GetNeedSearch() interface{} {
+func (m *SysLoginLogGetPageReq) GetNeedSearch() interface{} {
 	return *m
 }
 
@@ -40,41 +39,19 @@ type SysLoginLogControl struct {
 	Msg           string    `json:"msg" comment:"信息"`
 }
 
-func (s *SysLoginLogControl) Generate() (*models.SysLoginLog, error) {
-	return &models.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
+type SysLoginLogGetReq struct {
+	Id int `uri:"id"`
 }
 
-func (s *SysLoginLogControl) GetId() interface{} {
-	return s.ID
-}
-
-type SysLoginLogById struct {
-	Id  int   `uri:"id"`
-	Ids []int `json:"ids"`
-	common.ControlBy
-}
-
-func (s *SysLoginLogById) GetId() interface{} {
+func (s *SysLoginLogGetReq) GetId() interface{} {
 	return s.Id
 }
 
-func (s *SysLoginLogById) Generate() *SysLoginLogById {
-	cp := *s
-	return &cp
+// SysLoginLogDeleteReq 功能删除请求参数
+type SysLoginLogDeleteReq struct {
+	Ids []int `json:"ids"`
 }
 
-func (s *SysLoginLogById) GenerateM() (*models.SysLoginLog, error) {
-	return &models.SysLoginLog{}, nil
+func (s *SysLoginLogDeleteReq) GetId() interface{} {
+	return s.Ids
 }

app/admin/service/dto/sys_menu.go

@@ -7,19 +7,18 @@ import (
 	"go-admin/common/dto"
 )
 
-// SysMenuSearch 列表或者搜索使用结构体
-type SysMenuSearch struct {
+// SysMenuGetPageReq 列表或者搜索使用结构体
+type SysMenuGetPageReq struct {
 	dto.Pagination `search:"-"`
 	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
 }
 
-// SysMenuControl 增、改使用的结构体
-type SysMenuControl struct {
+type SysMenuInsertReq struct {
 	MenuId     int             `uri:"id" comment:"编码"`            // 编码
 	MenuName   string          `form:"menuName" comment:"菜单name"` //菜单name
 	Title      string          `form:"title" comment:"显示名称"`      //显示名称
@@ -41,16 +40,7 @@ type SysMenuControl struct {
 	common.ControlBy
 }
 
-func (s *SysMenuControl) SetCreateBy(id int) {
-	s.CreateBy = id
-}
-
-func (s *SysMenuControl) SetUpdateBy(id int) {
-	s.UpdateBy = id
-}
-
-// Generate 结构体数据转化 从 Control 至 model 对应的模型
-func (s *SysMenuControl) Generate(model *models.SysMenu) {
+func (s *SysMenuInsertReq) Generate(model *models.SysMenu) {
 	if s.MenuId != 0 {
 		model.MenuId = s.MenuId
 	}
@@ -78,33 +68,79 @@ func (s *SysMenuControl) Generate(model *models.SysMenu) {
 	}
 }
 
-// GetId 获取数据对应的ID
-func (s *SysMenuControl) GetId() interface{} {
+func (s *SysMenuInsertReq) GetId() interface{} {
 	return s.MenuId
 }
 
-// SysMenuById 获取单个或者删除的结构体
-type SysMenuById struct {
-	Id  int   `uri:"id"`
+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 *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 *SysMenuUpdateReq) GetId() interface{} {
+	return s.MenuId
+}
+
+type SysMenuGetReq struct {
+	Id int `uri:"id"`
+}
+
+func (s *SysMenuGetReq) GetId() interface{} {
+	return s.Id
+}
+
+type SysMenuDeleteReq struct {
 	Ids []int `json:"ids"`
 	common.ControlBy
 }
 
-func (s *SysMenuById) Generate() *SysMenuById {
-	cp := *s
-	return &cp
-}
-
-func (s *SysMenuById) GetId() interface{} {
-	if len(s.Ids) > 0 {
-		s.Ids = append(s.Ids, s.Id)
-		return s.Ids
-	}
-	return s.Id
-}
-
-func (s *SysMenuById) GenerateM() (*models.SysMenu, error) {
-	return &models.SysMenu{}, nil
+func (s *SysMenuDeleteReq) GetId() interface{} {
+	return s.Ids
 }
 
 type MenuLabel struct {
@@ -120,4 +156,4 @@ type MenuRole struct {
 
 type SelectRole struct {
 	RoleId int `uri:"roleId"`
-}
+}

app/admin/service/dto/sys_opera_log.go

@@ -8,7 +8,7 @@ import (
 	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:"函数"`
@@ -18,9 +18,14 @@ type SysOperaLogSearch struct {
 	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
 }
 
@@ -74,19 +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) SetUpdateBy(id int) {
+// SysOperaLogDeleteReq 功能删除请求参数
+type SysOperaLogDeleteReq struct {
+	Ids []int `json:"ids"`
+}
 
+func (s *SysOperaLogDeleteReq) GetId() interface{} {
+	return s.Ids
 }

app/admin/service/dto/sys_post.go

@@ -7,8 +7,8 @@ import (
 	"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:contains;column:post_name;table:sys_post" comment:"名称"` // 名称
@@ -18,26 +18,22 @@ type SysPostSearch struct {
 	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
 }
 
-// SysPostControl 增、改使用的结构体
-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:"备注"`  // 备注
+// 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
 }
 
-// Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型
-func (s *SysPostControl) Generate(model *models.SysPost) {
-	if s.PostId != 0 {
-		model.PostId = s.PostId
-	}
+func (s *SysPostInsertReq) Generate(model *models.SysPost) {
 	model.PostName = s.PostName
 	model.PostCode = s.PostCode
 	model.Sort = s.Sort
@@ -52,18 +48,28 @@ func (s *SysPostControl) Generate(model *models.SysPost) {
 }
 
 // GetId 获取数据对应的ID
-func (s *SysPostControl) GetId() interface{} {
+func (s *SysPostInsertReq) GetId() interface{} {
 	return s.PostId
 }
 
-// SysPostById 获取单个或者删除的结构体
-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(model *models.SysPost) {
+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
 	}
@@ -72,14 +78,34 @@ func (s *SysPostById) Generate(model *models.SysPost) {
 	}
 }
 
-func (s *SysPostById) GetId() interface{} {
-	if len(s.Ids) > 0 {
-		s.Ids = append(s.Ids, s.Id)
-		return s.Ids
-	}
+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) GenerateM() (*models.SysPost, error) {
-	return &models.SysPost{}, nil
-}
+// SysPostDeleteReq 删除的结构体
+type SysPostDeleteReq struct {
+	Ids []int `json:"ids"`
+	common.ControlBy
+}
+
+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
+}

app/admin/service/dto/sys_role.go

@@ -7,8 +7,7 @@ import (
 	"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:"角色编码"`     // 角色编码
@@ -30,11 +29,11 @@ type SysRoleOrder struct {
 	CreatedAtOrder string `search:"type:order;column:created_at;table:sys_role" form:"createdAtOrder"`
 }
 
-func (m *SysRoleSearch) GetNeedSearch() interface{} {
+func (m *SysRoleGetPageReq) GetNeedSearch() interface{} {
 	return *m
 }
 
-type SysRoleControl struct {
+type SysRoleInsertReq struct {
 	RoleId    int              `uri:"id" comment:"角色编码"`        // 角色编码
 	RoleName  string           `form:"roleName" comment:"角色名称"` // 角色名称
 	Status    string           `form:"status" comment:"状态"`     // 状态
@@ -46,19 +45,12 @@ type SysRoleControl struct {
 	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 *SysRoleControl) SetCreateBy(id int) {
-	s.CreateBy = id
-}
-
-func (s *SysRoleControl) SetUpdateBy(id int) {
-	s.UpdateBy = id
-}
-
-// Generate 结构体数据转化
-func (s *SysRoleControl) Generate(model *models.SysRole) {
+func (s *SysRoleInsertReq) Generate(model *models.SysRole) {
 	if s.RoleId != 0 {
 		model.RoleId = s.RoleId
 	}
@@ -71,17 +63,53 @@ func (s *SysRoleControl) Generate(model *models.SysRole) {
 	model.Admin = s.Admin
 	model.DataScope = s.DataScope
 	model.SysMenu = &s.SysMenu
-
+	model.SysDept = s.SysDept
 }
 
-// GetId 获取数据对应的ID
-func (s *SysRoleControl) GetId() interface{} {
+func (s *SysRoleInsertReq) GetId() interface{} {
+	return s.RoleId
+}
+
+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 *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 *SysRoleUpdateReq) GetId() interface{} {
 	return s.RoleId
 }
 
 type UpdateStatusReq struct {
-	RoleId    int              `form:"roleId" comment:"角色编码"`        // 角色编码
-	Status    string           `form:"status" comment:"状态"`     // 状态
+	RoleId int    `form:"roleId" comment:"角色编码"` // 角色编码
+	Status string `form:"status" comment:"状态"`   // 状态
 	common.ControlBy
 }
 
@@ -96,27 +124,24 @@ func (s *UpdateStatusReq) GetId() interface{} {
 	return s.RoleId
 }
 
-
-// SysRoleById 获取单个或者删除的结构体
-type SysRoleById struct {
-	dto.ObjectById
+type SysRoleByName struct {
+	RoleName string `form:"role"` // 角色编码
 }
 
-func (s *SysRoleById) Generate() *SysRoleById {
-	cp := *s
-	return &cp
+type SysRoleGetReq struct {
+	Id int `uri:"id"`
 }
 
-func (s *SysRoleById) GetId() interface{} {
-	if len(s.Ids) > 0 {
-		s.Ids = append(s.Ids, s.Id)
-		return s.Ids
-	}
+func (s *SysRoleGetReq) GetId() interface{} {
 	return s.Id
 }
 
-func (s *SysRoleById) GenerateM() (*models.SysRole, error) {
-	return &models.SysRole{}, nil
+type SysRoleDeleteReq struct {
+	Ids []int `json:"ids"`
+}
+
+func (s *SysRoleDeleteReq) GetId() interface{} {
+	return s.Ids
 }
 
 // RoleDataScopeReq 角色数据权限修改
@@ -126,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"`
 }

app/admin/service/dto/sys_user.go

@@ -7,7 +7,7 @@ import (
 	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"`
 	Username       string `form:"username" search:"type:contains;column:username;table:sys_user" comment:"用户名"`
@@ -33,13 +33,13 @@ type DeptJoin struct {
 	DeptId string `search:"type:contains;column:dept_path;table:sys_dept" form:"deptId"`
 }
 
-func (m *SysUserSearch) GetNeedSearch() interface{} {
+func (m *SysUserGetPageReq) GetNeedSearch() interface{} {
 	return *m
 }
 
 type ResetSysUserPwdReq struct {
-	UserId   int    `json:"userId" comment:"用户ID" binding:"required"` // 用户ID
-	Password string `json:"password" comment:"密码" binding:"required"`
+	UserId   int    `json:"userId" comment:"用户ID" vd:"$>0"` // 用户ID
+	Password string `json:"password" comment:"密码" vd:"len($)>0"`
 	common.ControlBy
 }
 
@@ -54,9 +54,26 @@ func (s *ResetSysUserPwdReq) Generate(model *models.SysUser) {
 	model.Password = s.Password
 }
 
+type UpdateSysUserAvatarReq struct {
+	UserId int    `json:"userId" comment:"用户ID" vd:"len($)>0"` // 用户ID
+	Avatar string `json:"avatar" comment:"头像" vd:"len($)>0"`
+	common.ControlBy
+}
+
+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" binding:"required"` // 用户ID
-	Status string `json:"status" comment:"状态" binding:"required"`
+	UserId int    `json:"userId" comment:"用户ID" vd:"$>0"` // 用户ID
+	Status string `json:"status" comment:"状态" vd:"len($)>0"`
 	common.ControlBy
 }
 
@@ -71,24 +88,24 @@ func (s *UpdateSysUserStatusReq) Generate(model *models.SysUser) {
 	model.Status = s.Status
 }
 
-type SysUserControl struct {
+type SysUserInsertReq struct {
 	UserId   int    `json:"userId" comment:"用户ID"` // 用户ID
-	Username string `json:"username" comment:"用户名" binding:"required"`
+	Username string `json:"username" comment:"用户名" vd:"len($)>0"`
 	Password string `json:"password" comment:"密码"`
-	NickName string `json:"nickName" comment:"昵称" binding:"required"`
-	Phone    string `json:"phone" comment:"手机号" binding:"required"`
+	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:"邮箱" binding:"required,email"`
-	DeptId   int    `json:"deptId" comment:"部门" binding:"required"`
+	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:"状态" binding:"required" default:"1"`
+	Status   string `json:"status" comment:"状态" vd:"len($)>0" default:"1"`
 	common.ControlBy
 }
 
-func (s *SysUserControl) Generate(model *models.SysUser) {
+func (s *SysUserInsertReq) Generate(model *models.SysUser) {
 	if s.UserId != 0 {
 		model.UserId = s.UserId
 	}
@@ -106,7 +123,44 @@ func (s *SysUserControl) Generate(model *models.SysUser) {
 	model.Status = s.Status
 }
 
-func (s *SysUserControl) GetId() interface{} {
+func (s *SysUserInsertReq) GetId() interface{} {
+	return s.UserId
+}
+
+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 *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
 }
 
@@ -129,6 +183,6 @@ func (s *SysUserById) GenerateM() (common.ActiveRecord, error) {
 
 // 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"`
+}

app/admin/service/sys_api.go

@@ -19,7 +19,7 @@ type SysApi struct {
 }
 
 // GetPage 获取SysApi列表
-func (e *SysApi) GetPage(c *dto.SysApiSearch, p *actions.DataPermission, list *[]models.SysApi, count *int64) error {
+func (e *SysApi) GetPage(c *dto.SysApiGetPageReq, p *actions.DataPermission, list *[]models.SysApi, count *int64) error {
 	var err error
 	var data models.SysApi
 
@@ -39,7 +39,7 @@ func (e *SysApi) GetPage(c *dto.SysApiSearch, p *actions.DataPermission, list *[
 }
 
 // Get 获取SysApi对象with id
-func (e *SysApi) Get(d *dto.SysApiById, p *actions.DataPermission, model *models.SysApi) *SysApi {
+func (e *SysApi) Get(d *dto.SysApiGetReq, p *actions.DataPermission, model *models.SysApi) *SysApi {
 	var data models.SysApi
 	err := e.Orm.Model(&data).
 		Scopes(
@@ -61,7 +61,7 @@ func (e *SysApi) Get(d *dto.SysApiById, p *actions.DataPermission, model *models
 }
 
 // Update 修改SysApi对象
-func (e *SysApi) Update(c *dto.SysApiControl, p *actions.DataPermission) error {
+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 {
@@ -78,7 +78,7 @@ func (e *SysApi) Update(c *dto.SysApiControl, p *actions.DataPermission) error {
 }
 
 // Remove 删除SysApi
-func (e *SysApi) Remove(d *dto.SysApiById, p *actions.DataPermission) error {
+func (e *SysApi) Remove(d *dto.SysApiDeleteReq, p *actions.DataPermission) error {
 	var data models.SysApi
 
 	db := e.Orm.Model(&data).

app/admin/service/sys_config.go

@@ -16,7 +16,7 @@ type SysConfig struct {
 }
 
 // GetPage 获取SysConfig列表
-func (e *SysConfig) GetPage(c *dto.SysConfigSearch, list *[]models.SysConfig, count *int64) error {
+func (e *SysConfig) GetPage(c *dto.SysConfigGetPageReq, list *[]models.SysConfig, count *int64) error {
 	err := e.Orm.
 		Scopes(
 			cDto.MakeCondition(c.GetNeedSearch()),
@@ -32,7 +32,7 @@ func (e *SysConfig) GetPage(c *dto.SysConfigSearch, list *[]models.SysConfig, co
 }
 
 // Get 获取SysConfig对象
-func (e *SysConfig) Get(d *dto.SysConfigById, model *models.SysConfig) error {
+func (e *SysConfig) Get(d *dto.SysConfigGetReq, model *models.SysConfig) error {
 	err := e.Orm.First(model, d.GetId()).Error
 	if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
 		err = errors.New("查看对象不存在或无权查看")
@@ -137,7 +137,7 @@ func (e *SysConfig) UpdateForSet(c *[]dto.GetSetSysConfigReq) error {
 }
 
 // Remove 删除SysConfig
-func (e *SysConfig) Remove(d *dto.SysConfigById) error {
+func (e *SysConfig) Remove(d *dto.SysConfigDeleteReq) error {
 	var err error
 	var data models.SysConfig
 
@@ -167,7 +167,7 @@ func (e *SysConfig) GetWithKey(c *dto.SysConfigByKeyReq, resp *dto.GetSysConfigB
 	return nil
 }
 
-func (e *SysConfig) GetWithKeyList(c *dto.SysConfigSearch, list *[]models.SysConfig) error {
+func (e *SysConfig) GetWithKeyList(c *dto.SysConfigGetToSysAppReq, list *[]models.SysConfig) error {
 	var err error
 	err = e.Orm.
 		Scopes(

app/admin/service/sys_dept.go

@@ -20,24 +20,24 @@ type SysDept struct {
 }
 
 // GetPage 获取SysDept列表
-func (e *SysDept) GetPage(c *dto.SysDeptSearch, list *[]models.SysDept) error {
-	var err error
-	var data models.SysDept
-
-	err = e.Orm.Model(&data).
-		Scopes(
-			cDto.MakeCondition(c.GetNeedSearch()),
-		).
-		Find(list).Error
-	if err != nil {
-		e.Log.Errorf("db error:%s", err)
-		return err
-	}
-	return nil
-}
+//func (e *SysDept) GetPage(c *dto.SysDeptGetPageReq, list *[]models.SysDept) error {
+//	var err error
+//	var data models.SysDept
+//
+//	err = e.Orm.Model(&data).
+//		Scopes(
+//			cDto.MakeCondition(c.GetNeedSearch()),
+//		).
+//		Find(list).Error
+//	if err != nil {
+//		e.Log.Errorf("db error:%s", err)
+//		return err
+//	}
+//	return nil
+//}
 
 // Get 获取SysDept对象
-func (e *SysDept) Get(d *dto.SysDeptById, model *models.SysDept) error {
+func (e *SysDept) Get(d *dto.SysDeptGetReq, model *models.SysDept) error {
 	var err error
 	var data models.SysDept
 
@@ -57,11 +57,19 @@ func (e *SysDept) Get(d *dto.SysDeptById, model *models.SysDept) error {
 }
 
 // Insert 创建SysDept对象
-func (e *SysDept) Insert(c *dto.SysDeptControl) error {
+func (e *SysDept) Insert(c *dto.SysDeptInsertReq) error {
 	var err error
 	var data models.SysDept
 	c.Generate(&data)
-	err = e.Orm.Create(data).Error
+	tx := e.Orm.Debug().Begin()
+	defer func() {
+		if err != nil {
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+	err = tx.Create(&data).Error
 	if err != nil {
 		e.Log.Errorf("db error:%s", err)
 		return err
@@ -69,14 +77,14 @@ func (e *SysDept) Insert(c *dto.SysDeptControl) error {
 	deptPath := pkg.IntToString(data.DeptId) + "/"
 	if data.ParentId != 0 {
 		var deptP models.SysDept
-		e.Orm.First(&deptP, data.ParentId)
+		tx.First(&deptP, data.ParentId)
 		deptPath = deptP.DeptPath + deptPath
 	} else {
 		deptPath = "/0/" + deptPath
 	}
 	var mp = map[string]string{}
 	mp["dept_path"] = deptPath
-	if err := e.Orm.Update("dept_path", deptPath).Error; err != nil {
+	if err := tx.Model(&data).Update("dept_path", deptPath).Error; err != nil {
 		e.Log.Errorf("db error:%s", err)
 		return err
 	}
@@ -84,22 +92,30 @@ func (e *SysDept) Insert(c *dto.SysDeptControl) error {
 }
 
 // Update 修改SysDept对象
-func (e *SysDept) Update(c *dto.SysDeptControl) error {
+func (e *SysDept) Update(c *dto.SysDeptUpdateReq) error {
 	var err error
 	var model = models.SysDept{}
-	e.Orm.First(&model, c.GetId())
+	tx := e.Orm.Debug().Begin()
+	defer func() {
+		if err != nil {
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+	tx.First(&model, c.GetId())
 	c.Generate(&model)
 
 	deptPath := pkg.IntToString(model.DeptId) + "/"
 	if model.ParentId != 0 {
 		var deptP models.SysDept
-		e.Orm.First(&deptP, model.ParentId)
+		tx.First(&deptP, model.ParentId)
 		deptPath = deptP.DeptPath + deptPath
 	} else {
 		deptPath = "/0/" + deptPath
 	}
 	model.DeptPath = deptPath
-	db := e.Orm.Save(&model)
+	db := tx.Save(&model)
 	if db.Error != nil {
 		e.Log.Errorf("UpdateSysDept error:%s", err)
 		return err
@@ -111,7 +127,7 @@ func (e *SysDept) Update(c *dto.SysDeptControl) error {
 }
 
 // Remove 删除SysDept
-func (e *SysDept) Remove(d *dto.SysDeptById) error {
+func (e *SysDept) Remove(d *dto.SysDeptDeleteReq) error {
 	var err error
 	var data models.SysDept
 
@@ -129,7 +145,7 @@ func (e *SysDept) Remove(d *dto.SysDeptById) error {
 }
 
 // GetSysDeptList 获取组织数据
-func (e *SysDept) getList(c *dto.SysDeptSearch, list *[]models.SysDept) error {
+func (e *SysDept) getList(c *dto.SysDeptGetPageReq, list *[]models.SysDept) error {
 	var err error
 	var data models.SysDept
 
@@ -146,7 +162,7 @@ func (e *SysDept) getList(c *dto.SysDeptSearch, list *[]models.SysDept) error {
 }
 
 // SetDeptTree 设置组织数据
-func (e *SysDept) SetDeptTree(c *dto.SysDeptSearch) (m []dto.DeptLabel, err error) {
+func (e *SysDept) SetDeptTree(c *dto.SysDeptGetPageReq) (m []dto.DeptLabel, err error) {
 	var list []models.SysDept
 	err = e.getList(c, &list)
 
@@ -182,7 +198,7 @@ func deptTreeCall(deptList *[]models.SysDept, dept dto.DeptLabel) dto.DeptLabel
 }
 
 // SetDeptPage 设置dept页面数据
-func (e *SysDept) SetDeptPage(c *dto.SysDeptSearch) (m []models.SysDept, err error) {
+func (e *SysDept) SetDeptPage(c *dto.SysDeptGetPageReq) (m []models.SysDept, err error) {
 	var list []models.SysDept
 	err = e.getList(c, &list)
 	for i := 0; i < len(list); i++ {

app/admin/service/sys_dict_data.go

@@ -16,7 +16,7 @@ type SysDictData struct {
 }
 
 // GetPage 获取列表
-func (e *SysDictData) GetPage(c *dto.SysDictDataSearch, list *[]models.SysDictData, count *int64) error {
+func (e *SysDictData) GetPage(c *dto.SysDictDataGetPageReq, list *[]models.SysDictData, count *int64) error {
 	var err error
 	var data models.SysDictData
 
@@ -35,7 +35,7 @@ func (e *SysDictData) GetPage(c *dto.SysDictDataSearch, list *[]models.SysDictDa
 }
 
 // Get 获取对象
-func (e *SysDictData) Get(d *dto.SysDictDataById, model *models.SysDictData) error {
+func (e *SysDictData) Get(d *dto.SysDictDataGetReq, model *models.SysDictData) error {
 	var err error
 	var data models.SysDictData
 
@@ -55,7 +55,7 @@ func (e *SysDictData) Get(d *dto.SysDictDataById, model *models.SysDictData) err
 }
 
 // Insert 创建对象
-func (e *SysDictData) Insert(c *dto.SysDictDataControl) error {
+func (e *SysDictData) Insert(c *dto.SysDictDataInsertReq) error {
 	var err error
 	var data = new(models.SysDictData)
 	c.Generate(data)
@@ -68,7 +68,7 @@ func (e *SysDictData) Insert(c *dto.SysDictDataControl) error {
 }
 
 // Update 修改对象
-func (e *SysDictData) Update(c *dto.SysDictDataControl) error {
+func (e *SysDictData) Update(c *dto.SysDictDataUpdateReq) error {
 	var err error
 	var model = models.SysDictData{}
 	e.Orm.First(&model, c.GetId())
@@ -86,7 +86,7 @@ func (e *SysDictData) Update(c *dto.SysDictDataControl) error {
 }
 
 // Remove 删除
-func (e *SysDictData) Remove(c *dto.SysDictDataById) error {
+func (e *SysDictData) Remove(c *dto.SysDictDataDeleteReq) error {
 	var err error
 	var data models.SysDictData
 
@@ -104,7 +104,7 @@ func (e *SysDictData) Remove(c *dto.SysDictDataById) error {
 }
 
 // GetAll 获取所有
-func (e *SysDictData) GetAll(c *dto.SysDictDataSearch, list *[]models.SysDictData) error {
+func (e *SysDictData) GetAll(c *dto.SysDictDataGetPageReq, list *[]models.SysDictData) error {
 	var err error
 	var data models.SysDictData
 

app/admin/service/sys_dict_type.go

@@ -2,7 +2,7 @@ package service
 
 import (
 	"errors"
-
+	"fmt"
 	"github.com/go-admin-team/go-admin-core/sdk/service"
 	"gorm.io/gorm"
 
@@ -16,7 +16,7 @@ type SysDictType struct {
 }
 
 // GetPage 获取列表
-func (e *SysDictType) GetPage(c *dto.SysDictTypeSearch, list *[]models.SysDictType, count *int64) error {
+func (e *SysDictType) GetPage(c *dto.SysDictTypeGetPageReq, list *[]models.SysDictType, count *int64) error {
 	var err error
 	var data models.SysDictType
 
@@ -35,7 +35,7 @@ func (e *SysDictType) GetPage(c *dto.SysDictTypeSearch, list *[]models.SysDictTy
 }
 
 // Get 获取对象
-func (e *SysDictType) Get(d *dto.SysDictTypeById, model *models.SysDictType) error {
+func (e *SysDictType) Get(d *dto.SysDictTypeGetReq, model *models.SysDictType) error {
 	var err error
 
 	db := e.Orm.First(model, d.GetId())
@@ -53,10 +53,15 @@ func (e *SysDictType) Get(d *dto.SysDictTypeById, model *models.SysDictType) err
 }
 
 // Insert 创建对象
-func (e *SysDictType) Insert(c *dto.SysDictTypeControl) error {
+func (e *SysDictType) Insert(c *dto.SysDictTypeInsertReq) error {
 	var err error
 	var data models.SysDictType
 	c.Generate(&data)
+	var count int64
+	e.Orm.Model(&data).Where("dict_type = ?", data.DictType).Count(&count)
+	if count > 0 {
+		return errors.New(fmt.Sprintf("当前字典类型[%s]已经存在！", data.DictType))
+	}
 	err = e.Orm.Create(&data).Error
 	if err != nil {
 		e.Log.Errorf("db error: %s", err)
@@ -66,7 +71,7 @@ func (e *SysDictType) Insert(c *dto.SysDictTypeControl) error {
 }
 
 // Update 修改对象
-func (e *SysDictType) Update(c *dto.SysDictTypeControl) error {
+func (e *SysDictType) Update(c *dto.SysDictTypeUpdateReq) error {
 	var err error
 	var model = models.SysDictType{}
 	e.Orm.First(&model, c.GetId())
@@ -84,7 +89,7 @@ func (e *SysDictType) Update(c *dto.SysDictTypeControl) error {
 }
 
 // Remove 删除
-func (e *SysDictType) Remove(d *dto.SysDictTypeById) error {
+func (e *SysDictType) Remove(d *dto.SysDictTypeDeleteReq) error {
 	var err error
 	var data models.SysDictType
 
@@ -102,7 +107,7 @@ func (e *SysDictType) Remove(d *dto.SysDictTypeById) error {
 }
 
 // GetAll 获取所有
-func (e *SysDictType) GetAll(c *dto.SysDictTypeSearch, list *[]models.SysDictType) error {
+func (e *SysDictType) GetAll(c *dto.SysDictTypeGetPageReq, list *[]models.SysDictType) error {
 	var err error
 	var data models.SysDictType
 

app/admin/service/sys_login_log.go

@@ -15,8 +15,8 @@ type SysLoginLog struct {
 	service.Service
 }
 
-// GetSysLoginLogPage 获取SysLoginLog列表
-func (e *SysLoginLog) GetPage(c *dto.SysLoginLogSearch, list *[]models.SysLoginLog, count *int64) error {
+// GetPage 获取SysLoginLog列表
+func (e *SysLoginLog) GetPage(c *dto.SysLoginLogGetPageReq, list *[]models.SysLoginLog, count *int64) error {
 	var err error
 	var data models.SysLoginLog
 
@@ -34,8 +34,8 @@ func (e *SysLoginLog) GetPage(c *dto.SysLoginLogSearch, list *[]models.SysLoginL
 	return nil
 }
 
-// GetSysLoginLog 获取SysLoginLog对象
-func (e *SysLoginLog) Get(d *dto.SysLoginLogById, model *models.SysLoginLog) error {
+// Get 获取SysLoginLog对象
+func (e *SysLoginLog) Get(d *dto.SysLoginLogGetReq, model *models.SysLoginLog) error {
 	var err error
 	db := e.Orm.First(model, d.GetId())
 	err = db.Error
@@ -51,12 +51,12 @@ func (e *SysLoginLog) Get(d *dto.SysLoginLogById, model *models.SysLoginLog) err
 	return nil
 }
 
-// RemoveSysLoginLog 删除SysLoginLog
-func (e *SysLoginLog) Remove(c *dto.SysLoginLogById) error {
+// Remove 删除SysLoginLog
+func (e *SysLoginLog) Remove(c *dto.SysLoginLogDeleteReq) error {
 	var err error
 	var data models.SysLoginLog
 
-	db := e.Orm.Delete(&data, c.Ids)
+	db := e.Orm.Delete(&data, c.GetId())
 	if db.Error != nil {
 		err = db.Error
 		e.Log.Errorf("Delete error: %s", err)

app/admin/service/sys_menu.go

@@ -2,7 +2,6 @@ package service
 
 import (
 	"errors"
-
 	"github.com/go-admin-team/go-admin-core/sdk/pkg"
 	"gorm.io/gorm"
 
@@ -19,7 +18,7 @@ type SysMenu struct {
 }
 
 // GetPage 获取SysMenu列表
-func (e *SysMenu) GetPage(c *dto.SysMenuSearch, menus *[]models.SysMenu) *SysMenu {
+func (e *SysMenu) GetPage(c *dto.SysMenuGetPageReq, menus *[]models.SysMenu) *SysMenu {
 	var menu = make([]models.SysMenu, 0)
 	err := e.getPage(c, &menu).Error
 	if err != nil {
@@ -37,7 +36,7 @@ func (e *SysMenu) GetPage(c *dto.SysMenuSearch, menus *[]models.SysMenu) *SysMen
 }
 
 // getPage 菜单分页列表
-func (e *SysMenu) getPage(c *dto.SysMenuSearch, list *[]models.SysMenu) *SysMenu {
+func (e *SysMenu) getPage(c *dto.SysMenuGetPageReq, list *[]models.SysMenu) *SysMenu {
 	var err error
 	var data models.SysMenu
 
@@ -56,7 +55,7 @@ func (e *SysMenu) getPage(c *dto.SysMenuSearch, list *[]models.SysMenu) *SysMenu
 }
 
 // Get 获取SysMenu对象
-func (e *SysMenu) Get(d *dto.SysMenuById, model *models.SysMenu) *SysMenu {
+func (e *SysMenu) Get(d *dto.SysMenuGetReq, model *models.SysMenu) *SysMenu {
 	var err error
 	var data models.SysMenu
 
@@ -83,7 +82,7 @@ func (e *SysMenu) Get(d *dto.SysMenuById, model *models.SysMenu) *SysMenu {
 }
 
 // Insert 创建SysMenu对象
-func (e *SysMenu) Insert(c *dto.SysMenuControl) *SysMenu {
+func (e *SysMenu) Insert(c *dto.SysMenuInsertReq) *SysMenu {
 	var err error
 	var data models.SysMenu
 	c.Generate(&data)
@@ -115,7 +114,7 @@ func (e *SysMenu) initPaths(menu *models.SysMenu) error {
 }
 
 // Update 修改SysMenu对象
-func (e *SysMenu) Update(c *dto.SysMenuControl) *SysMenu {
+func (e *SysMenu) Update(c *dto.SysMenuUpdateReq) *SysMenu {
 	var err error
 	tx := e.Orm.Debug().Begin()
 	defer func() {
@@ -151,7 +150,7 @@ func (e *SysMenu) Update(c *dto.SysMenuControl) *SysMenu {
 }
 
 // Remove 删除SysMenu
-func (e *SysMenu) Remove(d *dto.SysMenuById) *SysMenu {
+func (e *SysMenu) Remove(d *dto.SysMenuDeleteReq) *SysMenu {
 	var err error
 	var data models.SysMenu
 
@@ -169,7 +168,7 @@ func (e *SysMenu) Remove(d *dto.SysMenuById) *SysMenu {
 }
 
 // GetList 获取菜单数据
-func (e *SysMenu) GetList(c *dto.SysMenuSearch, list *[]models.SysMenu) error {
+func (e *SysMenu) GetList(c *dto.SysMenuGetPageReq, list *[]models.SysMenu) error {
 	var err error
 	var data models.SysMenu
 
@@ -188,7 +187,7 @@ func (e *SysMenu) GetList(c *dto.SysMenuSearch, list *[]models.SysMenu) error {
 // SetLabel 修改角色中 设置菜单基础数据
 func (e *SysMenu) SetLabel() (m []dto.MenuLabel, err error) {
 	var list []models.SysMenu
-	err = e.GetList(&dto.SysMenuSearch{}, &list)
+	err = e.GetList(&dto.SysMenuGetPageReq{}, &list)
 
 	m = make([]dto.MenuLabel, 0)
 	for i := 0; i < len(list); i++ {
@@ -332,11 +331,40 @@ func (e *SysMenu) getByRoleName(roleName string) ([]models.SysMenu, error) {
 		MenuList = data
 	} else {
 		role.RoleKey = roleName
+		buttons := make([]models.SysMenu,0)
 		err = e.Orm.Debug().Model(&role).Where("role_key = ? ", roleName).Preload("SysMenu", func(db *gorm.DB) *gorm.DB {
-			return db.Where(" menu_type in ('M','C')").Order("sort")
+			return db.Where(" menu_type in ('F')").Order("sort")
 		}).Find(&role).Error
 		if role.SysMenu != nil {
-			MenuList = *role.SysMenu
+			buttons = *role.SysMenu
+		}
+		mIds := make([]int, 0)
+		for _, menu := range buttons {
+			if menu.ParentId != 0 {
+				mIds = append(mIds, menu.ParentId)
+			}
+		}
+		var dataC []models.SysMenu
+		err = e.Orm.Where(" menu_type in ('C') and menu_id in ?", mIds).Order("sort").Find(&dataC).Error
+		if err != nil {
+			return nil, err
+		}
+		for _, datum := range dataC {
+			MenuList = append(MenuList, datum)
+		}
+		cIds := make([]int, 0)
+		for _, menu := range MenuList {
+			if menu.ParentId != 0 {
+				cIds = append(cIds, menu.ParentId)
+			}
+		}
+		var dataM []models.SysMenu
+		err = e.Orm.Where(" menu_type in ('M') and menu_id in ?", cIds).Order("sort").Find(&dataM).Error
+		if err != nil {
+			return nil, err
+		}
+		for _, datum := range dataM {
+			MenuList = append(MenuList, datum)
 		}
 	}
 

app/admin/service/sys_opera_log.go

@@ -16,7 +16,7 @@ type SysOperaLog struct {
 }
 
 // GetPage 获取SysOperaLog列表
-func (e *SysOperaLog) GetPage(c *dto.SysOperaLogSearch, list *[]models.SysOperaLog, count *int64) error {
+func (e *SysOperaLog) GetPage(c *dto.SysOperaLogGetPageReq, list *[]models.SysOperaLog, count *int64) error {
 	var err error
 	var data models.SysOperaLog
 
@@ -35,7 +35,7 @@ func (e *SysOperaLog) GetPage(c *dto.SysOperaLogSearch, list *[]models.SysOperaL
 }
 
 // Get 获取SysOperaLog对象
-func (e *SysOperaLog) Get(d *dto.SysOperaLogById, model *models.SysOperaLog) error {
+func (e *SysOperaLog) Get(d *dto.SysOperaLogGetReq, model *models.SysOperaLog) error {
 	var data models.SysOperaLog
 
 	err := e.Orm.Model(&data).
@@ -67,11 +67,11 @@ func (e *SysOperaLog) Insert(model *models.SysOperaLog) error {
 }
 
 // Remove 删除SysOperaLog
-func (e *SysOperaLog) Remove(d *dto.SysOperaLogById) error {
+func (e *SysOperaLog) Remove(d *dto.SysOperaLogDeleteReq) error {
 	var err error
 	var data models.SysOperaLog
 
-	db := e.Orm.Model(&data).Delete(&data, d.Ids)
+	db := e.Orm.Model(&data).Delete(&data, d.GetId())
 	if err = db.Error; err != nil {
 		e.Log.Errorf("Service RemoveSysOperaLog error:%s", err.Error())
 		return err

app/admin/service/sys_post.go

@@ -15,8 +15,8 @@ type SysPost struct {
 	service.Service
 }
 
-// GetSysPostPage 获取SysPost列表
-func (e *SysPost) GetSysPostPage(c *dto.SysPostSearch, list *[]models.SysPost, count *int64) error {
+// GetPage 获取SysPost列表
+func (e *SysPost) GetPage(c *dto.SysPostPageReq, list *[]models.SysPost, count *int64) error {
 	var err error
 	var data models.SysPost
 
@@ -28,14 +28,14 @@ func (e *SysPost) GetSysPostPage(c *dto.SysPostSearch, list *[]models.SysPost, c
 		Find(list).Limit(-1).Offset(-1).
 		Count(count).Error
 	if err != nil {
-		e.Log.Errorf("db error:%s", err)
+		e.Log.Errorf("db error:%s \r", err)
 		return err
 	}
 	return nil
 }
 
-// GetSysPost 获取SysPost对象
-func (e *SysPost) GetSysPost(d *dto.SysPostById, model *models.SysPost) error {
+// Get 获取SysPost对象
+func (e *SysPost) Get(d *dto.SysPostGetReq, model *models.SysPost) error {
 	var err error
 	var data models.SysPost
 
@@ -54,13 +54,12 @@ func (e *SysPost) GetSysPost(d *dto.SysPostById, model *models.SysPost) error {
 	return nil
 }
 
-// InsertSysPost 创建SysPost对象
-func (e *SysPost) InsertSysPost(model *dto.SysPostControl) error {
+// Insert 创建SysPost对象
+func (e *SysPost) Insert(c *dto.SysPostInsertReq) error {
 	var err error
 	var data models.SysPost
-
-	err = e.Orm.Model(&data).
-		Create(model).Error
+	c.Generate(&data)
+	err = e.Orm.Create(&data).Error
 	if err != nil {
 		e.Log.Errorf("db error:%s", err)
 		return err
@@ -68,8 +67,8 @@ func (e *SysPost) InsertSysPost(model *dto.SysPostControl) error {
 	return nil
 }
 
-// UpdateSysPost 修改SysPost对象
-func (e *SysPost) UpdateSysPost(c *dto.SysPostControl) error {
+// Update 修改SysPost对象
+func (e *SysPost) Update(c *dto.SysPostUpdateReq) error {
 	var err error
 	var model = models.SysPost{}
 	e.Orm.First(&model, c.GetId())
@@ -87,8 +86,8 @@ func (e *SysPost) UpdateSysPost(c *dto.SysPostControl) error {
 	return nil
 }
 
-// RemoveSysPost 删除SysPost
-func (e *SysPost) RemoveSysPost(d *dto.SysPostById) error {
+// Remove 删除SysPost
+func (e *SysPost) Remove(d *dto.SysPostDeleteReq) error {
 	var err error
 	var data models.SysPost
 
@@ -103,4 +102,4 @@ func (e *SysPost) RemoveSysPost(d *dto.SysPostById) error {
 		return err
 	}
 	return nil
-}
+}

app/admin/service/sys_role.go

@@ -3,6 +3,9 @@ package service
 import (
 	"errors"
 
+	"github.com/go-admin-team/go-admin-core/sdk/config"
+	"gorm.io/gorm/clause"
+
 	"github.com/casbin/casbin/v2"
 
 	"github.com/go-admin-team/go-admin-core/sdk/service"
@@ -18,7 +21,7 @@ type SysRole struct {
 }
 
 // GetPage 获取SysRole列表
-func (e *SysRole) GetPage(c *dto.SysRoleSearch, list *[]models.SysRole, count *int64) error {
+func (e *SysRole) GetPage(c *dto.SysRoleGetPageReq, list *[]models.SysRole, count *int64) error {
 	var err error
 	var data models.SysRole
 
@@ -37,7 +40,7 @@ func (e *SysRole) GetPage(c *dto.SysRoleSearch, list *[]models.SysRole, count *i
 }
 
 // Get 获取SysRole对象
-func (e *SysRole) Get(d *dto.SysRoleById, model *models.SysRole) error {
+func (e *SysRole) Get(d *dto.SysRoleGetReq, model *models.SysRole) error {
 	var err error
 	db := e.Orm.First(model, d.GetId())
 	err = db.Error
@@ -59,7 +62,7 @@ func (e *SysRole) Get(d *dto.SysRoleById, model *models.SysRole) error {
 }
 
 // Insert 创建SysRole对象
-func (e *SysRole) Insert(c *dto.SysRoleControl, cb *casbin.SyncedEnforcer) error {
+func (e *SysRole) Insert(c *dto.SysRoleInsertReq, cb *casbin.SyncedEnforcer) error {
 	var err error
 	var data models.SysRole
 	var dataMenu []models.SysMenu
@@ -70,14 +73,29 @@ func (e *SysRole) Insert(c *dto.SysRoleControl, cb *casbin.SyncedEnforcer) error
 	}
 	c.SysMenu = dataMenu
 	c.Generate(&data)
-	tx := e.Orm.Begin()
-	defer func() {
-		if err != nil {
-			tx.Rollback()
-		} else {
-			tx.Commit()
-		}
-	}()
+	tx := e.Orm
+	if config.DatabaseConfig.Driver != "sqlite3" {
+		tx := e.Orm.Begin()
+		defer func() {
+			if err != nil {
+				tx.Rollback()
+			} else {
+				tx.Commit()
+			}
+		}()
+	}
+	var count int64
+	err = tx.Model(&data).Where("role_key = ?", c.RoleKey).Count(&count).Error
+	if err != nil {
+		e.Log.Errorf("db error:%s", err)
+		return err
+	}
+
+	if count > 0 {
+		err = errors.New("roleKey已存在，需更换在提交！")
+		e.Log.Errorf("db error:%s", err)
+		return err
+	}
 
 	err = tx.Create(&data).Error
 	if err != nil {
@@ -85,12 +103,21 @@ func (e *SysRole) Insert(c *dto.SysRoleControl, cb *casbin.SyncedEnforcer) error
 		return err
 	}
 
+	mp := make(map[string]interface{}, 0)
+	polices := make([][]string, 0)
 	for _, menu := range dataMenu {
 		for _, api := range menu.SysApi {
-			_, err = cb.AddNamedPolicy("p", data.RoleKey, api.Path, api.Action)
+			if mp[data.RoleKey+"-"+api.Path+"-"+api.Action] != "" {
+				mp[data.RoleKey+"-"+api.Path+"-"+api.Action] = ""
+				polices = append(polices, []string{data.RoleKey, api.Path, api.Action})
+			}
 		}
 	}
-	_ = cb.SavePolicy()
+	_, err = cb.AddNamedPolicies("p", polices)
+	if err != nil {
+		return err
+	}
+
 	//if len(c.MenuIds) > 0 {
 	//	s := SysRoleMenu{}
 	//	s.Orm = e.Orm
@@ -105,16 +132,19 @@ func (e *SysRole) Insert(c *dto.SysRoleControl, cb *casbin.SyncedEnforcer) error
 }
 
 // Update 修改SysRole对象
-func (e *SysRole) Update(c *dto.SysRoleControl, cb *casbin.SyncedEnforcer) error {
+func (e *SysRole) Update(c *dto.SysRoleUpdateReq, cb *casbin.SyncedEnforcer) error {
 	var err error
-	tx := e.Orm.Debug().Begin()
-	defer func() {
-		if err != nil {
-			tx.Rollback()
-		} else {
-			tx.Commit()
-		}
-	}()
+	tx := e.Orm
+	if config.DatabaseConfig.Driver != "sqlite3" {
+		tx := e.Orm.Begin()
+		defer func() {
+			if err != nil {
+				tx.Rollback()
+			} else {
+				tx.Commit()
+			}
+		}()
+	}
 	var model = models.SysRole{}
 	var mlist = make([]models.SysMenu, 0)
 	tx.Preload("SysMenu").First(&model, c.GetId())
@@ -141,54 +171,57 @@ func (e *SysRole) Update(c *dto.SysRoleControl, cb *casbin.SyncedEnforcer) error
 		e.Log.Errorf("delete policy error:%s", err)
 		return err
 	}
-
+	mp := make(map[string]interface{}, 0)
+	polices := make([][]string, 0)
 	for _, menu := range mlist {
 		for _, api := range menu.SysApi {
-			_, err = cb.AddNamedPolicy("p", model.RoleKey, api.Path, api.Action)
+			if mp[model.RoleKey+"-"+api.Path+"-"+api.Action] != "" {
+				mp[model.RoleKey+"-"+api.Path+"-"+api.Action] = ""
+				//_, err = cb.AddNamedPolicy("p", model.RoleKey, api.Path, api.Action)
+				polices = append(polices, []string{model.RoleKey, api.Path, api.Action})
+			}
 		}
 	}
-	_ = cb.SavePolicy()
+	_, err = cb.AddNamedPolicies("p", polices)
+	if err != nil {
+		return err
+	}
+
 	return nil
 }
 
 // Remove 删除SysRole
-func (e *SysRole) Remove(d *dto.SysRoleById) error {
+func (e *SysRole) Remove(c *dto.SysRoleDeleteReq, cb *casbin.SyncedEnforcer) error {
 	var err error
-	var data models.SysRole
-
-	tx := e.Orm.Begin()
-	defer func() {
-		if err != nil {
-			tx.Rollback()
-		} else {
-			tx.Commit()
-		}
-	}()
-
-	s := SysRoleMenu{}
-	s.Orm = tx
-	s.Log = e.Log
-	for _, roleId := range d.Ids {
-		err = s.DeleteRoleMenu(tx, roleId)
-		if err != nil {
-			e.Log.Errorf("insert role menu error, %", err.Error())
-			return err
-		}
+	tx := e.Orm
+	if config.DatabaseConfig.Driver != "sqlite3" {
+		tx := e.Orm.Begin()
+		defer func() {
+			if err != nil {
+				tx.Rollback()
+			} else {
+				tx.Commit()
+			}
+		}()
 	}
-	db := tx.Model(&data).Delete(&data, d.Ids)
+	var model = models.SysRole{}
+	tx.Preload("SysMenu").Preload("SysDept").First(&model, c.GetId())
+	db := tx.Select(clause.Associations).Delete(&model)
+
 	if db.Error != nil {
-		err = db.Error
-		e.Log.Errorf("Delete error: %s", err)
+		e.Log.Errorf("db error:%s", err)
 		return err
 	}
 	if db.RowsAffected == 0 {
-		err = errors.New("无权删除该数据")
-		return err
+		return errors.New("无权更新该数据")
 	}
+
+	_, _ = cb.RemoveFilteredPolicy(0, model.RoleKey)
+
 	return nil
 }
 
-// 获取角色对应的菜单ids
+// GetRoleMenuId 获取角色对应的菜单ids
 func (e *SysRole) GetRoleMenuId(roleId int) ([]int, error) {
 	menuIds := make([]int, 0)
 	model := models.SysRole{}
@@ -203,58 +236,62 @@ func (e *SysRole) GetRoleMenuId(roleId int) ([]int, error) {
 	return menuIds, nil
 }
 
-func (e *SysRole) UpdateDataScope(c *models.SysRole) (err error) {
-	tx := e.Orm.Begin()
-	defer func() {
-		if err != nil {
-			tx.Rollback()
-		} else {
-			tx.Commit()
-		}
-	}()
-	err = tx.Model(&models.SysRole{}).Where("role_id = ?", c.RoleId).Select("data_scope", "update_by").Updates(c).Error
-	if err != nil {
-		return err
-	}
-
-	err = tx.Where("role_id = ?", c.RoleId).Delete(&models.SysRoleDept{}).Error
-	if err != nil {
-		return err
-	}
-
-	if c.DataScope == "2" {
-		deptRoles := make([]models.SysRoleDept, len(c.DeptIds))
-		for i := range c.DeptIds {
-			deptRoles[i] = models.SysRoleDept{
-				RoleId: c.RoleId,
-				DeptId: c.DeptIds[i],
+func (e *SysRole) UpdateDataScope(c *dto.RoleDataScopeReq) *SysRole {
+	var err error
+	tx := e.Orm
+	if config.DatabaseConfig.Driver != "sqlite3" {
+		tx := e.Orm.Begin()
+		defer func() {
+			if err != nil {
+				tx.Rollback()
+			} else {
+				tx.Commit()
 			}
-		}
-		err = tx.Create(&deptRoles).Error
-		if err != nil {
-			return err
-		}
+		}()
 	}
-	return err
+	var dlist = make([]models.SysDept, 0)
+	var model = models.SysRole{}
+	tx.Preload("SysDept").First(&model, c.RoleId)
+	tx.Where("dept_id in ?", c.DeptIds).Find(&dlist)
+	err = tx.Model(&model).Association("SysDept").Delete(model.SysDept)
+	if err != nil {
+		e.Log.Errorf("delete SysDept error:%s", err)
+		_ = e.AddError(err)
+		return e
+	}
+	c.Generate(&model)
+	model.SysDept = dlist
+	db := tx.Model(&model).Session(&gorm.Session{FullSaveAssociations: true}).Debug().Save(&model)
+	if db.Error != nil {
+		e.Log.Errorf("db error:%s", err)
+		_ = e.AddError(err)
+		return e
+	}
+	if db.RowsAffected == 0 {
+		_ = e.AddError(errors.New("无权更新该数据"))
+		return e
+	}
+	return e
 }
 
 // UpdateStatus 修改SysRole对象status
 func (e *SysRole) UpdateStatus(c *dto.UpdateStatusReq) error {
 	var err error
-
-	tx := e.Orm.Debug().Begin()
-	defer func() {
-		if err != nil {
-			tx.Rollback()
-		} else {
-			tx.Commit()
-		}
-	}()
+	tx := e.Orm
+	if config.DatabaseConfig.Driver != "sqlite3" {
+		tx := e.Orm.Begin()
+		defer func() {
+			if err != nil {
+				tx.Rollback()
+			} else {
+				tx.Commit()
+			}
+		}()
+	}
 	var model = models.SysRole{}
 	tx.First(&model, c.GetId())
 	c.Generate(&model)
 	db := tx.Session(&gorm.Session{FullSaveAssociations: true}).Debug().Save(&model)
-
 	if db.Error != nil {
 		e.Log.Errorf("db error:%s", err)
 		return err
@@ -262,6 +299,45 @@ func (e *SysRole) UpdateStatus(c *dto.UpdateStatusReq) error {
 	if db.RowsAffected == 0 {
 		return errors.New("无权更新该数据")
 	}
-
 	return nil
 }
+
+// GetWithName 获取SysRole对象
+func (e *SysRole) GetWithName(d *dto.SysRoleByName, model *models.SysRole) *SysRole {
+	var err error
+	db := e.Orm.Where("role_name = ?", d.RoleName).First(model)
+	err = db.Error
+	if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
+		err = errors.New("查看对象不存在或无权查看")
+		e.Log.Errorf("db error:%s", err)
+		_ = e.AddError(err)
+		return e
+	}
+	if err != nil {
+		e.Log.Errorf("db error:%s", err)
+		_ = e.AddError(err)
+		return e
+	}
+	model.MenuIds, err = e.GetRoleMenuId(model.RoleId)
+	if err != nil {
+		e.Log.Errorf("get menuIds error, %s", err.Error())
+		_ = e.AddError(err)
+		return e
+	}
+	return e
+}
+
+// GetById 获取SysRole对象
+func (e *SysRole) GetById(roleId int) ([]string, error) {
+	permissions := make([]string, 0)
+	model := models.SysRole{}
+	model.RoleId = roleId
+	if err := e.Orm.Model(&model).Preload("SysMenu").First(&model).Error; err != nil {
+		return nil, err
+	}
+	l := *model.SysMenu
+	for i := 0; i < len(l); i++ {
+		permissions = append(permissions, l[i].Permission)
+	}
+	return permissions, nil
+}

app/admin/service/sys_role_menu.go

@@ -1,11 +1,7 @@
 package service
 
 import (
-	log "github.com/go-admin-team/go-admin-core/logger"
 	"github.com/go-admin-team/go-admin-core/sdk/service"
-	"gorm.io/gorm"
-
-	"go-admin/app/admin/models"
 )
 
 // SysRoleMenu 即将弃用结构体
@@ -71,44 +67,44 @@ type SysRoleMenu struct {
 //	return
 //}
 
-func (e *SysRoleMenu) DeleteRoleMenu(tx *gorm.DB, roleId int) (err error) {
-	msgID := e.MsgID
-	err = tx.Where("role_id = ?", roleId).
-		Delete(&models.SysRoleDept{}).Error
-	if err != nil {
-		log.Errorf("msgID[%s] delete role's dept error, %s", msgID, err.Error())
-		return
-	}
-	err = tx.Where("role_id = ?", roleId).
-		Delete(&models.RoleMenu{}).Error
-	if err != nil {
-		log.Errorf("msgID[%s] delete role's menu error, %s", msgID, err.Error())
-		return
-	}
-	var role models.SysRole
-	err = tx.Where("role_id = ?", roleId).
-		First(&role).Error
-	if err != nil {
-		log.Errorf("msgID[%s] get role error, %s", msgID, err.Error())
-		return
-	}
-	err = tx.Where("v0 = ?", role.RoleKey).
-		Delete(&models.CasbinRule{}).Error
-	if err != nil {
-		log.Errorf("msgID[%s] delete casbin rule error, %s", msgID, err.Error())
-		return
-	}
-	return
-}
-
-func (e *SysRoleMenu) GetIDS(tx *gorm.DB, roleName string) ([]models.MenuPath, error) {
-	var r []models.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", roleName)
-	if err := table.Find(&r).Error; err != nil {
-		return nil, err
-	}
-	return r, nil
-}
+//func (e *SysRoleMenu) DeleteRoleMenu(tx *gorm.DB, roleId int) (err error) {
+//	msgID := e.MsgID
+//	err = tx.Where("role_id = ?", roleId).
+//		Delete(&models.SysRoleDept{}).Error
+//	if err != nil {
+//		log.Errorf("msgID[%s] delete role's dept error, %s", msgID, err.Error())
+//		return
+//	}
+//	err = tx.Where("role_id = ?", roleId).
+//		Delete(&models.RoleMenu{}).Error
+//	if err != nil {
+//		log.Errorf("msgID[%s] delete role's menu error, %s", msgID, err.Error())
+//		return
+//	}
+//	var role models.SysRole
+//	err = tx.Where("role_id = ?", roleId).
+//		First(&role).Error
+//	if err != nil {
+//		log.Errorf("msgID[%s] get role error, %s", msgID, err.Error())
+//		return
+//	}
+//	err = tx.Where("v0 = ?", role.RoleKey).
+//		Delete(&models.CasbinRule{}).Error
+//	if err != nil {
+//		log.Errorf("msgID[%s] delete casbin rule error, %s", msgID, err.Error())
+//		return
+//	}
+//	return
+//}
+//
+//func (e *SysRoleMenu) GetIDS(tx *gorm.DB, roleName string) ([]models.MenuPath, error) {
+//	var r []models.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", roleName)
+//	if err := table.Find(&r).Error; err != nil {
+//		return nil, err
+//	}
+//	return r, nil
+//}

app/admin/service/sys_user.go

@@ -18,8 +18,8 @@ type SysUser struct {
 	service.Service
 }
 
-// GetSysUserPage 获取SysUser列表
-func (e *SysUser) GetSysUserPage(c *dto.SysUserSearch, p *actions.DataPermission, list *[]models.SysUser, count *int64) error {
+// GetPage 获取SysUser列表
+func (e *SysUser) GetPage(c *dto.SysUserGetPageReq, p *actions.DataPermission, list *[]models.SysUser, count *int64) error {
 	var err error
 	var data models.SysUser
 
@@ -38,8 +38,8 @@ func (e *SysUser) GetSysUserPage(c *dto.SysUserSearch, p *actions.DataPermission
 	return nil
 }
 
-// GetSysUser 获取SysUser对象
-func (e *SysUser) GetSysUser(d *dto.SysUserById, p *actions.DataPermission, model *models.SysUser) error {
+// Get 获取SysUser对象
+func (e *SysUser) Get(d *dto.SysUserById, p *actions.DataPermission, model *models.SysUser) error {
 	var data models.SysUser
 
 	err := e.Orm.Model(&data).Debug().
@@ -59,8 +59,8 @@ func (e *SysUser) GetSysUser(d *dto.SysUserById, p *actions.DataPermission, mode
 	return nil
 }
 
-// InsertSysUser 创建SysUser对象
-func (e *SysUser) InsertSysUser(c *dto.SysUserControl) error {
+// Insert 创建SysUser对象
+func (e *SysUser) Insert(c *dto.SysUserInsertReq) error {
 	var err error
 	var data models.SysUser
 	var i int64
@@ -83,8 +83,8 @@ func (e *SysUser) InsertSysUser(c *dto.SysUserControl) error {
 	return nil
 }
 
-// UpdateSysUser 修改SysUser对象
-func (e *SysUser) UpdateSysUser(c *dto.SysUserControl, p *actions.DataPermission) error {
+// Update 修改SysUser对象
+func (e *SysUser) Update(c *dto.SysUserUpdateReq, p *actions.DataPermission) error {
 	var err error
 	var model models.SysUser
 	db := e.Orm.Scopes(
@@ -99,16 +99,21 @@ func (e *SysUser) UpdateSysUser(c *dto.SysUserControl, p *actions.DataPermission
 
 	}
 	c.Generate(&model)
-	err = e.Orm.Save(&model).Error
-	if err != nil {
-		e.Log.Errorf("Service UpdateSysUser error: %s", err)
+	update := e.Orm.Model(&model).Where("user_id = ?", &model.UserId).Omit("password", "salt").Updates(&model)
+	if err = update.Error; err != nil {
+		e.Log.Errorf("db error: %s", err)
+		return err
+	}
+	if update.RowsAffected == 0 {
+		err = errors.New("update userinfo error")
+		log.Warnf("db update error")
 		return err
 	}
 	return nil
 }
 
-// UpdateSysUserStatus 更新用户状态
-func (e *SysUser) UpdateSysUserStatus(c *dto.UpdateSysUserStatusReq, p *actions.DataPermission) error {
+// UpdateAvatar 更新用户头像
+func (e *SysUser) UpdateAvatar(c *dto.UpdateSysUserAvatarReq, p *actions.DataPermission) error {
 	var err error
 	var model models.SysUser
 	db := e.Orm.Scopes(
@@ -122,8 +127,7 @@ func (e *SysUser) UpdateSysUserStatus(c *dto.UpdateSysUserStatusReq, p *actions.
 		return errors.New("无权更新该数据")
 
 	}
-	c.Generate(&model)
-	err = e.Orm.Save(&model).Error
+	err = e.Orm.Table(model.TableName()).Where("user_id =? ", c.UserId).Updates(c).Error
 	if err != nil {
 		e.Log.Errorf("Service UpdateSysUser error: %s", err)
 		return err
@@ -131,8 +135,31 @@ func (e *SysUser) UpdateSysUserStatus(c *dto.UpdateSysUserStatusReq, p *actions.
 	return nil
 }
 
-// ResetSysUserPwd 重置用户密码
-func (e *SysUser) ResetSysUserPwd(c *dto.ResetSysUserPwdReq, p *actions.DataPermission) error {
+// UpdateStatus 更新用户状态
+func (e *SysUser) UpdateStatus(c *dto.UpdateSysUserStatusReq, p *actions.DataPermission) error {
+	var err error
+	var model models.SysUser
+	db := e.Orm.Scopes(
+		actions.Permission(model.TableName(), p),
+	).First(&model, c.GetId())
+	if err = db.Error; err != nil {
+		e.Log.Errorf("Service UpdateSysUser error: %s", err)
+		return err
+	}
+	if db.RowsAffected == 0 {
+		return errors.New("无权更新该数据")
+
+	}
+	err = e.Orm.Table(model.TableName()).Where("user_id =? ", c.UserId).Updates(c).Error
+	if err != nil {
+		e.Log.Errorf("Service UpdateSysUser error: %s", err)
+		return err
+	}
+	return nil
+}
+
+// ResetPwd 重置用户密码
+func (e *SysUser) ResetPwd(c *dto.ResetSysUserPwdReq, p *actions.DataPermission) error {
 	var err error
 	var model models.SysUser
 	db := e.Orm.Scopes(
@@ -146,7 +173,7 @@ func (e *SysUser) ResetSysUserPwd(c *dto.ResetSysUserPwdReq, p *actions.DataPerm
 		return errors.New("无权更新该数据")
 	}
 	c.Generate(&model)
-	err = e.Orm.Save(&model).Error
+	err = e.Orm.Omit("username", "nick_name", "phone", "role_id", "avatar", "sex").Save(&model).Error
 	if err != nil {
 		e.Log.Errorf("At Service ResetSysUserPwd error: %s", err)
 		return err
@@ -154,8 +181,8 @@ func (e *SysUser) ResetSysUserPwd(c *dto.ResetSysUserPwdReq, p *actions.DataPerm
 	return nil
 }
 
-// RemoveSysUser 删除SysUser
-func (e *SysUser) RemoveSysUser(c *dto.SysUserById, p *actions.DataPermission) error {
+// Remove 删除SysUser
+func (e *SysUser) Remove(c *dto.SysUserById, p *actions.DataPermission) error {
 	var err error
 	var data models.SysUser
 
@@ -173,8 +200,8 @@ func (e *SysUser) RemoveSysUser(c *dto.SysUserById, p *actions.DataPermission) e
 	return nil
 }
 
-// UpdateSysUserPwd 修改SysUser对象密码
-func (e *SysUser) UpdateSysUserPwd(id int, oldPassword, newPassword string, p *actions.DataPermission) error {
+// UpdatePwd 修改SysUser对象密码
+func (e *SysUser) UpdatePwd(id int, oldPassword, newPassword string, p *actions.DataPermission) error {
 	var err error
 
 	if newPassword == "" {
@@ -206,7 +233,9 @@ func (e *SysUser) UpdateSysUserPwd(id int, oldPassword, newPassword string, p *a
 		return err
 	}
 	c.Password = newPassword
-	db := e.Orm.Model(c).Where("user_id = ?", id).Select("Password", "Salt").Updates(c)
+	db := e.Orm.Model(c).Where("user_id = ?", id).
+		Select("Password", "Salt").
+		Updates(c)
 	if err = db.Error; err != nil {
 		e.Log.Errorf("db error: %s", err)
 		return err
@@ -219,7 +248,7 @@ func (e *SysUser) UpdateSysUserPwd(id int, oldPassword, newPassword string, p *a
 	return nil
 }
 
-func (e *SysUser) GetSysUserProfile(c *dto.SysUserById, user *models.SysUser, roles *[]models.SysRole, posts *[]models.SysPost) error {
+func (e *SysUser) GetProfile(c *dto.SysUserById, user *models.SysUser, roles *[]models.SysRole, posts *[]models.SysPost) error {
 	err := e.Orm.Preload("Dept").First(user, c.GetId()).Error
 	if err != nil {
 		return err

app/cms/models/sys_category.go

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

app/cms/models/sys_content.go

@@ -1,33 +0,0 @@
-package models
-
-import (
-	"go-admin/common/models"
-)
-
-type SysContent struct {
-	models.Model
-	CateId  int    `json:"cateId" gorm:"size:11;comment:分类id"`
-	Name    string `json:"name" gorm:"size:255;comment:名称"`
-	Status  int    `json:"status" gorm:"size:1;comment:状态"`
-	Img     string `json:"img" gorm:"size:255;comment:图片"`
-	Content string `json:"content" gorm:"type:text;comment:内容"`
-	Remark  string `json:"remark" gorm:"size:255;comment:备注"`
-	Sort    int    `json:"sort" gorm:"size: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
-}

app/cms/router/init_router.go

@@ -1,36 +0,0 @@
-package router
-
-import (
-	_ "github.com/go-admin-team/go-admin-core/sdk/pkg"
-	"os"
-
-	"github.com/gin-gonic/gin"
-	log "github.com/go-admin-team/go-admin-core/logger"
-	"github.com/go-admin-team/go-admin-core/sdk"
-	common "go-admin/common/middleware"
-)
-
-// InitRouter 路由初始化，不要怀疑，这里用到了
-func InitRouter() {
-	var r *gin.Engine
-	h := sdk.Runtime.GetEngine()
-	if h == nil {
-		log.Fatal("not found engine...")
-		os.Exit(-1)
-	}
-	switch h.(type) {
-	case *gin.Engine:
-		r = h.(*gin.Engine)
-	default:
-		log.Fatal("not support other engine")
-		os.Exit(-1)
-	}
-	// the jwt middleware
-	authMiddleware, err := common.AuthInit()
-	if err != nil {
-		log.Fatalf("JWT Init Error, %s", err.Error())
-	}
-
-	// 注册业务路由
-	initRouter(r, authMiddleware)
-}

app/cms/router/router.go

@@ -1,42 +0,0 @@
-package router
-
-import (
-	"github.com/gin-gonic/gin"
-	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
-)
-
-var (
-	routerNoCheckRole = make([]func(*gin.RouterGroup), 0)
-	routerCheckRole   = make([]func(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware), 0)
-)
-
-// initRouter 路由示例
-func initRouter(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware) *gin.Engine {
-
-	// 无需认证的路由
-	noCheckRoleRouter(r)
-	// 需要认证的路由
-	checkRoleRouter(r, authMiddleware)
-
-	return r
-}
-
-// noCheckRoleRouter 无需认证的路由示例
-func noCheckRoleRouter(r *gin.Engine) {
-	// 可根据业务需求来设置接口版本
-	v1 := r.Group("/api/v1")
-
-	for _, f := range routerNoCheckRole {
-		f(v1)
-	}
-}
-
-// checkRoleRouter 需要认证的路由示例
-func checkRoleRouter(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware) {
-	// 可根据业务需求来设置接口版本
-	v1 := r.Group("/api/v1")
-
-	for _, f := range routerCheckRole {
-		f(v1, authMiddleware)
-	}
-}

app/cms/router/sys_category.go

@@ -1,31 +0,0 @@
-package router
-
-import (
-	"github.com/gin-gonic/gin"
-	"go-admin/app/cms/models"
-	"go-admin/app/cms/service/dto"
-	"go-admin/common/middleware"
-
-	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
-	"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(middleware.AuthCheckRole())
-	{
-		model := &models.SysCategory{}
-		r.GET("", actions.PermissionAction(), actions.IndexAction(model, new(dto.SysCategorySearch), func() interface{} {
-			list := make([]models.SysCategory, 0)
-			return &list
-		}))
-		r.GET("/:id", actions.PermissionAction(), actions.ViewAction(new(dto.SysCategoryById), nil))
-		r.POST("", actions.CreateAction(new(dto.SysCategoryControl)))
-		r.PUT("/:id", actions.PermissionAction(), actions.UpdateAction(new(dto.SysCategoryControl)))
-		r.DELETE("", actions.PermissionAction(), actions.DeleteAction(new(dto.SysCategoryById)))
-	}
-}

app/cms/router/sys_content.go

@@ -1,31 +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/cms/models"
-	"go-admin/app/cms/service/dto"
-	"go-admin/common/actions"
-	"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(middleware.AuthCheckRole())
-	{
-		model := &models.SysContent{}
-		r.GET("", actions.PermissionAction(), actions.IndexAction(model, new(dto.SysContentSearch), func() interface{} {
-			list := make([]models.SysContent, 0)
-			return &list
-		}))
-		r.GET("/:id", actions.PermissionAction(), actions.ViewAction(new(dto.SysContentById), nil))
-		r.POST("", actions.CreateAction(new(dto.SysContentControl)))
-		r.PUT("/:id", actions.PermissionAction(), actions.UpdateAction(new(dto.SysContentControl)))
-		r.DELETE("", actions.PermissionAction(), actions.DeleteAction(new(dto.SysContentById)))
-	}
-}

app/cms/service/dto/sys_category.go

@@ -1,96 +0,0 @@
-package dto
-
-import (
-	"errors"
-	"github.com/gin-gonic/gin"
-	"github.com/go-admin-team/go-admin-core/sdk/api"
-	"go-admin/app/cms/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:"名称"`
-	Status         string `form:"status" search:"type:exact;column:status;table:sys_category" comment:"状态"`
-	CateId         int    `form:"cateId" search:"type:exact;column:cate_id;table:sys_category" comment:"分类id"`
-}
-
-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())
-	}
-
-	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:"名称"`
-	Img    string `json:"img" comment:"图标"`
-	Sort   int    `json:"sort" comment:"排序"`
-	Status int    `json:"status" comment:"状态"`
-	Remark string `json:"remark" comment:"备注"`
-}
-
-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("数据绑定出错")
-	}
-
-	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
-}
-
-func (s *SysCategoryById) Generate() dto.Control {
-	cp := *s
-	return &cp
-}
-
-func (s *SysCategoryById) GenerateM() (common.ActiveRecord, error) {
-	return &models.SysCategory{}, nil
-}

app/cms/service/dto/sys_content.go

@@ -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/cms/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
-}

app/jobs/apis/sys_job.go

@@ -33,7 +33,7 @@ func (e SysJob) RemoveJobForService(c *gin.Context) {
 	err = s.RemoveJob(&v)
 	if err != nil {
 		e.Logger.Errorf("RemoveJob error, %s", err.Error())
-		e.Error(http.StatusInternalServerError, err, "")
+		e.Error(500, err, "")
 		return
 	}
 	e.OK(nil, s.Msg)
@@ -62,7 +62,7 @@ func (e SysJob) StartJobForService(c *gin.Context) {
 	err = s.StartJob(&v)
 	if err != nil {
 		log.Errorf("GetCrontabKey error, %s", err.Error())
-		e.Error(http.StatusInternalServerError, err, "")
+		e.Error(500, err, err.Error())
 		return
 	}
 	e.OK(nil, s.Msg)

app/jobs/service/sys_job.go

@@ -1,6 +1,7 @@
 package service
 
 import (
+	"errors"
 	"time"
 
 	"github.com/go-admin-team/go-admin-core/sdk/service"
@@ -52,6 +53,12 @@ func (e *SysJob) StartJob(c *dto.GeneralGetDto) error {
 		e.Log.Errorf("db error: %s", err)
 		return err
 	}
+
+	if data.Status == 1 {
+		err = errors.New("当前Job是关闭状态不能被启动，请先启用。")
+		return err
+	}
+
 	if data.JobType == 1 {
 		var j = &jobs.HttpJob{}
 		j.InvokeTarget = data.InvokeTarget

app/other/apis/file.go

@@ -40,6 +40,7 @@ type File struct {
 // @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
 // @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
 // @Router /api/v1/public/uploadFile [post]
+// @Security Bearer
 func (e File) UploadFile(c *gin.Context) {
 	e.MakeContext(c)
 	tag, _ := c.GetPostForm("type")
@@ -101,8 +102,8 @@ func (e File) baseImg(c *gin.Context, fileResponse FileResponse, urlPerfix strin
 		return fileResponse
 	}
 	if source != "1" {
-		fileResponse.Path = "https://youshikeji.oss-cn-shanghai.aliyuncs.com/img/" + fileName
-		fileResponse.FullPath = "https://youshikeji.oss-cn-shanghai.aliyuncs.com/img/" + fileName
+		fileResponse.Path = "/static/uploadfile/" + fileName
+		fileResponse.FullPath = "/static/uploadfile/" + fileName
 	}
 	return fileResponse
 }
@@ -135,8 +136,8 @@ func (e File) multipleFile(c *gin.Context, urlPerfix string) []FileResponse {
 					Type:     fileType,
 				}
 				if source != "1" {
-					fileResponse.Path = "https://youshikeji.oss-cn-shanghai.aliyuncs.com/img/" + fileName
-					fileResponse.FullPath = "https://youshikeji.oss-cn-shanghai.aliyuncs.com/img/" + fileName
+					fileResponse.Path = "/static/uploadfile/" + fileName
+					fileResponse.FullPath = "/static/uploadfile/" + fileName
 				}
 				multipartFile = append(multipartFile, fileResponse)
 			}
@@ -171,14 +172,14 @@ func (e File) singleFile(c *gin.Context, fileResponse FileResponse, urlPerfix st
 		Name:     files.Filename,
 		Type:     fileType,
 	}
-	source, _ := c.GetPostForm("source")
-	err = thirdUpload(source, fileName, singleFile)
-	if err != nil {
-		e.Error(200, errors.New(""), "上传第三方失败")
-		return FileResponse{}, true
-	}
-	fileResponse.Path = "https://youshikeji.oss-cn-shanghai.aliyuncs.com/img/" + fileName
-	fileResponse.FullPath = "https://youshikeji.oss-cn-shanghai.aliyuncs.com/img/" + fileName
+	//source, _ := c.GetPostForm("source")
+	//err = thirdUpload(source, fileName, singleFile)
+	//if err != nil {
+	//	e.Error(200, errors.New(""), "上传第三方失败")
+	//	return FileResponse{}, true
+	//}
+	fileResponse.Path = "/static/uploadfile/" + fileName
+	fileResponse.FullPath = "/static/uploadfile/" + fileName
 	return fileResponse, false
 }
 
@@ -200,4 +201,4 @@ func ossUpload(name string, path string) error {
 func qiniuUpload(name string, path string) error {
 	oss := file_store.ALiYunOSS{}
 	return oss.UpLoad(name, path)
-}
+}

app/other/apis/sys_china_area_data.go

@@ -1,181 +0,0 @@
-package apis
-
-import (
-	"github.com/gin-gonic/gin/binding"
-	"go-admin/app/other/models"
-	"go-admin/app/other/service"
-	"go-admin/app/other/service/dto"
-	"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"
-
-	"go-admin/common/actions"
-)
-
-type SysChinaAreaData struct {
-	api.Api
-}
-
-func (e SysChinaAreaData) GetPage(c *gin.Context) {
-	s := service.SysChinaAreaData{}
-	req := dto.SysChinaAreaDataSearch{}
-	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.SysChinaAreaData, 0)
-	var count int64
-	err = s.GetPage(&req, p, &list, &count)
-	if err != nil {
-		e.Error(http.StatusInternalServerError, err, "查询失败")
-		return
-	}
-
-	e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
-}
-
-func (e SysChinaAreaData) Get(c *gin.Context) {
-	s := service.SysChinaAreaData{}
-	req := dto.SysChinaAreaDataById{}
-	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 object models.SysChinaAreaData
-	p := actions.GetPermissionFromContext(c)
-	err = s.Get(&req, p, &object)
-	if err != nil {
-		e.Error(http.StatusUnprocessableEntity, err, "查询失败")
-		return
-	}
-
-	e.OK(object, "查询成功")
-}
-
-func (e SysChinaAreaData) Insert(c *gin.Context) {
-	e.MakeContext(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.Insert(object)
-	if err != nil {
-		log.Error(err)
-		e.Error(http.StatusInternalServerError, err, "创建失败")
-		return
-	}
-
-	e.OK(object.GetId(), "创建成功")
-}
-
-func (e SysChinaAreaData) Update(c *gin.Context) {
-	e.MakeContext(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.Update(object, p)
-	if err != nil {
-		log.Error(err)
-		return
-	}
-	e.OK(object.GetId(), "更新成功")
-}
-
-func (e SysChinaAreaData) Delete(c *gin.Context) {
-	e.MakeContext(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.Remove(control, p)
-	if err != nil {
-		log.Errorf("RemoveSysChinaAreaData error, %s", err)
-		e.Error(http.StatusInternalServerError, err, "删除失败")
-		return
-	}
-	e.OK(control.GetId(), "删除成功")
-}

app/other/apis/sys_file_dir.go

@@ -1,198 +0,0 @@
-package apis
-
-import (
-	"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"
-	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
-
-	"go-admin/app/other/models"
-	"go-admin/app/other/service"
-	"go-admin/app/other/service/dto"
-	"go-admin/common/actions"
-)
-
-type SysFileDir struct {
-	api.Api
-}
-
-func (e SysFileDir) GetPage(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.SysFileDir
-	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) Get(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) Insert(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) Update(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.Update(control, p)
-	if err != nil {
-		log.Errorf("UpdateSysFileDir error, %s", err)
-		e.Error(http.StatusInternalServerError, err, "更新失败")
-		return
-	}
-	e.OK(control.Id, "更新成功")
-}
-
-func (e SysFileDir) Delete(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, "删除成功")
-}

app/other/apis/sys_file_info.go

@@ -1,209 +0,0 @@
-package apis
-
-import (
-	models2 "go-admin/app/other/models"
-	service2 "go-admin/app/other/service"
-	dto2 "go-admin/app/other/service/dto"
-	"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"
-
-	"go-admin/common/actions"
-)
-
-type SysFileInfo struct {
-	api.Api
-}
-
-func (e SysFileInfo) GetPage(c *gin.Context) {
-	e.Context = c
-	log := e.GetLogger()
-	search := new(dto2.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([]models2.SysFileInfo, 0)
-	var count int64
-	serviceStudent := service2.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) Get(c *gin.Context) {
-	control := new(dto2.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 models2.SysFileInfo
-
-	//数据权限检查
-	p := actions.GetPermissionFromContext(c)
-
-	serviceSysFileInfo := service2.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) Insert(c *gin.Context) {
-	control := new(dto2.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 := service2.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) Update(c *gin.Context) {
-	control := new(dto2.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 := service2.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) Delete(c *gin.Context) {
-	control := new(dto2.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 := service2.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, "删除成功")
-}

app/other/apis/sys_server_monitor.go

@@ -1,15 +1,22 @@
 package apis
 
 import (
+	"fmt"
+	"github.com/shirou/gopsutil/v3/net"
+	"regexp"
 	"runtime"
+	"strconv"
+	"strings"
+	"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/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"
+	"github.com/shirou/gopsutil/v3/cpu"
+	"github.com/shirou/gopsutil/v3/disk"
+	"github.com/shirou/gopsutil/v3/host"
+	"github.com/shirou/gopsutil/v3/mem"
 )
 
 const (
@@ -19,19 +26,52 @@ const (
 	GB = 1024 * MB
 )
 
+var (
+	Version           string
+	expectDiskFsTypes = []string{
+		"apfs", "ext4", "ext3", "ext2", "f2fs", "reiserfs", "jfs", "btrfs",
+		"fuseblk", "zfs", "simfs", "ntfs", "fat32", "exfat", "xfs", "fuse.rclone",
+	}
+	excludeNetInterfaces = []string{
+		"lo", "tun", "docker", "veth", "br-", "vmbr", "vnet", "kube",
+	}
+	getMacDiskNo = regexp.MustCompile(`\/dev\/disk(\d)s.*`)
+)
+
+var (
+	netInSpeed, netOutSpeed, netInTransfer, netOutTransfer, lastUpdateNetStats uint64
+	cachedBootTime                                                             time.Time
+)
+
 type ServerMonitor struct {
 	api.Api
 }
 
+// GetHourDiffer 获取相差时间
+func GetHourDiffer(startTime, endTime string) int64 {
+	var hour int64
+	t1, err := time.ParseInLocation("2006-01-02 15:04:05", startTime, time.Local)
+	t2, err := time.ParseInLocation("2006-01-02 15:04:05", endTime, time.Local)
+	if err == nil && t1.Before(t2) {
+		diff := t2.Unix() - t1.Unix() //
+		hour = diff / 3600
+		return hour
+	} else {
+		return hour
+	}
+}
+
 // ServerInfo 获取系统信息
 // @Summary 系统信息
 // @Description 获取JSON
 // @Tags 系统信息
 // @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
 // @Router /api/v1/server-monitor [get]
+// @Security Bearer
 func (e ServerMonitor) ServerInfo(c *gin.Context) {
 	e.Context = c
 
+	sysInfo, err := host.Info()
 	osDic := make(map[string]interface{}, 0)
 	osDic["goOs"] = runtime.GOOS
 	osDic["arch"] = runtime.GOARCH
@@ -41,36 +81,107 @@ func (e ServerMonitor) ServerInfo(c *gin.Context) {
 	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
+	osDic["hostName"] = sysInfo.Hostname
+	osDic["time"] = time.Now().Format("2006-01-02 15:04:05")
 
 	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
+	memDic["used"] = mem.Used / MB
+	memDic["total"] = mem.Total / MB
+
+	fmt.Println("mem", int(mem.Total/mem.Used*100))
+	memDic["percent"] = pkg.Round(mem.UsedPercent, 2)
+
+	swapDic := make(map[string]interface{}, 0)
+	swapDic["used"] = mem.SwapTotal - mem.SwapFree
+	swapDic["total"] = mem.SwapTotal
 
 	cpuDic := make(map[string]interface{}, 0)
 	cpuDic["cpuInfo"], _ = cpu.Info()
 	percent, _ := cpu.Percent(0, false)
-	cpuDic["Percent"] = pkg.Round(percent[0], 2)
+	cpuDic["percent"] = pkg.Round(percent[0], 2)
 	cpuDic["cpuNum"], _ = cpu.Counts(false)
 
+	//服务器磁盘信息
+	disklist := make([]disk.UsageStat, 0)
+	//所有分区
+	var diskTotal, diskUsed, diskUsedPercent float64
+	diskInfo, err := disk.Partitions(true)
+	if err == nil {
+		for _, p := range diskInfo {
+			diskDetail, err := disk.Usage(p.Mountpoint)
+			if err == nil {
+				diskDetail.UsedPercent, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", diskDetail.UsedPercent), 64)
+				diskDetail.Total = diskDetail.Total / 1024 / 1024
+				diskDetail.Used = diskDetail.Used / 1024 / 1024
+				diskDetail.Free = diskDetail.Free / 1024 / 1024
+				disklist = append(disklist, *diskDetail)
+
+			}
+		}
+	}
+
+	d, _ := disk.Usage("/")
+
+	diskTotal = float64(d.Total / GB)
+	diskUsed = float64(d.Used / GB)
+	diskUsedPercent, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", d.UsedPercent), 64)
+
+	diskDic := make(map[string]interface{}, 0)
+	diskDic["total"] = diskTotal
+	diskDic["used"] = diskUsed
+	diskDic["percent"] = diskUsedPercent
+
+	bootTime, _ := host.BootTime()
+	cachedBootTime = time.Unix(int64(bootTime), 0)
+
+	TrackNetworkSpeed()
+	netDic := make(map[string]interface{}, 0)
+	netDic["in"] = pkg.Round(float64(netInSpeed/KB), 2)
+	netDic["out"] = pkg.Round(float64(netOutSpeed/KB), 2)
 	e.Custom(gin.H{
-		"code": 200,
-		"os":   osDic,
-		"mem":  memDic,
-		"cpu":  cpuDic,
-		"disk": diskDic,
+		"code":     200,
+		"os":       osDic,
+		"mem":      memDic,
+		"cpu":      cpuDic,
+		"disk":     diskDic,
+		"net":      netDic,
+		"swap":     swapDic,
+		"location": "Aliyun",
+		"bootTime": GetHourDiffer(cachedBootTime.Format("2006-01-02 15:04:05"), time.Now().Format("2006-01-02 15:04:05")),
 	})
 }
+
+func TrackNetworkSpeed() {
+	var innerNetInTransfer, innerNetOutTransfer uint64
+	nc, err := net.IOCounters(true)
+	if err == nil {
+		for _, v := range nc {
+			if isListContainsStr(excludeNetInterfaces, v.Name) {
+				continue
+			}
+			innerNetInTransfer += v.BytesRecv
+			innerNetOutTransfer += v.BytesSent
+		}
+		now := uint64(time.Now().Unix())
+		diff := now - lastUpdateNetStats
+		if diff > 0 {
+			netInSpeed = (innerNetInTransfer - netInTransfer) / diff
+			fmt.Println("netInSpeed", netInSpeed)
+			netOutSpeed = (innerNetOutTransfer - netOutTransfer) / diff
+			fmt.Println("netOutSpeed", netOutSpeed)
+		}
+		netInTransfer = innerNetInTransfer
+		netOutTransfer = innerNetOutTransfer
+		lastUpdateNetStats = now
+	}
+}
+
+func isListContainsStr(list []string, str string) bool {
+	for i := 0; i < len(list); i++ {
+		if strings.Contains(str, list[i]) {
+			return true
+		}
+	}
+	return false
+}

app/other/apis/tools/db_columns.go

@@ -1,19 +1,17 @@
 package tools
 
 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/response"
 
-	"go-admin/app/admin/models/tools"
+	"go-admin/app/other/models/tools"
 )
 
 // GetDBColumnList 分页列表数据
 // @Summary 分页列表数据 / page list data
 // @Description 数据库表列分页列表 / database table column page list
-// @Tags 工具 / Tools
+// @Tags 工具 / 生成工具
 // @Param tableName query string false "tableName / 数据表名称"
 // @Param pageSize query int false "pageSize / 页条数"
 // @Param pageIndex query int false "pageIndex / 页码"
@@ -38,7 +36,7 @@ func (e *Gen) GetDBColumnList(c *gin.Context) {
 	db, err := pkg.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
+		e.Error(500, err, "数据库连接获取失败")
 		return
 	}
 

app/other/apis/tools/db_tables.go

@@ -2,20 +2,18 @@ package tools
 
 import (
 	"errors"
-	"net/http"
-
 	"github.com/gin-gonic/gin"
 	"github.com/go-admin-team/go-admin-core/sdk/config"
 	"github.com/go-admin-team/go-admin-core/sdk/pkg"
 	_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
 
-	"go-admin/app/admin/models/tools"
+	"go-admin/app/other/models/tools"
 )
 
 // GetDBTableList 分页列表数据
 // @Summary 分页列表数据 / page list data
 // @Description 数据库表分页列表 / database table page list
-// @Tags 工具 / Tools
+// @Tags 工具 / 生成工具
 // @Param tableName query string false "tableName / 数据表名称"
 // @Param pageSize query int false "pageSize / 页条数"
 // @Param pageIndex query int false "pageIndex / 页码"
@@ -47,7 +45,7 @@ func (e *Gen) GetDBTableList(c *gin.Context) {
 	db, err := pkg.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
+		e.Error(500, err, "数据库连接获取失败")
 		return
 	}
 

app/other/apis/tools/gen.go

@@ -2,9 +2,9 @@ package tools
 
 import (
 	"bytes"
+	"fmt"
 	"go-admin/app/admin/service"
 	"go-admin/app/admin/service/dto"
-	"net/http"
 	"strconv"
 	"strings"
 	"text/template"
@@ -15,7 +15,7 @@ import (
 	"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/tools"
+	"go-admin/app/other/models/tools"
 )
 
 type Gen struct {
@@ -29,61 +29,61 @@ func (e Gen) Preview(c *gin.Context) {
 	id, err := pkg.StringToInt(c.Param("tableId"))
 	if err != nil {
 		log.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("tableId接收失败！错误详情：%s", err.Error()))
 		return
 	}
 	table.TableId = id
 	t1, err := template.ParseFiles("template/v4/model.go.template")
 	if err != nil {
 		log.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("model模版读取失败！错误详情：%s", err.Error()))
 		return
 	}
 	t2, err := template.ParseFiles("template/v4/no_actions/apis.go.template")
 	if err != nil {
 		log.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("api模版读取失败！错误详情：%s", err.Error()))
 		return
 	}
 	t3, err := template.ParseFiles("template/v4/js.go.template")
 	if err != nil {
 		log.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("js模版读取失败！错误详情：%s", err.Error()))
 		return
 	}
 	t4, err := template.ParseFiles("template/v4/vue.go.template")
 	if err != nil {
 		log.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("vue模版读取失败！错误详情：%s", err.Error()))
 		return
 	}
 	t5, err := template.ParseFiles("template/v4/no_actions/router_check_role.go.template")
 	if err != nil {
 		log.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("路由模版读取失败！错误详情：%s", err.Error()))
 		return
 	}
 	t6, err := template.ParseFiles("template/v4/dto.go.template")
 	if err != nil {
 		log.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("dto模版读取失败！错误详情：%s", err.Error()))
 		return
 	}
 	t7, err := template.ParseFiles("template/v4/no_actions/service.go.template")
 	if err != nil {
 		log.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("service模版读取失败！错误详情：%s", err.Error()))
 		return
 	}
 
 	db, err := pkg.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
+		e.Error(500, err, fmt.Sprintf("数据库链接获取失败！错误详情：%s", err.Error()))
 		return
 	}
 
-	tab, _ := table.Get(db)
+	tab, _ := table.Get(db,false)
 	var b1 bytes.Buffer
 	err = t1.Execute(&b1, tab)
 	var b2 bytes.Buffer
@@ -117,25 +117,21 @@ func (e Gen) GenCode(c *gin.Context) {
 	id, err := pkg.StringToInt(c.Param("tableId"))
 	if err != nil {
 		log.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("tableId参数接收失败！错误详情：%s", err.Error()))
 		return
 	}
 
 	db, err := pkg.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
+		e.Error(500, err, fmt.Sprintf("数据库链接获取失败！错误详情：%s", err.Error()))
 		return
 	}
 
 	table.TableId = id
-	tab, _ := table.Get(db)
+	tab, _ := table.Get(db,false)
 
-	if tab.IsActions == 1 {
-		e.ActionsGen(c, tab)
-	} else {
-		e.NOActionsGen(c, tab)
-	}
+	e.NOActionsGen(c, tab)
 
 	e.OK("", "Code generated successfully！")
 }
@@ -147,19 +143,19 @@ func (e Gen) GenApiToFile(c *gin.Context) {
 	id, err := pkg.StringToInt(c.Param("tableId"))
 	if err != nil {
 		log.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("tableId参数获取失败！错误详情：%s", err.Error()))
 		return
 	}
 
 	db, err := pkg.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
+		e.Error(500, err, fmt.Sprintf("数据库链接获取失败！错误详情：%s", err.Error()))
 		return
 	}
 
 	table.TableId = id
-	tab, _ := table.Get(db)
+	tab, _ := table.Get(db,false)
 	e.genApiToFile(c, tab)
 
 	e.OK("", "Code generated successfully！")
@@ -168,6 +164,7 @@ func (e Gen) GenApiToFile(c *gin.Context) {
 func (e Gen) NOActionsGen(c *gin.Context, tab tools.SysTables) {
 	e.Context = c
 	log := e.GetLogger()
+	tab.MLTBName = strings.Replace(tab.TBName, "_", "-", -1)
 
 	basePath := "template/v4/"
 	routerFile := basePath + "no_actions/router_check_role.go.template"
@@ -179,43 +176,43 @@ func (e Gen) NOActionsGen(c *gin.Context, tab tools.SysTables) {
 	t1, err := template.ParseFiles(basePath + "model.go.template")
 	if err != nil {
 		log.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("model模版读取失败！错误详情：%s", err.Error()))
 		return
 	}
 	t2, err := template.ParseFiles(basePath + "no_actions/apis.go.template")
 	if err != nil {
 		log.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("api模版读取失败！错误详情：%s", err.Error()))
 		return
 	}
 	t3, err := template.ParseFiles(routerFile)
 	if err != nil {
 		log.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("路由模版失败！错误详情：%s", err.Error()))
 		return
 	}
 	t4, err := template.ParseFiles(basePath + "js.go.template")
 	if err != nil {
 		log.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("js模版解析失败！错误详情：%s", err.Error()))
 		return
 	}
 	t5, err := template.ParseFiles(basePath + "vue.go.template")
 	if err != nil {
 		log.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("vue模版解析失败！错误详情：%s", err.Error()))
 		return
 	}
 	t6, err := template.ParseFiles(basePath + "dto.go.template")
 	if err != nil {
 		log.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("dto模版解析失败失败！错误详情：%s", err.Error()))
 		return
 	}
 	t7, err := template.ParseFiles(basePath + "no_actions/service.go.template")
 	if err != nil {
 		log.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("service模版失败！错误详情：%s", err.Error()))
 		return
 	}
 
@@ -223,8 +220,13 @@ func (e Gen) NOActionsGen(c *gin.Context, tab tools.SysTables) {
 	_ = 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.ModuleFrontName)
+	_ = pkg.PathCreate(config.GenConfig.FrontPath + "/api/" + tab.PackageName + "/")
+	err = pkg.PathCreate(config.GenConfig.FrontPath + "/views/" + tab.PackageName + "/" + tab.MLTBName + "/")
+	if err != nil {
+		log.Error(err)
+		e.Error(500, err, fmt.Sprintf("views目录创建失败！错误详情：%s", err.Error()))
+		return
+	}
 
 	var b1 bytes.Buffer
 	err = t1.Execute(&b1, tab)
@@ -240,13 +242,13 @@ func (e Gen) NOActionsGen(c *gin.Context, tab tools.SysTables) {
 	err = t6.Execute(&b6, tab)
 	var b7 bytes.Buffer
 	err = t7.Execute(&b7, tab)
-	pkg.FileCreate(b1, "./app/"+tab.PackageName+"/models/"+tab.ModuleName+".go")
-	pkg.FileCreate(b2, "./app/"+tab.PackageName+"/apis/"+tab.ModuleName+".go")
-	pkg.FileCreate(b3, "./app/"+tab.PackageName+"/router/"+tab.ModuleName+".go")
-	pkg.FileCreate(b4, config.GenConfig.FrontPath+"/api/"+tab.ModuleFrontName+".js")
-	pkg.FileCreate(b5, config.GenConfig.FrontPath+"/views/"+tab.ModuleFrontName+"/index.vue")
-	pkg.FileCreate(b6, "./app/"+tab.PackageName+"/service/dto/"+tab.ModuleName+".go")
-	pkg.FileCreate(b7, "./app/"+tab.PackageName+"/service/"+tab.ModuleName+".go")
+	pkg.FileCreate(b1, "./app/"+tab.PackageName+"/models/"+tab.TBName+".go")
+	pkg.FileCreate(b2, "./app/"+tab.PackageName+"/apis/"+tab.TBName+".go")
+	pkg.FileCreate(b3, "./app/"+tab.PackageName+"/router/"+tab.TBName+".go")
+	pkg.FileCreate(b4, config.GenConfig.FrontPath+"/api/"+tab.PackageName+"/"+tab.MLTBName+".js")
+	pkg.FileCreate(b5, config.GenConfig.FrontPath+"/views/"+tab.PackageName+"/"+tab.MLTBName+"/index.vue")
+	pkg.FileCreate(b6, "./app/"+tab.PackageName+"/service/dto/"+tab.TBName+".go")
+	pkg.FileCreate(b7, "./app/"+tab.PackageName+"/service/"+tab.TBName+".go")
 
 }
 
@@ -265,7 +267,7 @@ func (e Gen) genApiToFile(c *gin.Context, tab tools.SysTables) {
 	t1, err := template.ParseFiles(basePath + "api_migrate.template")
 	if err != nil {
 		e.Logger.Error(err)
-		e.Error(500, err, "")
+		e.Error(500, err, fmt.Sprintf("数据迁移模版解析失败！错误详情：%s", err.Error()))
 		return
 	}
 	i := strconv.FormatInt(time.Now().UnixNano()/1e6, 10)
@@ -279,80 +281,8 @@ func (e Gen) genApiToFile(c *gin.Context, tab tools.SysTables) {
 
 }
 
-func (e Gen) ActionsGen(c *gin.Context, tab tools.SysTables) {
-	err := e.MakeContext(c).
-		MakeOrm().
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-
-	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 {
-		e.Logger.Error(err)
-		e.Error(500, err, "")
-		return
-	}
-	t3, err := template.ParseFiles(routerFile)
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, "")
-		return
-	}
-	t4, err := template.ParseFiles(basePath + "js.go.template")
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, "")
-		return
-	}
-	t5, err := template.ParseFiles(basePath + "vue.go.template")
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, "")
-		return
-	}
-	t6, err := template.ParseFiles(basePath + "dto.go.template")
-	if err != nil {
-		e.Logger.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.ModuleFrontName)
-
-	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.ModuleName+".go")
-	pkg.FileCreate(b3, "./app/"+tab.PackageName+"/router/"+tab.ModuleName+".go")
-	pkg.FileCreate(b4, config.GenConfig.FrontPath+"/api/"+tab.ModuleFrontName+".js")
-	pkg.FileCreate(b5, config.GenConfig.FrontPath+"/views/"+tab.ModuleFrontName+"/index.vue")
-	pkg.FileCreate(b6, "./app/"+tab.PackageName+"/service/dto/"+tab.ModuleName+".go")
-}
-
 func (e Gen) GenMenuAndApi(c *gin.Context) {
-	s:=service.SysMenu{}
+	s := service.SysMenu{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		MakeService(&s.Service).
@@ -365,16 +295,20 @@ func (e Gen) GenMenuAndApi(c *gin.Context) {
 
 	table := tools.SysTables{}
 	id, err := pkg.StringToInt(c.Param("tableId"))
-	pkg.HasError(err, "", -1)
-
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, fmt.Sprintf("tableId参数解析失败！错误详情：%s", err.Error()))
+		return
+	}
 
 	table.TableId = id
-	tab, _ := table.Get(e.Orm)
+	tab, _ := table.Get(e.Orm,true)
+	tab.MLTBName = strings.Replace(tab.TBName, "_", "-", -1)
 
-	Mmenu := dto.SysMenuControl{}
+	Mmenu := dto.SysMenuInsertReq{}
 	Mmenu.Title = tab.TableComment
 	Mmenu.Icon = "pass"
-	Mmenu.Path = "/" + strings.Replace(tab.TBName, "_", "-", -1)
+	Mmenu.Path = "/" + tab.MLTBName
 	Mmenu.MenuType = "M"
 	Mmenu.Action = "无"
 	Mmenu.ParentId = 0
@@ -386,17 +320,17 @@ func (e Gen) GenMenuAndApi(c *gin.Context) {
 	Mmenu.CreateBy = 1
 	s.Insert(&Mmenu)
 
-	Cmenu := dto.SysMenuControl{}
+	Cmenu := dto.SysMenuInsertReq{}
 	Cmenu.MenuName = tab.ClassName + "Manage"
 	Cmenu.Title = tab.TableComment
 	Cmenu.Icon = "pass"
-	Cmenu.Path = tab.TBName
+	Cmenu.Path = "/" + tab.PackageName + "/" + tab.MLTBName
 	Cmenu.MenuType = "C"
 	Cmenu.Action = "无"
-	Cmenu.Permission = tab.PackageName + ":" + tab.ModuleFrontName + ":list"
+	Cmenu.Permission = tab.PackageName + ":" + tab.BusinessName + ":list"
 	Cmenu.ParentId = Mmenu.MenuId
 	Cmenu.NoCache = false
-	Cmenu.Component = "/" + tab.ModuleFrontName + "/index"
+	Cmenu.Component = "/" + tab.PackageName + "/" + tab.MLTBName + "/index"
 	Cmenu.Sort = 0
 	Cmenu.Visible = "0"
 	Cmenu.IsFrame = "0"
@@ -404,14 +338,14 @@ func (e Gen) GenMenuAndApi(c *gin.Context) {
 	Cmenu.UpdateBy = 1
 	s.Insert(&Cmenu)
 
-	MList := dto.SysMenuControl{}
+	MList := dto.SysMenuInsertReq{}
 	MList.MenuName = ""
 	MList.Title = "分页获取" + tab.TableComment
 	MList.Icon = ""
 	MList.Path = tab.TBName
 	MList.MenuType = "F"
 	MList.Action = "无"
-	MList.Permission = tab.PackageName + ":" + tab.ModuleFrontName + ":query"
+	MList.Permission = tab.PackageName + ":" + tab.BusinessName + ":query"
 	MList.ParentId = Cmenu.MenuId
 	MList.NoCache = false
 	MList.Sort = 0
@@ -421,14 +355,14 @@ func (e Gen) GenMenuAndApi(c *gin.Context) {
 	MList.UpdateBy = 1
 	s.Insert(&MList)
 
-	MCreate := dto.SysMenuControl{}
+	MCreate := dto.SysMenuInsertReq{}
 	MCreate.MenuName = ""
 	MCreate.Title = "创建" + tab.TableComment
 	MCreate.Icon = ""
 	MCreate.Path = tab.TBName
 	MCreate.MenuType = "F"
 	MCreate.Action = "无"
-	MCreate.Permission = tab.PackageName + ":" + tab.ModuleFrontName + ":add"
+	MCreate.Permission = tab.PackageName + ":" + tab.BusinessName + ":add"
 	MCreate.ParentId = Cmenu.MenuId
 	MCreate.NoCache = false
 	MCreate.Sort = 0
@@ -438,14 +372,14 @@ func (e Gen) GenMenuAndApi(c *gin.Context) {
 	MCreate.UpdateBy = 1
 	s.Insert(&MCreate)
 
-	MUpdate := dto.SysMenuControl{}
+	MUpdate := dto.SysMenuInsertReq{}
 	MUpdate.MenuName = ""
 	MUpdate.Title = "修改" + tab.TableComment
 	MUpdate.Icon = ""
 	MUpdate.Path = tab.TBName
 	MUpdate.MenuType = "F"
 	MUpdate.Action = "无"
-	MUpdate.Permission = tab.PackageName + ":" + tab.ModuleFrontName + ":edit"
+	MUpdate.Permission = tab.PackageName + ":" + tab.BusinessName + ":edit"
 	MUpdate.ParentId = Cmenu.MenuId
 	MUpdate.NoCache = false
 	MUpdate.Sort = 0
@@ -455,14 +389,14 @@ func (e Gen) GenMenuAndApi(c *gin.Context) {
 	MUpdate.UpdateBy = 1
 	s.Insert(&MUpdate)
 
-	MDelete := dto.SysMenuControl{}
+	MDelete := dto.SysMenuInsertReq{}
 	MDelete.MenuName = ""
 	MDelete.Title = "删除" + tab.TableComment
 	MDelete.Icon = ""
 	MDelete.Path = tab.TBName
 	MDelete.MenuType = "F"
 	MDelete.Action = "无"
-	MDelete.Permission = tab.PackageName + ":" + tab.ModuleFrontName + ":remove"
+	MDelete.Permission = tab.PackageName + ":" + tab.BusinessName + ":remove"
 	MDelete.ParentId = Cmenu.MenuId
 	MDelete.NoCache = false
 	MDelete.Sort = 0
@@ -472,6 +406,5 @@ func (e Gen) GenMenuAndApi(c *gin.Context) {
 	MDelete.UpdateBy = 1
 	s.Insert(&MDelete)
 
-
 	e.OK("", "数据生成成功！")
 }

app/other/apis/tools/sys_tables.go

@@ -1,7 +1,6 @@
 package tools
 
 import (
-	"net/http"
 	"strings"
 
 	"github.com/gin-gonic/gin"
@@ -10,23 +9,23 @@ import (
 	_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
 	"gorm.io/gorm"
 
-	"go-admin/app/admin/models/tools"
+	"go-admin/app/other/models/tools"
 )
 
 type SysTable struct {
 	api.Api
 }
 
-// GetSysTableList 分页列表数据
+// GetPage 分页列表数据
 // @Summary 分页列表数据
 // @Description 生成表分页列表
-// @Tags 工具 - 生成表
+// @Tags 工具 / 生成工具
 // @Param tableName query string false "tableName / 数据表名称"
 // @Param pageSize query int false "pageSize / 页条数"
 // @Param pageIndex query int false "pageIndex / 页码"
 // @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
 // @Router /api/v1/sys/tables/page [get]
-func (e SysTable) GetSysTableList(c *gin.Context) {
+func (e SysTable) GetPage(c *gin.Context) {
 	e.Context = c
 	log := e.GetLogger()
 	var data tools.SysTables
@@ -45,7 +44,7 @@ func (e SysTable) GetSysTableList(c *gin.Context) {
 	db, err := e.GetOrm()
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
+		e.Error(500, err, "数据库连接获取失败")
 		return
 	}
 
@@ -60,26 +59,27 @@ func (e SysTable) GetSysTableList(c *gin.Context) {
 	e.PageOK(result, count, pageIndex, pageSize, "查询成功")
 }
 
+// Get
 // @Summary 获取配置
 // @Description 获取JSON
-// @Tags 工具 - 生成表
+// @Tags 工具 / 生成工具
 // @Param configKey path int true "configKey"
 // @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
 // @Router /api/v1/sys/tables/info/{tableId} [get]
 // @Security Bearer
-func (e SysTable) GetSysTables(c *gin.Context) {
+func (e SysTable) Get(c *gin.Context) {
 	e.Context = c
 	log := e.GetLogger()
 	db, err := e.GetOrm()
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
+		e.Error(500, err, "数据库连接获取失败")
 		return
 	}
 
 	var data tools.SysTables
 	data.TableId, _ = pkg.StringToInt(c.Param("tableId"))
-	result, err := data.Get(db)
+	result, err := data.Get(db,true)
 	if err != nil {
 		log.Errorf("Get error, %s", err.Error())
 		e.Error(500, err, "")
@@ -98,7 +98,7 @@ func (e SysTable) GetSysTablesInfo(c *gin.Context) {
 	db, err := e.GetOrm()
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
+		e.Error(500, err, "数据库连接获取失败")
 		return
 	}
 
@@ -106,7 +106,7 @@ func (e SysTable) GetSysTablesInfo(c *gin.Context) {
 	if c.Request.FormValue("tableName") != "" {
 		data.TBName = c.Request.FormValue("tableName")
 	}
-	result, err := data.Get(db)
+	result, err := data.Get(db,true)
 	if err != nil {
 		log.Errorf("Get error, %s", err.Error())
 		e.Error(500, err, "抱歉未找到相关信息")
@@ -127,7 +127,7 @@ func (e SysTable) GetSysTablesTree(c *gin.Context) {
 	db, err := e.GetOrm()
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
+		e.Error(500, err, "数据库连接获取失败")
 		return
 	}
 
@@ -142,9 +142,10 @@ func (e SysTable) GetSysTablesTree(c *gin.Context) {
 	e.OK(result, "")
 }
 
+// Insert
 // @Summary 添加表结构
 // @Description 添加表结构
-// @Tags 工具 - 生成表
+// @Tags 工具 / 生成工具
 // @Accept  application/json
 // @Product application/json
 // @Param tables query string false "tableName / 数据表名称"
@@ -152,13 +153,13 @@ func (e SysTable) GetSysTablesTree(c *gin.Context) {
 // @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
 // @Router /api/v1/sys/tables/info [post]
 // @Security Bearer
-func (e SysTable) InsertSysTable(c *gin.Context) {
+func (e SysTable) Insert(c *gin.Context) {
 	e.Context = c
 	log := e.GetLogger()
 	db, err := e.GetOrm()
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
+		e.Error(500, err, "数据库连接获取失败")
 		return
 	}
 
@@ -201,15 +202,23 @@ func genTableInit(tx *gorm.DB, tablesList []string, i int, c *gin.Context) (tool
 	for i := 0; i < len(tablenamelist); i++ {
 		strStart := string([]byte(tablenamelist[i])[:1])
 		strend := string([]byte(tablenamelist[i])[1:])
+		// 大驼峰表名 结构体使用
 		data.ClassName += strings.ToUpper(strStart) + strend
+		// 小驼峰表名 js函数名和权限标识使用
+		if i == 0 {
+			data.BusinessName += strings.ToLower(strStart) + strend
+		} else {
+			data.BusinessName += strings.ToUpper(strStart) + strend
+		}
 		//data.PackageName += strings.ToLower(strStart) + strings.ToLower(strend)
-		data.ModuleName += strings.ToLower(strStart) + strings.ToLower(strend)
+		//data.ModuleName += strings.ToLower(strStart) + strings.ToLower(strend)
 	}
-	data.ModuleFrontName = strings.ReplaceAll(data.ModuleName, "_", "-")
+	//data.ModuleFrontName = strings.ReplaceAll(data.ModuleName, "_", "-")
 	data.PackageName = "admin"
 	data.TplCategory = "crud"
 	data.Crud = true
-
+	// 中横线表名称，接口路径、前端文件夹名称和js名称使用
+	data.ModuleName = strings.Replace(data.TBName, "_", "-", -1)
 	dbcolumn, err := dbColumn.GetList(tx)
 	data.CreateBy = 0
 	data.TableComment = dbtable.TableComment
@@ -218,11 +227,11 @@ func genTableInit(tx *gorm.DB, tablesList []string, i int, c *gin.Context) (tool
 	}
 
 	data.FunctionName = data.TableComment
-	data.BusinessName = data.ModuleName
+	//data.BusinessName = data.ModuleName
 	data.IsLogicalDelete = "1"
 	data.LogicalDelete = true
 	data.LogicalDeleteColumn = "is_del"
-	data.IsActions = 1
+	data.IsActions = 2
 	data.IsDataScope = 1
 	data.IsAuth = 1
 
@@ -287,9 +296,10 @@ func genTableInit(tx *gorm.DB, tablesList []string, i int, c *gin.Context) (tool
 	return data, err
 }
 
+// Update
 // @Summary 修改表结构
 // @Description 修改表结构
-// @Tags 工具 - 生成表
+// @Tags 工具 / 生成工具
 // @Accept  application/json
 // @Product application/json
 // @Param data body tools.SysTables true "body"
@@ -297,7 +307,7 @@ func genTableInit(tx *gorm.DB, tablesList []string, i int, c *gin.Context) (tool
 // @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
 // @Router /api/v1/sys/tables/info [put]
 // @Security Bearer
-func (e SysTable) UpdateSysTable(c *gin.Context) {
+func (e SysTable) Update(c *gin.Context) {
 	var data tools.SysTables
 	err := c.Bind(&data)
 	pkg.HasError(err, "数据解析失败", 500)
@@ -307,7 +317,7 @@ func (e SysTable) UpdateSysTable(c *gin.Context) {
 	db, err := e.GetOrm()
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
+		e.Error(500, err, "数据库连接获取失败")
 		return
 	}
 
@@ -321,20 +331,21 @@ func (e SysTable) UpdateSysTable(c *gin.Context) {
 	e.OK(result, "修改成功")
 }
 
+// Delete
 // @Summary 删除表结构
 // @Description 删除表结构
-// @Tags 工具 - 生成表
+// @Tags 工具 / 生成工具
 // @Param tableId path int true "tableId"
 // @Success 200 {string} string	"{"code": 200, "message": "删除成功"}"
 // @Success 200 {string} string	"{"code": -1, "message": "删除失败"}"
 // @Router /api/v1/sys/tables/info/{tableId} [delete]
-func (e SysTable) DeleteSysTables(c *gin.Context) {
+func (e SysTable) Delete(c *gin.Context) {
 	e.Context = c
 	log := e.GetLogger()
 	db, err := e.GetOrm()
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
+		e.Error(500, err, "数据库连接获取失败")
 		return
 	}
 

app/other/models/sys_china_area_data.go

@@ -1,26 +0,0 @@
-package models
-
-import (
-	"go-admin/common/models"
-)
-
-type SysChinaAreaData struct {
-	models.Model
-	PId  string `json:"p_id" gorm:"size:11;comment:上级编码"`
-	Name string `json:"name" gorm:"size: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
-}

app/other/models/sys_file_dir.go

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

app/other/models/sys_file_info.go

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

app/other/models/tools/sys_columns.go

@@ -51,12 +51,20 @@ func (SysColumns) TableName() string {
 	return "sys_columns"
 }
 
-func (e *SysColumns) GetList(tx *gorm.DB) ([]SysColumns, error) {
+func (e *SysColumns) GetList(tx *gorm.DB, exclude bool) ([]SysColumns, error) {
 	var doc []SysColumns
-
 	table := tx.Table("sys_columns")
-
-	table = table.Where("table_id = ?", e.TableId)
+	table = table.Where("table_id = ? ", e.TableId)
+	if exclude {
+		notIn := make([]string, 0, 6)
+		notIn = append(notIn, "id")
+		notIn = append(notIn, "create_by")
+		notIn = append(notIn, "update_by")
+		notIn = append(notIn, "created_at")
+		notIn = append(notIn, "updated_at")
+		notIn = append(notIn, "deleted_at")
+		table = table.Where(" column_name not in(?)", notIn)
+	}
 
 	if err := table.Find(&doc).Error; err != nil {
 		return nil, err

app/other/models/tools/sys_tables.go

@@ -12,6 +12,7 @@ import (
 type SysTables struct {
 	TableId             int    `gorm:"primaryKey;autoIncrement" json:"tableId"`        //表编码
 	TBName              string `gorm:"column:table_name;size:255;" json:"tableName"`   //表名称
+	MLTBName            string `gorm:"-" json:"-"`                                     //表名称
 	TableComment        string `gorm:"size:255;" json:"tableComment"`                  //表备注
 	ClassName           string `gorm:"size:255;" json:"className"`                     //类名
 	TplCategory         string `gorm:"size:255;" json:"tplCategory"`                   //
@@ -77,7 +78,7 @@ func (e *SysTables) GetPage(tx *gorm.DB, pageSize int, pageIndex int) ([]SysTabl
 	return doc, int(count), nil
 }
 
-func (e *SysTables) Get(tx *gorm.DB) (SysTables, error) {
+func (e *SysTables) Get(tx *gorm.DB, exclude bool) (SysTables, error) {
 	var doc SysTables
 	var err error
 	table := tx.Table("sys_tables")
@@ -97,7 +98,7 @@ func (e *SysTables) Get(tx *gorm.DB) (SysTables, error) {
 	}
 	var col SysColumns
 	col.TableId = doc.TableId
-	if doc.Columns, err = col.GetList(tx); err != nil {
+	if doc.Columns, err = col.GetList(tx, exclude); err != nil {
 		return doc, err
 	}
 
@@ -126,7 +127,7 @@ func (e *SysTables) GetTree(tx *gorm.DB) ([]SysTables, error) {
 		var col SysColumns
 		//col.FkCol = append(col.FkCol, SysColumns{ColumnId: 0, ColumnName: "请选择"})
 		col.TableId = doc[i].TableId
-		if doc[i].Columns, err = col.GetList(tx); err != nil {
+		if doc[i].Columns, err = col.GetList(tx, false); err != nil {
 			return doc, err
 		}
 
@@ -188,16 +189,17 @@ func (e *SysTables) Update(tx *gorm.DB) (update SysTables, err error) {
 			t, ok := tableMap[e.Columns[i].FkTableName]
 			if ok {
 				e.Columns[i].FkTableNameClass = t.ClassName
-				e.Columns[i].FkTableNamePackage = t.ModuleName
+				t.MLTBName = strings.Replace(t.TBName, "_", "-", -1)
+				e.Columns[i].FkTableNamePackage = t.MLTBName
 			} else {
 				tableNameList := strings.Split(e.Columns[i].FkTableName, "_")
 				e.Columns[i].FkTableNameClass = ""
-				e.Columns[i].FkTableNamePackage = ""
+				//e.Columns[i].FkTableNamePackage = ""
 				for a := 0; a < len(tableNameList); a++ {
 					strStart := string([]byte(tableNameList[a])[:1])
 					strEnd := string([]byte(tableNameList[a])[1:])
 					e.Columns[i].FkTableNameClass += strings.ToUpper(strStart) + strEnd
-					e.Columns[i].FkTableNamePackage += strings.ToLower(strStart) + strings.ToLower(strEnd)
+					//e.Columns[i].FkTableNamePackage += strings.ToLower(strStart) + strings.ToLower(strEnd)
 				}
 			}
 		}

app/other/router/file.go

@@ -2,15 +2,19 @@ package router
 
 import (
 	"github.com/gin-gonic/gin"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
 	"go-admin/app/other/apis"
 )
 
 func init() {
-	routerNoCheckRole = append(routerNoCheckRole, registerFileRouter)
+	routerCheckRole = append(routerCheckRole, registerFileRouter)
 }
 
 // 需认证的路由代码
-func registerFileRouter(v1 *gin.RouterGroup) {
+func registerFileRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
 	var api = apis.File{}
-	v1.POST("/public/uploadFile", api.UploadFile)
+	r := v1.Group("").Use(authMiddleware.MiddlewareFunc())
+	{
+		r.POST("/public/uploadFile", api.UploadFile)
+	}
 }

app/other/router/gen_router.go

@@ -4,7 +4,7 @@ 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/app/admin/apis/tools"
+	"go-admin/app/other/apis/tools"
 )
 
 func init() {
@@ -15,7 +15,7 @@ func sysNoCheckRoleRouter(v1 *gin.RouterGroup ,authMiddleware *jwt.GinJWTMiddlew
 	r1 := v1.Group("")
 	{
 		sys := apis.System{}
-		r1.GET("/getCaptcha", sys.GenerateCaptchaHandler)
+		r1.GET("/captcha", sys.GenerateCaptchaHandler)
 	}
 
 	r := v1.Group("").Use(authMiddleware.MiddlewareFunc())
@@ -43,13 +43,13 @@ func registerSysTableRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddl
 	tables := v1.Group("/sys/tables")
 	{
 		sysTable := tools.SysTable{}
-		tables.Group("").Use(authMiddleware.MiddlewareFunc()).GET("/page", sysTable.GetSysTableList)
+		tables.Group("").Use(authMiddleware.MiddlewareFunc()).GET("/page", sysTable.GetPage)
 		tablesInfo := tables.Group("/info").Use(authMiddleware.MiddlewareFunc())
 		{
-			tablesInfo.POST("", sysTable.InsertSysTable)
-			tablesInfo.PUT("", sysTable.UpdateSysTable)
-			tablesInfo.DELETE("/:tableId", sysTable.DeleteSysTables)
-			tablesInfo.GET("/:tableId", sysTable.GetSysTables)
+			tablesInfo.POST("", sysTable.Insert)
+			tablesInfo.PUT("", sysTable.Update)
+			tablesInfo.DELETE("/:tableId", sysTable.Delete)
+			tablesInfo.GET("/:tableId", sysTable.Get)
 			tablesInfo.GET("", sysTable.GetSysTablesInfo)
 		}
 	}

app/other/router/monitor.go

@@ -1,7 +1,6 @@
 package router
 
 import (
-	"github.com/go-admin-team/go-admin-core/sdk/config"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
@@ -15,11 +14,10 @@ func init() {
 
 // 需认证的路由代码
 func registerMonitorRouter(v1 *gin.RouterGroup) {
-	if config.ApplicationConfig.Mode == "dev" {
-		v1.GET("/metrics", transfer.Handler(promhttp.Handler()))
-		//健康检查
-		v1.GET("/health", func(c *gin.Context) {
-			c.Status(http.StatusOK)
-		})
-	}
-}
+	v1.GET("/metrics", transfer.Handler(promhttp.Handler()))
+	//健康检查
+	v1.GET("/health", func(c *gin.Context) {
+		c.Status(http.StatusOK)
+	})
+
+}

app/other/router/sys_china_area_data.go

@@ -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/other/apis"
-	"go-admin/common/middleware"
-)
-
-func init() {
-	routerCheckRole = append(routerCheckRole, registerSysChinaAreaDataRouter)
-}
-
-// 需认证的路由代码
-func registerSysChinaAreaDataRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
-	api := apis.SysChinaAreaData{}
-	r := v1.Group("/sys-area-data").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
-	{
-		r.GET("", api.GetPage)
-		r.GET("/:id", api.Get)
-		r.POST("", api.Insert)
-		r.PUT("/:id", api.Update)
-		r.DELETE("", api.Delete)
-	}
-}

app/other/router/sys_file_dir.go

@@ -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/other/apis"
-	"go-admin/common/middleware"
-)
-
-func init() {
-	routerCheckRole = append(routerCheckRole, registerSysFileDirRouter)
-}
-
-// 需认证的路由代码
-func registerSysFileDirRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
-	api := apis.SysFileDir{}
-	r := v1.Group("/file-dir").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
-	{
-		r.GET("", api.GetPage)
-		r.GET("/:id", api.Get)
-		r.POST("", api.Insert)
-		r.PUT("/:id", api.Update)
-		r.DELETE("/:id", api.Delete)
-	}
-}

app/other/router/sys_file_info.go

@@ -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/other/apis"
-	"go-admin/common/middleware"
-)
-
-func init() {
-	routerCheckRole = append(routerCheckRole, registerSysFileInfoRouter)
-}
-
-// 需认证的路由代码
-func registerSysFileInfoRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
-	api := apis.SysFileInfo{}
-	r := v1.Group("/file-info").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
-	{
-		r.GET("", api.GetPage)
-		r.GET("/:id", api.Get)
-		r.POST("", api.Insert)
-		r.PUT("/:id", api.Update)
-		r.DELETE("/:id", api.Delete)
-	}
-}

app/other/service/dto/sys_china_area_data.go

@@ -1,97 +0,0 @@
-package dto
-
-import (
-	models2 "go-admin/app/other/models"
-	"time"
-
-	"github.com/gin-gonic/gin"
-	"github.com/go-admin-team/go-admin-core/sdk/api"
-
-	"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() (*models2.SysChinaAreaData, error) {
-	return &models2.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) {
-
-}

app/other/service/dto/sys_file_dir.go

@@ -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/other/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
-}

app/other/service/dto/sys_file_info.go

@@ -1,52 +0,0 @@
-package dto
-
-import (
-	"go-admin/app/other/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:"-"`
-}

app/other/service/sys_china_area_data.go

@@ -1,110 +0,0 @@
-package service
-
-import (
-	"errors"
-	"go-admin/app/other/models"
-	"go-admin/app/other/service/dto"
-	common "go-admin/common/models"
-
-	"github.com/go-admin-team/go-admin-core/sdk/service"
-	"gorm.io/gorm"
-
-	"go-admin/common/actions"
-	cDto "go-admin/common/dto"
-)
-
-type SysChinaAreaData struct {
-	service.Service
-}
-
-// GetPage 获取SysChinaAreaData列表
-func (e *SysChinaAreaData) GetPage(c *dto.SysChinaAreaDataSearch, p *actions.DataPermission, list *[]models.SysChinaAreaData, count *int64) error {
-	var data models.SysChinaAreaData
-
-	err := e.Orm.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 GetSysChinaAreaDataPage error:%s", err)
-		return err
-	}
-	return nil
-}
-
-// Get 获取SysChinaAreaData对象
-func (e *SysChinaAreaData) Get(d *dto.SysChinaAreaDataById, p *actions.DataPermission, model *models.SysChinaAreaData) error {
-	var data models.SysChinaAreaData
-
-	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("db error:%s", err)
-		return err
-	}
-	if err != nil {
-		e.Log.Errorf("Service GetSysChinaAreaData error:%s", err)
-		return err
-	}
-	return nil
-}
-
-// Insert 创建SysChinaAreaData对象
-func (e *SysChinaAreaData) Insert(model *models.SysChinaAreaData) error {
-	var data models.SysChinaAreaData
-
-	err := e.Orm.Model(&data).
-		Create(model).Error
-	if err != nil {
-		e.Log.Errorf("Service InsertSysChinaAreaData error:%s", err)
-		return err
-	}
-	return nil
-}
-
-// Update 修改SysChinaAreaData对象
-func (e *SysChinaAreaData) Update(c *models.SysChinaAreaData, p *actions.DataPermission) error {
-	db := e.Orm.Model(&models.SysChinaAreaData{
-		Model: common.Model{
-			Id: c.GetId().(int),
-		}}).
-		Scopes(
-			actions.Permission(c.TableName(), p),
-		).Updates(c)
-	if err := db.Error; err != nil {
-		e.Log.Errorf("Service UpdateSysChinaAreaData error: %s", err)
-		return err
-	}
-	if db.RowsAffected == 0 {
-		return errors.New("无权更新该数据")
-	}
-	return nil
-}
-
-// Remove 删除SysChinaAreaData
-func (e *SysChinaAreaData) Remove(d *dto.SysChinaAreaDataById, p *actions.DataPermission) error {
-
-	var data models.SysChinaAreaData
-
-	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 RemoveSysChinaAreaData error: %s", err)
-		return err
-	}
-	if db.RowsAffected == 0 {
-		return errors.New("无权删除该数据")
-	}
-	return nil
-}

app/other/service/sys_file_dir.go

@@ -1,169 +0,0 @@
-package service
-
-import (
-	"errors"
-	"fmt"
-	common "go-admin/common/models"
-
-	"github.com/go-admin-team/go-admin-core/sdk/service"
-	"gorm.io/gorm"
-
-	"go-admin/app/other/models"
-	"go-admin/app/other/service/dto"
-	"go-admin/common/actions"
-	cDto "go-admin/common/dto"
-)
-
-type SysFileDir struct {
-	service.Service
-}
-
-// GetSysFileDirPage 获取SysFileDir列表
-func (e *SysFileDir) GetSysFileDirPage(c *dto.SysFileDirSearch, list *[]models.SysFileDir) error {
-	var err error
-	var data models.SysFileDir
-
-	err = e.Orm.Model(&data).
-		Scopes(
-			cDto.MakeCondition(c.GetNeedSearch()),
-		).
-		Find(list). //Limit(-1).Offset(-1).
-		Error
-	if err != nil {
-		e.Log.Errorf("db error: %s", err)
-		return err
-	}
-	return nil
-}
-
-// GetSysFileDir 获取SysFileDir对象
-func (e *SysFileDir) GetSysFileDir(d cDto.Control, model *models.SysFileDir) error {
-	var err error
-	var data models.SysFileDir
-
-	db := e.Orm.Model(&data).
-		First(model, d.GetId())
-	err = db.Error
-	if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
-		err = errors.New("查看对象不存在或无权查看")
-		e.Log.Errorf("db error: %s", err)
-		return err
-	}
-	if db.Error != nil {
-		e.Log.Errorf("db error:%s", err)
-		return err
-	}
-	return nil
-}
-
-// InsertSysFileDir 创建SysFileDir对象
-func (e *SysFileDir) InsertSysFileDir(model *dto.SysFileDirControl) error {
-	var err error
-	data, _ := model.GenerateM()
-
-	err = e.Orm.Create(data).Error
-	if err != nil {
-		e.Log.Errorf("db error: %s", err)
-		return err
-	}
-	path := fmt.Sprintf("/%d", model.Id)
-	//db = e.Orm.Model(&data).
-	//	First(&data, model.GetId())
-	//err = db.Error
-
-	if model.PId != 0 {
-		var dept models.SysFileDir
-		e.Orm.Model(&models.SysFileDir{}).Where("id = ?", model.PId).First(&dept)
-		path = dept.Path + path
-	} else {
-		path = "/0" + path
-	}
-	//var mp = map[string]string{}
-	//mp["path"] = path
-	if err = e.Orm.Model(&models.SysFileDir{}).Where("id = ?", model.Id).Update("path", path).Error; err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// UpdateSysFileDir 修改SysFileDir对象
-func (e *SysFileDir) Update(c *dto.SysFileDirControl, p *actions.DataPermission) error {
-	var err error
-	data, _ := c.GenerateM()
-
-	db := e.Orm.Model(&models.SysFileDir{Model: common.Model{Id: c.GetId().(int)}}).
-		Scopes(
-			actions.Permission(data.TableName(), p),
-		).Updates(data)
-	if db.Error != nil {
-		e.Log.Errorf("db error: %s", err)
-		return err
-	}
-	if db.RowsAffected == 0 {
-		return errors.New("无权更新该数据")
-	}
-	return nil
-}
-
-// RemoveSysFileDir 删除SysFileDir
-func (e *SysFileDir) RemoveSysFileDir(d *dto.SysFileDirById, p *actions.DataPermission) error {
-	var err error
-	var data models.SysFileDir
-
-	db := e.Orm.Model(&data).
-		Scopes(
-			actions.Permission(data.TableName(), p),
-		).Delete(&data, d.Id)
-	if db.Error != nil {
-		err = db.Error
-		e.Log.Errorf("Delete error: %s", err)
-		return err
-	}
-	if db.RowsAffected == 0 {
-		err = errors.New("无权删除该数据")
-		return err
-	}
-	return nil
-}
-
-func (e *SysFileDir) SetSysFileDir(c *dto.SysFileDirSearch) (*[]models.SysFileDir, error) {
-	var list []models.SysFileDir
-	err := e.GetSysFileDirPage(c, &list)
-	m := make([]models.SysFileDir, 0)
-	for i := 0; i < len(list); i++ {
-		if list[i].PId != 0 {
-			continue
-		}
-		info := SysFileDirCall(&list, list[i])
-		m = append(m, info)
-	}
-	return &m, err
-}
-
-func SysFileDirCall(list *[]models.SysFileDir, m models.SysFileDir) models.SysFileDir {
-	listGroup := *list
-	min := make([]models.SysFileDir, 0)
-	for j := 0; j < len(listGroup); j++ {
-		if m.Id != listGroup[j].PId {
-			continue
-		}
-		mi := models.SysFileDir{}
-		mi.Id = listGroup[j].Id
-		mi.PId = listGroup[j].PId
-		mi.Label = listGroup[j].Label
-		//mi.Sort = listGroup[j].Sort
-		mi.CreatedAt = listGroup[j].CreatedAt
-		mi.UpdatedAt = listGroup[j].UpdatedAt
-		mi.Children = []models.SysFileDir{}
-		ms := SysFileDirCall(list, mi)
-		min = append(min, ms)
-	}
-	if len(min) > 0 {
-		m.Children = min
-	} else {
-		m.Children = nil
-	}
-
-	return m
-}