docs📝 update

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +0,0 @@
-blank_issues_enabled: true
-contact_links:
-  - name: 🆕 Create new issue
-    url: http://new-issue.go-admin.dev
-    about: The issue which is not created via http://new-issue.go-admin.dev will be closed immediately.
-  - name: 🆕 创建一个新 Issue
-    url: http://new-issue.go-admin.dev
-    about: 不是用 http://new-issue.go-admin.dev 创建的 issue 会被机器人自动关闭。

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,66 +0,0 @@
-<!--
-First of all, thank you for your contribution! 😄
-
-For requesting to pull a new feature or bugfix, please send it from a feature/bugfix branch based on the `master` branch.
-
-Before submitting your pull request, please make sure the checklist below is confirmed.
-
-Your pull requests will be merged after one of the collaborators approve.
-
-Thank you!
-
--->
-
-[[中文版模板 / Chinese template](https://github.com/go-admin-team/go-admin/blob/master/.github/PULL_REQUEST_TEMPLATE/pr_cn.md)]
-
-### 🤔 This is a ...
-
-- [ ] New feature
-- [ ] Bug fix
-- [ ] Site / documentation update
-- [ ] Demo update
-- [ ] Component style update
-- [ ] TypeScript definition update
-- [ ] Bundle size optimization
-- [ ] Performance optimization
-- [ ] Enhancement feature
-- [ ] Internationalization
-- [ ] Refactoring
-- [ ] Code style optimization
-- [ ] Test Case
-- [ ] Branch merge
-- [ ] Other (about what?)
-
-### 🔗 Related issue link
-
-<!--
-1. Put the related issue or discussion links here.
--->
-
-### 💡 Background and solution
-
-<!--
-1. Describe the problem and the scenario.
-2. GIF or snapshot should be provided if includes UI/interactive modification.
-3. How to fix the problem, and list the final API implementation and usage sample if that is a new feature.
--->
-
-### 📝 Changelog
-
-<!--
-Describe changes from the user side, and list all potential break changes or other risks.
---->
-
-| Language   | Changelog |
-| ---------- | --------- |
-| 🇺🇸 English |           |
-| 🇨🇳 Chinese |           |
-
-### ☑️ Self-Check before Merge
-
-⚠️ Please check all items below before review. ⚠️
-
-- [ ] Doc is updated/provided or not needed
-- [ ] Demo is updated/provided or not needed
-- [ ] TypeScript's definition is updated/provided or not needed
-- [ ] Changelog is provided or not needed

.github/PULL_REQUEST_TEMPLATE/pr_cn.md

@@ -1,61 +0,0 @@
-<!--
-首先，感谢你的贡献！😄
-
-新特性请提交至 feature 分支，其余可提交至 master 分支。
-在维护者审核通过后会合并。
-请确保填写以下 pull request 的信息，谢谢！~
--->
-
-[[English Template / 英文模板](https://github.com/go-admin-team/go-admin/blob/master/.github/PULL_REQUEST_TEMPLATE.md)]
-
-### 🤔 这个变动的性质是？
-
-- [ ] 新特性提交
-- [ ] 日常 bug 修复
-- [ ] 站点、文档改进
-- [ ] 演示代码改进
-- [ ] 组件样式/交互改进
-- [ ] TypeScript 定义更新
-- [ ] 包体积优化
-- [ ] 性能优化
-- [ ] 功能增强
-- [ ] 国际化改进
-- [ ] 重构
-- [ ] 代码风格优化
-- [ ] 测试用例
-- [ ] 分支合并
-- [ ] 其他改动（是关于什么的改动？）
-
-### 🔗 相关 Issue
-
-<!--
-1. 描述相关需求的来源，如相关的 issue 讨论链接。
--->
-
-### 💡 需求背景和解决方案
-
-<!--
-1. 要解决的具体问题。
-2. 列出最终的 API 实现和用法。
-3. 涉及UI/交互变动需要有截图或 GIF。
--->
-
-### 📝 更新日志
-
-<!--
-从用户角度描述具体变化，以及可能的 breaking change 和其他风险。
--->
-
-| 语言    | 更新描述 |
-| ------- | -------- |
-| 🇺🇸 英文 |          |
-| 🇨🇳 中文 |          |
-
-### ☑️ 请求合并前的自查清单
-
-⚠️ 请自检并全部**勾选全部选项**。⚠️
-
-- [ ] 文档已补充或无须补充
-- [ ] 代码演示已提供或无须提供
-- [ ] TypeScript 定义已补充或无须补充
-- [ ] Changelog 已提供或无须提供

.github/workflows/build.yml

@@ -1,57 +0,0 @@
-name: Build
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-env:
-  IMAGE_NAME: registry.ap-northeast-1.aliyuncs.com/go-admin/go-admin-api # 镜像名称
-  TAG: ${{ github.sha }}
-  IMAGE_NAME_TAG: registry.ap-northeast-1.aliyuncs.com/go-admin/go-admin-api:${{ github.sha }}
-
-jobs:
-
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Set up Go
-        uses: actions/setup-go@v3
-        with:
-          go-version: 1.18
-
-      - name: Tidy
-        run: go mod tidy
-
-      - name: Build
-        run: env CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -tags "sqlite3,json1" --ldflags "-extldflags -static" -o main .
-
-      - name: Build the Docker image and push
-        run: |
-          docker login --username=${{ secrets.DOCKER_USERNAME }} registry.ap-northeast-1.aliyuncs.com --password=${{ secrets.DOCKER_PASSWORD }}
-          echo "************ docker login end"
-          docker build -t go-admin-api:latest .
-          echo "************ docker build end"
-          docker tag go-admin-api ${{ env.IMAGE_NAME_TAG }}
-          echo "************ docker tag end"
-          docker images
-          echo "************ docker images end"
-          docker push ${{ env.IMAGE_NAME_TAG }}  # 推送
-          echo "************ docker push end"
-
-      - name: Restart server   # 第五步，重启服务
-        uses: appleboy/ssh-action@master
-        env:
-          GITHUB_SHA_X: ${GITHUB_SHA}
-        with:
-          host: ${{ secrets.SSH_HOST }}  # 下面三个配置与上一步类似
-          username: ${{ secrets.SSH_USERNAME }}
-          key: ${{ secrets.DEPLOY_KEY }}
-          # 重启的脚本，根据自身情况做相应改动，一般要做的是migrate数据库以及重启服务器
-          script: |
-            sudo docker rm -f go-admin-api
-            sudo docker login --username=${{ secrets.DOCKER_USERNAME }} registry.ap-northeast-1.aliyuncs.com --password=${{ secrets.DOCKER_PASSWORD }}
-            sudo docker run -d -p 8000:8000 --name go-admin-api ${{ env.IMAGE_NAME_TAG }}

.github/workflows/dev-lwx.yml

@@ -0,0 +1,60 @@
+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,12 +2,9 @@ name: build
 
 on:
   push:
-    branches: [ master, dev ]
+    branches: [ master ]
   pull_request:
     branches: [ master ]
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
 
 jobs:
 
@@ -16,47 +13,22 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - name: Set up Go 1.18
-      uses: actions/setup-go@v3
+    - name: Set up Go 1.14
+      uses: actions/setup-go@v1
       with:
-        go-version: 1.18
+        go-version: 1.14
       id: go
 
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
 
     - name: Get dependencies
-      run: go mod tidy
+      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: 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 }}
+      run: go build -v .

.github/workflows/issue-check-inactive.yml

@@ -1,22 +0,0 @@
-name: Issue Check Inactive
-
-on:
-  schedule:
-    - cron: "0 0 */15 * *"
-
-permissions:
-  contents: read
-
-jobs:
-  issue-check-inactive:
-    permissions:
-      issues: write  # for actions-cool/issues-helper to update issues
-      pull-requests: write  # for actions-cool/issues-helper to update PRs
-    runs-on: ubuntu-latest
-    steps:
-      - name: check-inactive
-        uses: actions-cool/issues-helper@v3
-        with:
-          actions: 'check-inactive'
-          inactive-label: 'Inactive'
-          inactive-day: 30

.github/workflows/issue-close-require.yml

@@ -1,32 +0,0 @@
-name: Issue Close Require
-
-on:
-  schedule:
-    - cron: "0 0 * * *"
-
-permissions:
-  contents: read
-
-jobs:
-  issue-close-require:
-    permissions:
-      issues: write  # for actions-cool/issues-helper to update issues
-      pull-requests: write  # for actions-cool/issues-helper to update PRs
-    runs-on: ubuntu-latest
-    steps:
-      - name: need reproduce
-        uses: actions-cool/issues-helper@v3
-        with:
-          actions: 'close-issues'
-          labels: '🤔 Need Reproduce'
-          inactive-day: 3
-
-      - name: needs more info
-        uses: actions-cool/issues-helper@v3
-        with:
-          actions: 'close-issues'
-          labels: 'needs-more-info'
-          inactive-day: 3
-          body: |
-            Since the issue was labeled with `needs-more-info`, but no response in 3 days. This issue will be closed. If you have any questions, you can comment and reply.
-            由于该 issue 被标记为需要更多信息，却 3 天未收到回应。现关闭 issue，若有任何问题，可评论回复。

.github/workflows/issue-labeled.yml

@@ -1,76 +0,0 @@
-# Origin Source
-# https://github.com/ant-design/ant-design/blob/79f566b7f8abb1012ef55b0d2793bfdf5595b85d/.github/workflows/issue-reply.yml
-name: Issue Labeled
-
-on:
-  issues:
-    types: [labeled]
-
-permissions:
-  contents: read
-
-jobs:
-  issue-labeled:
-    permissions:
-      issues: write  # for actions-cool/issues-helper to update issues
-      pull-requests: write  # for actions-cool/issues-helper to update PRs
-    runs-on: ubuntu-latest
-    steps:
-      - name: help wanted
-        if: github.event.label.name == 'help wanted'
-        uses: actions-cool/issues-helper@v3
-        with:
-          actions: 'create-comment'
-          token: ${{ secrets.ADMIN_TOKEN }}
-          issue-number: ${{ github.event.issue.number }}
-          body: |
-            Hello @${{ github.event.issue.user.login }}. We totally like your proposal/feedback, welcome to [send us a Pull Request](https://help.github.com/en/articles/creating-a-pull-request) for it. Please send your Pull Request to proper branch (feature branch for the new feature, master for bugfix and other changes), fill the [Pull Request Template](https://github.com/go-admin-team/go-admin/blob/master/.github/PULL_REQUEST_TEMPLATE.md) here, provide changelog/TypeScript/documentation/test cases if needed and make sure CI passed, we will review it soon. We appreciate your effort in advance and looking forward to your contribution!
-            你好 @${{ github.event.issue.user.login }}，我们完全同意你的提议/反馈，欢迎直接在此仓库 [创建一个 Pull Request](https://help.github.com/en/articles/creating-a-pull-request) 来解决这个问题。请将 Pull Request 发到正确的分支（新特性发到 feature 分支，其他发到 master 分支），务必填写 Pull Request 内的[预设模板](https://github.com/go-admin-team/go-admin/blob/master/.github/PULL_REQUEST_TEMPLATE.md)，提供改动所需相应的 changelog、TypeScript 定义、测试用例、文档等，并确保 CI 通过，我们会尽快进行 Review，提前感谢和期待您的贡献。
-            ![giphy](https://user-images.githubusercontent.com/507615/62342668-4735dc00-b51a-11e9-92a7-d46fbb1cc0c7.gif)
-      - name: 🤔 Need Reproduce
-        if: github.event.label.name == '🤔 Need Reproduce'
-        uses: actions-cool/issues-helper@v3
-        with:
-          actions: 'create-comment'
-          token: ${{ secrets.ADMIN_TOKEN }}
-          issue-number: ${{ github.event.issue.number }}
-          body: |
-            Hello @${{ github.event.issue.user.login }}. Please provide a online reproduction by forking this link https://u.ant.design/codesandbox-repro or a minimal GitHub repository. Issues labeled by `Need Reproduce` will be closed if no activities in 3 days.
-            你好 @${{ github.event.issue.user.login }}, 我们需要你提供一个在线的重现实例以便于我们帮你排查问题。你可以通过点击 [此处](https://u.ant.design/codesandbox-repro) 创建一个 codesandbox 或者提供一个最小化的 GitHub 仓库。3 天内未跟进此 issue 将会被自动关闭。
-            ![](https://gw.alipayobjects.com/zos/antfincdn/y9kwg7DVCd/reproduce.gif)
-      - name: Usage
-        if: github.event.label.name == 'Usage' || github.event.label.name == 'Question'
-        uses: actions-cool/issues-helper@v3
-        with:
-          actions: 'create-comment,close-issue'
-          token: ${{ secrets.ADMIN_TOKEN }}
-          issue-number: ${{ github.event.issue.number }}
-          body: |
-            Hello @${{ github.event.issue.user.login }}, we use GitHub issues to trace bugs or discuss plans of Ant Design. So, please [don't ask usage questions](https://github.com/ant-design/ant-design/issues/2320) here. You can try to open a new discussion in [antd discussions](https://github.com/ant-design/ant-design/discussions), select `Q&A` to ask questions, also can ask questions on [Stack Overflow](https://stackoverflow.com/questions/tagged/antd) or [Segment Fault](https://segmentfault.com/t/antd), then apply tag `antd` and `react` to your question.
-            你好 @${{ github.event.issue.user.login }}，go-admin Issue 板块是用于 bug 反馈与需求讨论的地方。请[勿询问如何使用的问题](https://github.com/go-admin-te/ant-design/issues/699)，你可以试着在 [antd discussions](https://github.com/ant-design/ant-design/discussions) 新开一个 discussion，选择 `Q&A` 类别进行提问，也可以在 [Stack Overflow](https://stackoverflow.com/questions/tagged/antd) 或者 [Segment Fault](https://segmentfault.com/t/antd) 中提问（记得添加 `antd` 和 `react` 标签哦~）。
-      - name: 3.x
-        if: github.event.label.name == '3.x'
-        uses: actions-cool/issues-helper@v3
-        with:
-          actions: 'create-comment,close-issue'
-          token: ${{ secrets.ADMIN_TOKEN }}
-          issue-number: ${{ github.event.issue.number }}
-          body: |
-            Hi @${{ github.event.issue.user.login }}. Current version (3.x) is off the maintenance period. We may not accept pull request or fix bug with it anymore. This topic will be auto closed.
-            你好 @${{ github.event.issue.user.login }}，当前版本（3.x）已经过了维护期。我们不会再接受对其的相关 PR 与 issue。当前 topic 会被自动关闭。
-      - name: invalid
-        if: github.event.label.name == 'Invalid'
-        uses: actions-cool/issues-helper@v3
-        with:
-          actions: 'create-comment,close-issue'
-          token: ${{ secrets.ADMIN_TOKEN }}
-          issue-number: ${{ github.event.issue.number }}
-          body: |
-            Hello @${{ github.event.issue.user.login }}, your issue has been closed because it does not conform to our issue requirements. Please use the [Issue Helper](https://new-issue.go-admin.dev) to create an issue, thank you!
-            你好 @${{ github.event.issue.user.login }}，为了能够进行高效沟通，我们对 issue 有一定的格式要求，你的 issue 因为不符合要求而被自动关闭。你可以通过 [issue 助手](https://new-issue.go-admin.dev) 来创建 issue 以方便我们定位错误。谢谢配合！
-      - name: rtl
-        if: github.event.label.name == 'rtl'
-        uses: actions-cool/issues-helper@v3
-        with:
-          actions: 'add-assignees'
-          assignees: 'xrkffgg'

.github/workflows/mirror.yaml

@@ -1,29 +0,0 @@
-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 }}

.gitignore

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

Dockerfile

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

Dockerfilebak

@@ -1,28 +0,0 @@
-FROM golang:alpine as builder
-
-MAINTAINER lwnmengjing
-
-ENV GOPROXY https://goproxy.cn/
-
-WORKDIR /go/release
-#RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
-RUN apk update && apk add tzdata
-
-COPY go.mod ./go.mod
-RUN go mod 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
-
-EXPOSE 8000
-
-CMD ["/go-admin","server","-c", "/config/settings.yml"]

LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 go-admin-team
+Copyright (c) 2020 wenjianzhang
 
 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,41 +2,9 @@ PROJECT:=go-admin
 
 .PHONY: build
 build:
-	CGO_ENABLED=0 go build -ldflags="-w -s" -a -installsuffix "" -o go-admin .
-
-# make build-linux
-build-linux:
-	@docker build -t go-admin:latest .
-	@echo "build successful"
-
+	CGO_ENABLED=0 go build -o go-admin main.go
 build-sqlite:
-	go build -tags sqlite3 -ldflags="-w -s" -a -installsuffix -o go-admin .
-
-# make run
-run:
-    # delete go-admin-api container
-	@if [ $(shell docker ps -aq --filter name=go-admin --filter publish=8000) ]; then docker rm -f go-admin; fi
-
-    # 启动方法一 run go-admin-api container  docker-compose 启动方式
-    # 进入到项目根目录 执行 make run 命令
-	@docker-compose up -d
-
-	# 启动方式二 docker run  这里注意-v挂载的宿主机的地址改为部署时的实际决对路径
-    #@docker run --name=go-admin -p 8000:8000 -v /home/code/go/src/go-admin/go-admin/config:/go-admin-api/config  -v /home/code/go/src/go-admin/go-admin-api/static:/go-admin/static -v /home/code/go/src/go-admin/go-admin/temp:/go-admin-api/temp -d --restart=always go-admin:latest
-
-	@echo "go-admin service is running..."
-
-	# delete Tag=<none> 的镜像
-	@docker image prune -f
-	@docker ps -a | grep "go-admin"
-
-stop:
-    # delete go-admin-api container
-	@if [ $(shell docker ps -aq --filter name=go-admin --filter publish=8000) ]; then docker-compose down; fi
-	#@if [ $(shell docker ps -aq --filter name=go-admin --filter publish=8000) ]; then docker rm -f go-admin; fi
-	#@echo "go-admin stop success"
-
-
+	go build -tags sqlite3 -o go-admin main.go
 #.PHONY: test
 #test:
 #	go test -v ./... -cover
@@ -44,11 +12,3 @@ stop:
 #.PHONY: docker
 #docker:
 #	docker build . -t go-admin:latest
-
-# make deploy
-deploy:
-
-	#@git checkout master
-	#@git pull origin master
-	make build-linux
-	make run

README.Zh-cn.md

@@ -1,6 +1,6 @@
 # go-admin
 
-  <img align="right" width="320" src="https://doc-image.zhangwj.com/img/go-admin.svg">
+  <img align="right" width="320" src="https://gitee.com/mydearzwj/image/raw/master/img/go-admin.svg">
 
 
 [![Build Status](https://github.com/wenjianzhang/go-admin/workflows/build/badge.svg)](https://github.com/go-admin-team/go-admin)
@@ -9,25 +9,19 @@
 
 [English](https://github.com/go-admin-team/go-admin/blob/master/README.md) | 简体中文
 
-基于Gin + Vue + Element UI OR Arco Design OR Ant Design的前后端分离权限管理系统,系统初始化极度简单，只需要配置文件中，修改数据库连接，系统支持多指令操作，迁移指令可以让初始化数据库信息变得更简单，服务指令可以很简单的启动api服务
 
-[在线文档](https://www.go-admin.pro)
+基于Gin + Vue + Element UI的前后端分离权限管理系统,系统初始化极度简单，只需要配置文件中，修改数据库连接，系统支持多指令操作，迁移指令可以让初始化数据库信息变得更简单，服务指令可以很简单的启动api服务
+
+[在线文档](https://doc.go-admin.dev)
+
+[github在线文档](https://wenjianzhang.github.io)
+
+[gitee在线文档](http://mydearzwj.gitee.io/go-admin-doc/)
 
 [前端项目](https://github.com/go-admin-team/go-admin-ui)
 
 [视频教程](https://space.bilibili.com/565616721/channel/detail?cid=125737)
 
-## 🎬 在线体验
-
-Element UI vue体验：[https://vue2.go-admin.dev](https://vue2.go-admin.dev/#/login)
-> ⚠️⚠️⚠️ 账号 / 密码： admin / 123456
-
-Arco Design vue3 demo：[https://vue3.go-admin.dev](https://vue3.go-admin.dev/#/login)
-> ⚠️⚠️⚠️ 账号 / 密码： admin / 123456
-
-antd体验：[https://antd.go-admin.pro](https://antd.go-admin.pro/)
-> ⚠️⚠️⚠️ 账号 / 密码： admin / 123456
-
 ## ✨ 特性
 
 - 遵循 RESTful API 设计规范
@@ -40,7 +34,7 @@ antd体验：[https://antd.go-admin.pro](https://antd.go-admin.pro/)
 
 - 支持 Swagger 文档(基于swaggo)
 
-- 基于 GORM 的数据库存储，可扩展多种类型数据库
+- 基于 GORM 的数据库存储，可扩展多种类型数据库 
 
 - 配置文件简单的模型映射，快速能够得到想要的配置
 
@@ -50,13 +44,11 @@ antd体验：[https://antd.go-admin.pro](https://antd.go-admin.pro/)
 
 - 多指令模式
 
-- 多租户的支持
-
 - TODO: 单元测试
 
+
 ## 🎁 内置
 
-1. 多租户：系统默认支持多租户，按库分离，一个库一个租户。
 1. 用户管理：用户是系统操作者，该功能主要完成系统用户配置。
 2. 部门管理：配置系统组织机构（公司、部门、小组），树结构展现支持数据权限。
 3. 岗位管理：配置系统用户所属担任职务。
@@ -71,7 +63,6 @@ antd体验：[https://antd.go-admin.pro](https://antd.go-admin.pro/)
 1. 表单构建：自定义页面样式，拖拉拽实现页面布局。
 1. 服务监控：查看一些服务器的基本信息。
 1. 内容管理：demo功能，下设分类管理、内容管理。可以参考使用方便快速入门。
-1. 定时任务：自动化任务，目前支持接口调用和函数调用。
 
 ## 准备工作
 
@@ -81,11 +72,11 @@ antd体验：[https://antd.go-admin.pro](https://antd.go-admin.pro/)
 
 ### 轻松实现go-admin写出第一个应用 - 文档教程
 
-[步骤一 - 基础内容介绍](https://doc.zhangwj.com/guide/intro/tutorial01.html)
+[步骤一 - 基础内容介绍](http://doc.zhangwj.com/go-admin-site/guide/intro/tutorial01.html)
 
-[步骤二 - 实际应用 - 编写增删改查](https://doc.zhangwj.com/guide/intro/tutorial02.html)
+[步骤二 - 实际应用 - 编写增删改查](http://doc.zhangwj.com/go-admin-site/guide/intro/tutorial02.html) 
 
-### 手把手教你从入门到放弃 - 视频教程
+### 手把手教你从入门到放弃 - 视频教程 
 
 [如何启动go-admin](https://www.bilibili.com/video/BV1z5411x7JG)
 
@@ -103,18 +94,11 @@ antd体验：[https://antd.go-admin.pro](https://antd.go-admin.pro/)
 
 [go-admin数据权限使用说明](https://www.bilibili.com/video/BV1LK4y1s71e) [必看]
 
+
 **如有问题请先看上述使用文档和文章，若不能满足，欢迎 issue 和 pr ，视频教程和文档持续更新中**
 
 ## 📦 本地开发
 
-### 环境要求
-
-go 1.18
-
-node版本: v14.16.0
-
-npm版本: 6.14.11
-
 ### 开发目录创建
 
 ```bash
@@ -137,6 +121,7 @@ git clone https://github.com/go-admin-team/go-admin-ui.git
 
 ```
 
+
 ### 启动说明
 
 #### 服务端启动说明
@@ -145,15 +130,12 @@ git clone https://github.com/go-admin-team/go-admin-ui.git
 # 进入 go-admin 后端项目
 cd ./go-admin
 
-# 更新整理依赖
-go mod tidy
-
 # 编译项目
 go build
 
 # 修改配置 
 # 文件路径  go-admin/config/settings.yml
-vi ./config/settings.yml
+vi ./config/setting.yml 
 
 # 1. 配置文件中修改数据库信息 
 # 注意: settings.database 下对应的配置数据
@@ -176,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/zh-CN/guide/faq#cgo-%E7%9A%84%E9%97%AE%E9%A2%98)
+[解决cgo问题进入](https://doc.go-admin.dev/guide/other/faq.html#_5-cgo-exec-missing-cc-exec-missing-cc-file-does-not-exist)
 
 :::
 
@@ -185,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进行调试
@@ -200,13 +182,6 @@ $ ./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
@@ -218,6 +193,8 @@ docker build -t go-admin .
 docker run --name go-admin -p 8000:8000 -v /config/settings.yml:/config/settings.yml -d go-admin-server
 ```
 
+
+
 #### 文档生成
 
 ```bash
@@ -225,7 +202,6 @@ go generate
 ```
 
 #### 交叉编译
-
 ```bash
 # windows
 env GOOS=windows GOARCH=amd64 go build main.go
@@ -242,76 +218,41 @@ env GOOS=linux GOARCH=amd64 go build main.go
 npm install
 
 # 建议不要直接使用 cnpm 安装依赖，会有各种诡异的 bug。可以通过如下操作解决 npm 下载速度慢的问题
-npm install --registry=https://registry.npmmirror.com
+npm install --registry=https://registry.npm.taobao.org
 
 # 启动服务
 npm run dev
 ```
 
+## 🎬 在线体验
+> admin  /  123456
+
+演示地址：[http://www.go-admin.dev](http://www.go-admin.dev/#/login)
+
+
 ## 📨 互动
 
 <table>
-   <tr>
+  <tr>
     <td><img src="https://raw.githubusercontent.com/wenjianzhang/image/master/img/wx.png" width="180px"></td>
-    <td><img src="https://doc-image.zhangwj.com/img/qrcode_for_gh_b798dc7db30c_258.jpg" 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>
-    <td><a href="https://space.bilibili.com/565616721">wenjianzhang</a></td>
   </tr>
   <tr>
     <td>微信</td>
-    <td>公众号🔥🔥🔥</td>
+    <td>此群已满</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>
-    <td>哔哩哔哩🔥🔥🔥</td>
   </tr>
 </table>
 
-## 💎 贡献者
+## 💎 主要成员
+
+<a href="https://github.com/wenjianzhang"> <img src="https://avatars.githubusercontent.com/u/3890175?s=460&u=20eac63daef81588fbac611da676b99859319251&v=4" width="80px"></a>
+<a href="https://github.com/lwnmengjing"> <img src="https://avatars.githubusercontent.com/u/12806223?s=400&u=a89272dce50100b77b4c0d5c81c718bf78ebb580&v=4" width="80px"></a>
+<a href="https://github.com/chengxiao"> <img src="https://avatars.githubusercontent.com/u/1379545?s=460&u=557da5503d0ac4a8628df6b4075b17853d5edcd9&v=4" width="80px"></a>
+<a href="https://github.com/bing127"> <img src="https://avatars.githubusercontent.com/u/31166183?s=460&u=c085bff88df10bb7676c8c0351ba9dcd031d1fb3&v=4" width="80px"></a>
 
 
-<span style="margin: 0 5px;" ><a href="https://github.com/wenjianzhang" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/3890175?v=4&h=60&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/G-Akiraka" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/45746659?s=64&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/lwnmengjing" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/12806223?s=64&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/bing127" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/31166183?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/chengxiao" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/1379545?s=64&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/NightFire0307" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/19854086?v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/appleboy" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/21979?s=64&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/ninstein" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/580303?v=4&h=60&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/kikiyou" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/17959053?s=64&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/horizonzy" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/22524871?s=64&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/Cassuis" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/48005724?s=64&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/hqcchina" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/5179057?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/nodece" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/16235121?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/stephenzhang0713" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/18169290?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/zhouxixi-dev" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/100399679?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/Jalins" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/31172582?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/wkf928592" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/6063351?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/wxxiong6" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/6983441?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/Silicon-He" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/52478309?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/GizmoOAO" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/20385106?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/bestgopher" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/36840497?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/wxb1207" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/20775558?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/misakichan" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/16569274?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/zhuxuyang" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/19301024?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/mss-boot" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/109259065?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/AuroraV" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/37330199?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/Vingurzhou" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/57127283?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/haimait" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/40926384?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/zyd" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/3446278?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/infnan" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/38274826?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/d1y" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/45585937?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/qlijin" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/515900?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/logtous
-" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/88697234?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/stepway
-" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/9927079?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/NaturalGao
-" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/43291304?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/DemoLiang
-" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/23476007?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/jfcg
-" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/1410597?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/Nicole0724
-" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/10487328?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
 
 ## JetBrains 开源证书支持
 
@@ -319,22 +260,18 @@ npm run dev
 
 <a href="https://www.jetbrains.com/?from=kubeadm-ha" target="_blank"><img src="https://raw.githubusercontent.com/panjf2000/illustrations/master/jetbrains/jetbrains-variant-4.png" width="250" align="middle"/></a>
 
+
 ## 🤝 特别感谢
-
-1. [ant-design](https://github.com/ant-design/ant-design)
-2. [ant-design-pro](https://github.com/ant-design/ant-design-pro)
-2. [arco-design](https://github.com/arco-design/arco-design)
-2. [arco-design-pro](https://github.com/arco-design/arco-design-pro)
-4. [gin](https://github.com/gin-gonic/gin)
-5. [casbin](https://github.com/casbin/casbin)
-6. [spf13/viper](https://github.com/spf13/viper)
-7. [gorm](https://github.com/jinzhu/gorm)
-8. [gin-swagger](https://github.com/swaggo/gin-swagger)
-9. [jwt-go](https://github.com/dgrijalva/jwt-go)
-10. [vue-element-admin](https://github.com/PanJiaChen/vue-element-admin)
-11. [ruoyi-vue](https://gitee.com/y_project/RuoYi-Vue)
-12. [form-generator](https://github.com/JakHuang/form-generator)
-
+1. [chengxiao](https://github.com/chengxiao)
+2. [gin](https://github.com/gin-gonic/gin)
+2. [casbin](https://github.com/casbin/casbin)
+2. [spf13/viper](https://github.com/spf13/viper)
+2. [gorm](https://github.com/jinzhu/gorm)
+2. [gin-swagger](https://github.com/swaggo/gin-swagger)
+2. [jwt-go](https://github.com/dgrijalva/jwt-go)
+2. [vue-element-admin](https://github.com/PanJiaChen/vue-element-admin)
+2. [ruoyi-vue](https://gitee.com/y_project/RuoYi-Vue)
+2. [form-generator](https://github.com/JakHuang/form-generator)
 
 ## 🤟 打赏
 
@@ -343,11 +280,10 @@ npm run dev
 <img class="no-margin" src="https://raw.githubusercontent.com/wenjianzhang/image/master/img/pay.png"  height="200px" >
 
 ## 🤝 链接
-
 [Go开发者成长线路图](http://www.golangroadmap.com/)
 
 ## 🔑 License
 
 [MIT](https://github.com/go-admin-team/go-admin/blob/master/LICENSE.md)
 
-Copyright (c) 2022 wenjianzhang
+Copyright (c) 2020 wenjianzhang

README.md

@@ -1,7 +1,6 @@
-
 # go-admin
 
-<img align="right" width="320" src="https://doc-image.zhangwj.com/img/go-admin.svg">
+  <img align="right" width="320" src="https://gitee.com/mydearzwj/image/raw/master/img/go-admin.svg">
 
 
 [![Build Status](https://github.com/wenjianzhang/go-admin/workflows/build/badge.svg)](https://github.com/go-admin-team/go-admin)
@@ -10,25 +9,14 @@
 
 English | [简体中文](https://github.com/go-admin-team/go-admin/blob/master/README.Zh-cn.md)
 
-The front-end and back-end separation authority management system based on Gin + Vue + Element UI OR Arco Design is extremely simple to initialize the system. You only need to modify the database connection in the configuration file. The system supports multi-instruction operations. Migration instructions can make it easier to initialize database information. Service instructions It's easy to start the api service.
+The front-end and back-end separation authority management system based on Gin + Vue + Element UI is extremely simple to initialize the system. You only need to modify the database connection in the configuration file. The system supports multi-instruction operations. Migration instructions can make it easier to initialize database information. Service instructions It's easy to start the api service.
 
-[documentation](https://www.go-admin.dev)
+[documentation](https://doc.go-admin.dev)
 
 [Front-end project](https://github.com/go-admin-team/go-admin-ui)
 
 [Video tutorial](https://space.bilibili.com/565616721/channel/detail?cid=125737)
 
-## 🎬 Online Demo
-
-Element UI vue demo：[https://vue2.go-admin.dev](https://vue2.go-admin.dev/#/login)
-> 账号 / 密码： admin / 123456
-
-Arco Design vue3 demo：[https://vue3.go-admin.dev](https://vue3.go-admin.dev/#/login)
-> 账号 / 密码： admin / 123456
-
-antd demo：[https://antd.go-admin.pro](https://antd.go-admin.pro/)
-> 账号 / 密码： admin / 123456
-> 
 ## ✨ Feature
 
 - Follow RESTful API design specifications
@@ -79,9 +67,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](https://doc.zhangwj.com/guide/intro/tutorial01.html)
+[Step 1 - basic content introduction](http://doc.zhangwj.com/go-admin-site/guide/intro/tutorial01.html)
 
-[Step 2 - Practical application - writing database operations](https://doc.zhangwj.com/guide/intro/tutorial02.html)
+[Step 2 - Practical application - writing database operations](http://doc.zhangwj.com/go-admin-site/guide/intro/tutorial02.html)
 
 ### Teach you from getting started to giving up-video tutorial
 
@@ -105,14 +93,6 @@ At the same time, a series of tutorials including videos and documents are provi
 
 ## 📦 Local development
 
-### Environmental requirements
-
-go 1.18
-
-nodejs: v14.16.0
-
-npm: 6.14.11
-
 ### Development directory creation
 
 ```bash
@@ -143,22 +123,19 @@ git clone https://github.com/go-admin-team/go-admin-ui.git
 # Enter the go-admin backend project
 cd ./go-admin
 
-# Update dependencies
-go mod tidy
-
 # Compile the project
 go build
 
 # Change setting 
 # File path go-admin/config/settings.yml
-vi ./config/settings.yml
+vi ./config/setting.yml 
 
 # 1. Modify the database information in the configuration file
 # Note: The corresponding configuration data under settings.database
 # 2. Confirm the log path
 ```
 
-:::tip ⚠️Note that this problem will occur if CGO is not installed in the windows10+ environment;
+:::tip ⚠️Note that this problem will occur if CGO is not installed in the windows environment;
 
 ```bash
 E:\go-admin>go build
@@ -174,7 +151,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/faq#cgo-%E7%9A%84%E9%97%AE%E9%A2%98)
+[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)
 
 :::
 
@@ -183,10 +160,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
@@ -236,69 +213,31 @@ npm install   # or cnpm install
 npm run dev
 ```
 
+## 🎬 Online Demo
+> admin  /  123456
+
+演示地址：[http://www.go-admin.dev](http://www.go-admin.dev/#/login)
+
+
 ## 📨 Interactive
 
 <table>
   <tr>
     <td><img src="https://raw.githubusercontent.com/wenjianzhang/image/master/img/wx.png" width="180px"></td>
-    <td><img src="https://doc-image.zhangwj.com/img/qrcode_for_gh_b798dc7db30c_258.jpg" width="180px"></td>
     <td><img src="https://raw.githubusercontent.com/wenjianzhang/image/master/img/qq2.png" width="200px"></td>
-    <td><a href="https://space.bilibili.com/565616721">wenjianzhang</a></td>
   </tr>
   <tr>
     <td>Wechat</td>
-    <td>Wechat公众号🔥🔥🔥</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>
-    <td>bilibili🔥🔥🔥</td>
   </tr>
 </table>
 
-## 💎 Contributors
+## 💎 Members
 
-<span style="margin: 0 5px;" ><a href="https://github.com/wenjianzhang" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/3890175?v=4&h=60&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/G-Akiraka" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/45746659?s=64&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/lwnmengjing" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/12806223?s=64&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/bing127" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/31166183?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/chengxiao" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/1379545?s=64&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/NightFire0307" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/19854086?v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/appleboy" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/21979?s=64&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/ninstein" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/580303?v=4&h=60&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/kikiyou" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/17959053?s=64&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/horizonzy" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/22524871?s=64&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/Cassuis" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/48005724?s=64&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/hqcchina" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/5179057?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/nodece" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/16235121?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/stephenzhang0713" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/18169290?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/zhouxixi-dev" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/100399679?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/Jalins" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/31172582?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/wkf928592" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/6063351?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/wxxiong6" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/6983441?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/Silicon-He" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/52478309?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/GizmoOAO" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/20385106?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/bestgopher" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/36840497?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/wxb1207" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/20775558?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/misakichan" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/16569274?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/zhuxuyang" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/19301024?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/mss-boot" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/109259065?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/AuroraV" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/37330199?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/Vingurzhou" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/57127283?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/haimait" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/40926384?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/zyd" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/3446278?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/infnan" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/38274826?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/d1y" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/45585937?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/qlijin" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/515900?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/logtous
-" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/88697234?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/stepway
-" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/9927079?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/NaturalGao
-" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/43291304?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/DemoLiang
-" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/23476007?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/jfcg
-" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/1410597?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
-<span style="margin: 0 5px;" ><a href="https://github.com/Nicole0724
-" ><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/10487328?s=60&v=4&w=60&fit=cover&mask=circle&maxage=7d" /></a></span>
+<a href="https://github.com/wenjianzhang"> <img src="https://avatars.githubusercontent.com/u/3890175?s=460&u=20eac63daef81588fbac611da676b99859319251&v=4" width="80px"></a>
+<a href="https://github.com/lwnmengjing"> <img src="https://avatars.githubusercontent.com/u/12806223?s=400&u=a89272dce50100b77b4c0d5c81c718bf78ebb580&v=4" width="80px"></a>
+<a href="https://github.com/chengxiao"> <img src="https://avatars.githubusercontent.com/u/1379545?s=460&u=557da5503d0ac4a8628df6b4075b17853d5edcd9&v=4" width="80px"></a>
+<a href="https://github.com/bing127"> <img src="https://avatars.githubusercontent.com/u/31166183?s=460&u=c085bff88df10bb7676c8c0351ba9dcd031d1fb3&v=4" width="80px"></a>
 
 
 
@@ -310,11 +249,7 @@ The `go-admin` project has always been developed in the GoLand integrated develo
 
 
 ## 🤝 Thanks
-
-1. [ant-design](https://github.com/ant-design/ant-design)
-2. [ant-design-pro](https://github.com/ant-design/ant-design-pro)
-2. [arco-design](https://github.com/arco-design/arco-design)
-2. [arco-design-pro](https://github.com/arco-design/arco-design-pro)
+1. [chengxiao](https://github.com/chengxiao)
 2. [gin](https://github.com/gin-gonic/gin)
 2. [casbin](https://github.com/casbin/casbin)
 2. [spf13/viper](https://github.com/spf13/viper)
@@ -333,10 +268,9 @@ The `go-admin` project has always been developed in the GoLand integrated develo
 
 ## 🤝 Link
 [Go developer growth roadmap](http://www.golangroadmap.com/)
-[mss-boot-io](https://docs.mss-boot-io.top/)
 
 ## 🔑 License
 
 [MIT](https://github.com/go-admin-team/go-admin/blob/master/LICENSE.md)
 
-Copyright (c) 2022 wenjianzhang
+Copyright (c) 2020 wenjianzhang

app/admin/apis/captcha.go

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

app/admin/apis/monitor/server.go

@@ -0,0 +1,76 @@
+package monitor
+
+import (
+	"runtime"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+	_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
+	"github.com/shirou/gopsutil/cpu"
+	"github.com/shirou/gopsutil/disk"
+	"github.com/shirou/gopsutil/mem"
+
+	"go-admin/common/apis"
+)
+
+const (
+	B  = 1
+	KB = 1024 * B
+	MB = 1024 * KB
+	GB = 1024 * MB
+)
+
+type Monitor struct {
+	apis.Api
+}
+
+// @Summary 系统信息
+// @Description 获取JSON
+// @Tags 系统信息
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
+// @Router /api/v1/settings/serverInfo [get]
+func (e Monitor) ServerInfo(c *gin.Context) {
+	e.Context = c
+
+	osDic := make(map[string]interface{}, 0)
+	osDic["goOs"] = runtime.GOOS
+	osDic["arch"] = runtime.GOARCH
+	osDic["mem"] = runtime.MemProfileRate
+	osDic["compiler"] = runtime.Compiler
+	osDic["version"] = runtime.Version()
+	osDic["numGoroutine"] = runtime.NumGoroutine()
+	osDic["ip"] = pkg.GetLocaHonst()
+	osDic["projectDir"] = pkg.GetCurrentPath()
+
+	dis, _ := disk.Usage("/")
+	diskTotalGB := int(dis.Total) / GB
+	diskFreeGB := int(dis.Free) / GB
+	diskDic := make(map[string]interface{}, 0)
+	diskDic["total"] = diskTotalGB
+	diskDic["free"] = diskFreeGB
+
+	mem, _ := mem.VirtualMemory()
+	memUsedMB := int(mem.Used) / GB
+	memTotalMB := int(mem.Total) / GB
+	memFreeMB := int(mem.Free) / GB
+	memUsedPercent := int(mem.UsedPercent)
+	memDic := make(map[string]interface{}, 0)
+	memDic["total"] = memTotalMB
+	memDic["used"] = memUsedMB
+	memDic["free"] = memFreeMB
+	memDic["usage"] = memUsedPercent
+
+	cpuDic := make(map[string]interface{}, 0)
+	cpuDic["cpuInfo"], _ = cpu.Info()
+	percent, _ := cpu.Percent(0, false)
+	cpuDic["Percent"] = pkg.Round(percent[0], 2)
+	cpuDic["cpuNum"], _ = cpu.Counts(false)
+
+	e.Custom(gin.H{
+		"code": 200,
+		"os":   osDic,
+		"mem":  memDic,
+		"cpu":  cpuDic,
+		"disk": diskDic,
+	})
+}

app/admin/apis/public/file.go

@@ -1,4 +1,4 @@
-package apis
+package public
 
 import (
 	"encoding/base64"
@@ -8,11 +8,11 @@ import (
 	"strings"
 
 	"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/utils"
 	"github.com/google/uuid"
 
+	"go-admin/common/apis"
 	"go-admin/common/file_store"
 )
 
@@ -27,10 +27,9 @@ type FileResponse struct {
 const path = "static/uploadfile/"
 
 type File struct {
-	api.Api
+	apis.Api
 }
 
-// UploadFile 上传图片
 // @Summary 上传图片
 // @Description 获取JSON
 // @Tags 公共接口
@@ -40,39 +39,35 @@ 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)
+	e.Context = c
+
 	tag, _ := c.GetPostForm("type")
-	urlPrefix := fmt.Sprintf("%s://%s/", "http", c.Request.Host)
+	urlPerfix := fmt.Sprintf("http://%s/", c.Request.Host)
 	var fileResponse FileResponse
-
-	switch tag {
-	case "1": // 单图
-		var done bool
-		fileResponse, done = e.singleFile(c, fileResponse, urlPrefix)
-		if done {
+	if tag == "" {
+		e.Error(500, nil, "缺少标识")
+		//app.Error(c, 200, errors.New(""), "缺少标识")
+		return
+	} else {
+		switch tag {
+		case "1": // 单图
+			var done bool
+			fileResponse, done = e.singleFile(c, fileResponse, urlPerfix)
+			if done {
+				return
+			}
+			e.OK(fileResponse, "上传成功")
 			return
-		}
-		e.OK(fileResponse, "上传成功")
-		return
-	case "2": // 多图
-		multipartFile := e.multipleFile(c, urlPrefix)
-		e.OK(multipartFile, "上传成功")
-		return
-	case "3": // base64
-		fileResponse = e.baseImg(c, fileResponse, urlPrefix)
-		e.OK(fileResponse, "上传成功")
-	default:
-		var done bool
-		fileResponse, done = e.singleFile(c, fileResponse, urlPrefix)
-		if done {
+		case "2": // 多图
+			multipartFile := e.multipleFile(c, urlPerfix)
+			e.OK(multipartFile, "上传成功")
 			return
+		case "3": // base64
+			fileResponse = e.baseImg(c, fileResponse, urlPerfix)
+			e.OK(fileResponse, "上传成功")
 		}
-		e.OK(fileResponse, "上传成功")
-		return
 	}
-
 }
 
 func (e File) baseImg(c *gin.Context, fileResponse FileResponse, urlPerfix string) FileResponse {
@@ -102,8 +97,8 @@ func (e File) baseImg(c *gin.Context, fileResponse FileResponse, urlPerfix strin
 		return fileResponse
 	}
 	if source != "1" {
-		fileResponse.Path = "/static/uploadfile/" + fileName
-		fileResponse.FullPath = "/static/uploadfile/" + fileName
+		fileResponse.Path = "https://youshikeji.oss-cn-shanghai.aliyuncs.com/img/" + fileName
+		fileResponse.FullPath = "https://youshikeji.oss-cn-shanghai.aliyuncs.com/img/" + fileName
 	}
 	return fileResponse
 }
@@ -136,8 +131,8 @@ func (e File) multipleFile(c *gin.Context, urlPerfix string) []FileResponse {
 					Type:     fileType,
 				}
 				if source != "1" {
-					fileResponse.Path = "/static/uploadfile/" + fileName
-					fileResponse.FullPath = "/static/uploadfile/" + fileName
+					fileResponse.Path = "https://youshikeji.oss-cn-shanghai.aliyuncs.com/img/" + fileName
+					fileResponse.FullPath = "https://youshikeji.oss-cn-shanghai.aliyuncs.com/img/" + fileName
 				}
 				multipartFile = append(multipartFile, fileResponse)
 			}
@@ -172,14 +167,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 = "/static/uploadfile/" + fileName
-	fileResponse.FullPath = "/static/uploadfile/" + fileName
+	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
 	return fileResponse, false
 }
 

app/admin/apis/sys_api.go

@@ -1,148 +0,0 @@
-package apis
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/gin-gonic/gin/binding"
-	"github.com/go-admin-team/go-admin-core/sdk/api"
-	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
-	_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
-
-	"go-admin/app/admin/models"
-	"go-admin/app/admin/service"
-	"go-admin/app/admin/service/dto"
-	"go-admin/common/actions"
-)
-
-type SysApi struct {
-	api.Api
-}
-
-// GetPage 获取接口管理列表
-// @Summary 获取接口管理列表
-// @Description 获取接口管理列表
-// @Tags 接口管理
-// @Param name query string false "名称"
-// @Param title query string false "标题"
-// @Param path query string false "地址"
-// @Param action query string false "类型"
-// @Param pageSize query int false "页条数"
-// @Param pageIndex query int false "页码"
-// @Success 200 {object} response.Response{data=response.Page{list=[]models.SysApi}} "{"code": 200, "data": [...]}"
-// @Router /api/v1/sys-api [get]
-// @Security Bearer
-func (e SysApi) GetPage(c *gin.Context) {
-	s := service.SysApi{}
-	req := dto.SysApiGetPageReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.Form).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-	//数据权限检查
-	p := actions.GetPermissionFromContext(c)
-	list := make([]models.SysApi, 0)
-	var count int64
-	err = s.GetPage(&req, p, &list, &count)
-	if err != nil {
-		e.Error(500, err, "查询失败")
-		return
-	}
-	e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
-}
-
-// Get 获取接口管理
-// @Summary 获取接口管理
-// @Description 获取接口管理
-// @Tags 接口管理
-// @Param id path string false "id"
-// @Success 200 {object} response.Response{data=models.SysApi} "{"code": 200, "data": [...]}"
-// @Router /api/v1/sys-api/{id} [get]
-// @Security Bearer
-func (e SysApi) Get(c *gin.Context) {
-	req := dto.SysApiGetReq{}
-	s := service.SysApi{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, nil).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-	p := actions.GetPermissionFromContext(c)
-	var object models.SysApi
-	err = s.Get(&req, p, &object).Error
-	if err != nil {
-		e.Error(500, err, "查询失败")
-		return
-	}
-	e.OK(object, "查询成功")
-}
-
-// Update 修改接口管理
-// @Summary 修改接口管理
-// @Description 修改接口管理
-// @Tags 接口管理
-// @Accept application/json
-// @Product application/json
-// @Param data body dto.SysApiUpdateReq true "body"
-// @Success 200 {object} response.Response	"{"code": 200, "message": "修改成功"}"
-// @Router /api/v1/sys-api/{id} [put]
-// @Security Bearer
-func (e SysApi) Update(c *gin.Context) {
-	req := dto.SysApiUpdateReq{}
-	s := service.SysApi{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		return
-	}
-	req.SetUpdateBy(user.GetUserId(c))
-	p := actions.GetPermissionFromContext(c)
-	err = s.Update(&req, p)
-	if err != nil {
-		e.Error(500, err, "更新失败")
-		return
-	}
-	e.OK(req.GetId(), "更新成功")
-}
-
-// DeleteSysApi 删除接口管理
-// @Summary 删除接口管理
-// @Description 删除接口管理
-// @Tags 接口管理
-// @Param data body dto.SysApiDeleteReq true "body"
-// @Success 200 {object} response.Response	"{"code": 200, "message": "删除成功"}"
-// @Router /api/v1/sys-api [delete]
-// @Security Bearer
-func (e SysApi) DeleteSysApi(c *gin.Context) {
-	req := dto.SysApiDeleteReq{}
-	s := service.SysApi{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		return
-	}
-	p := actions.GetPermissionFromContext(c)
-	err = s.Remove(&req, p)
-	if err != nil {
-		e.Error(500, err, "删除失败")
-		return
-	}
-	e.OK(req.GetId(), "删除成功")
-}

app/admin/apis/sys_china_area_data/sys_china_area_data.go

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

app/admin/apis/sys_config.go

@@ -1,313 +0,0 @@
-package apis
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/gin-gonic/gin/binding"
-	"github.com/go-admin-team/go-admin-core/sdk/api"
-	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
-
-	"go-admin/app/admin/models"
-	"go-admin/app/admin/service"
-	"go-admin/app/admin/service/dto"
-)
-
-type SysConfig struct {
-	api.Api
-}
-
-// GetPage 获取配置管理列表
-// @Summary 获取配置管理列表
-// @Description 获取配置管理列表
-// @Tags 配置管理
-// @Param configName query string false "名称"
-// @Param configKey query string false "key"
-// @Param configType query string false "类型"
-// @Param isFrontend query int false "是否前端"
-// @Param pageSize query int false "页条数"
-// @Param pageIndex query int false "页码"
-// @Success 200 {object} response.Response{data=response.Page{list=[]models.SysApi}} "{"code": 200, "data": [...]}"
-// @Router /api/v1/sys-config [get]
-// @Security Bearer
-func (e SysConfig) GetPage(c *gin.Context) {
-	s := service.SysConfig{}
-	req := dto.SysConfigGetPageReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.Form).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		return
-	}
-
-	list := make([]models.SysConfig, 0)
-	var count int64
-	err = s.GetPage(&req, &list, &count)
-	if err != nil {
-		e.Error(500, err, "查询失败")
-		return
-	}
-	e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
-}
-
-// Get 获取配置管理
-// @Summary 获取配置管理
-// @Description 获取配置管理
-// @Tags 配置管理
-// @Param id path string false "id"
-// @Success 200 {object} response.Response{data=models.SysConfig} "{"code": 200, "data": [...]}"
-// @Router /api/v1/sys-config/{id} [get]
-// @Security Bearer
-func (e SysConfig) Get(c *gin.Context) {
-	req := dto.SysConfigGetReq{}
-	s := service.SysConfig{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.JSON, nil).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-	var object models.SysConfig
-
-	err = s.Get(&req, &object)
-	if err != nil {
-		e.Error(500, err, err.Error())
-		return
-	}
-
-	e.OK(object, "查询成功")
-}
-
-// Insert 创建配置管理
-// @Summary 创建配置管理
-// @Description 创建配置管理
-// @Tags 配置管理
-// @Accept application/json
-// @Product application/json
-// @Param data body dto.SysConfigControl true "body"
-// @Success 200 {object} response.Response	"{"code": 200, "message": "创建成功"}"
-// @Router /api/v1/sys-config [post]
-// @Security Bearer
-func (e SysConfig) Insert(c *gin.Context) {
-	s := service.SysConfig{}
-	req := dto.SysConfigControl{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.JSON).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-	req.SetCreateBy(user.GetUserId(c))
-
-	err = s.Insert(&req)
-	if err != nil {
-		e.Error(500, err, "创建失败")
-		return
-	}
-	e.OK(req.GetId(), "创建成功")
-}
-
-// Update 修改配置管理
-// @Summary 修改配置管理
-// @Description 修改配置管理
-// @Tags 配置管理
-// @Accept application/json
-// @Product application/json
-// @Param data body dto.SysConfigControl true "body"
-// @Success 200 {object} response.Response	"{"code": 200, "message": "修改成功"}"
-// @Router /api/v1/sys-config/{id} [put]
-// @Security Bearer
-func (e SysConfig) Update(c *gin.Context) {
-	s := service.SysConfig{}
-	req := dto.SysConfigControl{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.JSON, nil).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-	req.SetUpdateBy(user.GetUserId(c))
-	err = s.Update(&req)
-	if err != nil {
-		e.Error(500, err, "更新失败")
-		return
-	}
-	e.OK(req.GetId(), "更新成功")
-}
-
-// Delete 删除配置管理
-// @Summary 删除配置管理
-// @Description 删除配置管理
-// @Tags 配置管理
-// @Param ids body []int false "ids"
-// @Success 200 {object} response.Response	"{"code": 200, "message": "删除成功"}"
-// @Router /api/v1/sys-config [delete]
-// @Security Bearer
-func (e SysConfig) Delete(c *gin.Context) {
-	s := service.SysConfig{}
-	req := dto.SysConfigDeleteReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.JSON, nil).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-	req.SetUpdateBy(user.GetUserId(c))
-
-	err = s.Remove(&req)
-	if err != nil {
-		e.Error(500, err, "删除失败")
-		return
-	}
-	e.OK(req.GetId(), "删除成功")
-}
-
-// Get2SysApp 获取系统配置信息
-// @Summary 获取系统前台配置信息，主要注意这里不在验证权限
-// @Description 获取系统配置信息，主要注意这里不在验证权限
-// @Tags 配置管理
-// @Success 200 {object} response.Response{data=map[string]string} "{"code": 200, "data": [...]}"
-// @Router /api/v1/app-config [get]
-func (e SysConfig) Get2SysApp(c *gin.Context) {
-	req := dto.SysConfigGetToSysAppReq{}
-	s := service.SysConfig{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.Form).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		return
-	}
-	// 控制只读前台的数据
-	req.IsFrontend = "1"
-	list := make([]models.SysConfig, 0)
-	err = s.GetWithKeyList(&req, &list)
-	if err != nil {
-		e.Error(500, err, "查询失败")
-		return
-	}
-	mp := make(map[string]string)
-	for i := 0; i < len(list); i++ {
-		key := list[i].ConfigKey
-		if key != "" {
-			mp[key] = list[i].ConfigValue
-		}
-	}
-	e.OK(mp, "查询成功")
-}
-
-// Get2Set 获取配置
-// @Summary 获取配置
-// @Description 界面操作设置配置值的获取
-// @Tags 配置管理
-// @Accept application/json
-// @Product application/json
-// @Success 200 {object} response.Response{data=map[string]interface{}}	"{"code": 200, "message": "修改成功"}"
-// @Router /api/v1/set-config [get]
-// @Security Bearer
-func (e SysConfig) Get2Set(c *gin.Context) {
-	s := service.SysConfig{}
-	req := make([]dto.GetSetSysConfigReq, 0)
-	err := e.MakeContext(c).
-		MakeOrm().
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-	err = s.GetForSet(&req)
-	if err != nil {
-		e.Error(500, err, "查询失败")
-		return
-	}
-	m := make(map[string]interface{}, 0)
-	for _, v := range req {
-		m[v.ConfigKey] = v.ConfigValue
-	}
-	e.OK(m, "查询成功")
-}
-
-// Update2Set 设置配置
-// @Summary 设置配置
-// @Description 界面操作设置配置值
-// @Tags 配置管理
-// @Accept application/json
-// @Product application/json
-// @Param data body []dto.GetSetSysConfigReq true "body"
-// @Success 200 {object} response.Response	"{"code": 200, "message": "修改成功"}"
-// @Router /api/v1/set-config [put]
-// @Security Bearer
-func (e SysConfig) Update2Set(c *gin.Context) {
-	s := service.SysConfig{}
-	req := make([]dto.GetSetSysConfigReq, 0)
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.JSON).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-
-	err = s.UpdateForSet(&req)
-	if err != nil {
-		e.Error(500, err, err.Error())
-		return
-	}
-
-	e.OK("", "更新成功")
-}
-
-// GetSysConfigByKEYForService 根据Key获取SysConfig的Service
-// @Summary 根据Key获取SysConfig的Service
-// @Description 根据Key获取SysConfig的Service
-// @Tags 配置管理
-// @Param configKey path string false "configKey"
-// @Success 200 {object} response.Response{data=dto.SysConfigByKeyReq} "{"code": 200, "data": [...]}"
-// @Router /api/v1/sys-config/{id} [get]
-// @Security Bearer
-func (e SysConfig) GetSysConfigByKEYForService(c *gin.Context) {
-	var s = new(service.SysConfig)
-	var req = new(dto.SysConfigByKeyReq)
-	var resp = new(dto.GetSysConfigByKEYForServiceResp)
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(req, nil).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-
-	err = s.GetWithKey(req, resp)
-	if err != nil {
-		e.Error(500, err, err.Error())
-		return
-	}
-	e.OK(resp, s.Msg)
-}

app/admin/apis/sys_dept.go

@@ -1,238 +0,0 @@
-package apis
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/gin-gonic/gin/binding"
-	"github.com/go-admin-team/go-admin-core/sdk/api"
-	"github.com/go-admin-team/go-admin-core/sdk/pkg"
-	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
-	_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
-	"go-admin/app/admin/models"
-
-	"go-admin/app/admin/service"
-	"go-admin/app/admin/service/dto"
-)
-
-type SysDept struct {
-	api.Api
-}
-
-// GetPage
-// @Summary 分页部门列表数据
-// @Description 分页列表
-// @Tags 部门
-// @Param deptName query string false "deptName"
-// @Param deptId query string false "deptId"
-// @Param position query string false "position"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/dept [get]
-// @Security Bearer
-func (e SysDept) GetPage(c *gin.Context) {
-	s := service.SysDept{}
-	req := dto.SysDeptGetPageReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-	list := make([]models.SysDept, 0)
-	list, err = s.SetDeptPage(&req)
-	if err != nil {
-		e.Error(500, err, "查询失败")
-		return
-	}
-	e.OK(list, "查询成功")
-}
-
-// Get
-// @Summary 获取部门数据
-// @Description 获取JSON
-// @Tags 部门
-// @Param deptId path string false "deptId"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/dept/{deptId} [get]
-// @Security Bearer
-func (e SysDept) Get(c *gin.Context) {
-	s := service.SysDept{}
-	req := dto.SysDeptGetReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.JSON, nil).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-	var object models.SysDept
-
-	err = s.Get(&req, &object)
-	if err != nil {
-		e.Error(500, err, "查询失败")
-		return
-	}
-
-	e.OK(object, "查询成功")
-}
-
-// Insert 添加部门
-// @Summary 添加部门
-// @Description 获取JSON
-// @Tags 部门
-// @Accept  application/json
-// @Product application/json
-// @Param data body dto.SysDeptInsertReq true "data"
-// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
-// @Router /api/v1/dept [post]
-// @Security Bearer
-func (e SysDept) Insert(c *gin.Context) {
-	s := service.SysDept{}
-	req := dto.SysDeptInsertReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.JSON).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-
-	// 设置创建人
-	req.SetCreateBy(user.GetUserId(c))
-	err = s.Insert(&req)
-	if err != nil {
-		e.Error(500, err, "创建失败")
-		return
-	}
-	e.OK(req.GetId(), "创建成功")
-}
-
-// Update
-// @Summary 修改部门
-// @Description 获取JSON
-// @Tags 部门
-// @Accept  application/json
-// @Product application/json
-// @Param id path int true "id"
-// @Param data body dto.SysDeptUpdateReq true "body"
-// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
-// @Router /api/v1/dept/{deptId} [put]
-// @Security Bearer
-func (e SysDept) Update(c *gin.Context) {
-	s := service.SysDept{}
-	req := dto.SysDeptUpdateReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-	req.SetUpdateBy(user.GetUserId(c))
-	err = s.Update(&req)
-	if err != nil {
-		e.Error(500, err, err.Error())
-		return
-	}
-	e.OK(req.GetId(), "更新成功")
-}
-
-// Delete
-// @Summary 删除部门
-// @Description 删除数据
-// @Tags 部门
-// @Param data body dto.SysDeptDeleteReq true "body"
-// @Success 200 {string} string	"{"code": 200, "message": "删除成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "删除失败"}"
-// @Router /api/v1/dept [delete]
-// @Security Bearer
-func (e SysDept) Delete(c *gin.Context) {
-	s := service.SysDept{}
-	req := dto.SysDeptDeleteReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.JSON, nil).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-
-	err = s.Remove(&req)
-	if err != nil {
-		e.Error(500, err, "删除失败")
-		return
-	}
-	e.OK(req.GetId(), "删除成功")
-}
-
-// Get2Tree 用户管理 左侧部门树
-func (e SysDept) Get2Tree(c *gin.Context) {
-	s := service.SysDept{}
-	req := dto.SysDeptGetPageReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req,binding.Form).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-	list := make([]dto.DeptLabel, 0)
-	list, err = s.SetDeptTree(&req)
-	if err != nil {
-		e.Error(500, err, "查询失败")
-		return
-	}
-	e.OK(list, "")
-}
-
-// GetDeptTreeRoleSelect TODO: 此接口需要调整不应该将list和选中放在一起
-func (e SysDept) GetDeptTreeRoleSelect(c *gin.Context) {
-	s := service.SysDept{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-
-	id, err := pkg.StringToInt(c.Param("roleId"))
-	result, err := s.SetDeptLabel()
-	if err != nil {
-		e.Error(500, err, err.Error())
-		return
-	}
-	menuIds := make([]int, 0)
-	if id != 0 {
-		menuIds, err = s.GetWithRoleId(id)
-		if err != nil {
-			e.Error(500, err, err.Error())
-			return
-		}
-	}
-	e.OK(gin.H{
-		"depts":       result,
-		"checkedKeys": menuIds,
-	}, "")
-}

app/admin/apis/sys_dict_data.go

@@ -1,220 +0,0 @@
-package apis
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/gin-gonic/gin/binding"
-	"github.com/go-admin-team/go-admin-core/sdk/api"
-	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
-	_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
-	"go-admin/app/admin/models"
-
-	"go-admin/app/admin/service"
-	"go-admin/app/admin/service/dto"
-)
-
-type SysDictData struct {
-	api.Api
-}
-
-// GetPage
-// @Summary 字典数据列表
-// @Description 获取JSON
-// @Tags 字典数据
-// @Param status query string false "status"
-// @Param dictCode query string false "dictCode"
-// @Param dictType query string false "dictType"
-// @Param pageSize query int false "页条数"
-// @Param pageIndex query int false "页码"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/dict/data [get]
-// @Security Bearer
-func (e SysDictData) GetPage(c *gin.Context) {
-	s := service.SysDictData{}
-	req := dto.SysDictDataGetPageReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.Form).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-
-	list := make([]models.SysDictData, 0)
-	var count int64
-	err = s.GetPage(&req, &list, &count)
-	if err != nil {
-		e.Error(500, err, "查询失败")
-		return
-	}
-
-	e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
-}
-
-// Get
-// @Summary 通过编码获取字典数据
-// @Description 获取JSON
-// @Tags 字典数据
-// @Param dictCode path int true "字典编码"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/dict/data/{dictCode} [get]
-// @Security Bearer
-func (e SysDictData) Get(c *gin.Context) {
-	s := service.SysDictData{}
-	req := dto.SysDictDataGetReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, nil).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-
-	var object models.SysDictData
-
-	err = s.Get(&req, &object)
-	if err != nil {
-		e.Logger.Warnf("Get error: %s", err.Error())
-		e.Error(500, err, "查询失败")
-		return
-	}
-
-	e.OK(object, "查询成功")
-}
-
-// Insert
-// @Summary 添加字典数据
-// @Description 获取JSON
-// @Tags 字典数据
-// @Accept  application/json
-// @Product application/json
-// @Param data body dto.SysDictDataInsertReq true "data"
-// @Success 200 {object} response.Response	"{"code": 200, "message": "添加成功"}"
-// @Router /api/v1/dict/data [post]
-// @Security Bearer
-func (e SysDictData) Insert(c *gin.Context) {
-	s := service.SysDictData{}
-	req := dto.SysDictDataInsertReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.JSON).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-	req.SetCreateBy(user.GetUserId(c))
-	err = s.Insert(&req)
-	if err != nil {
-		e.Error(500, err, "创建失败")
-		return
-	}
-
-	e.OK(req.GetId(), "创建成功")
-}
-
-// Update
-// @Summary 修改字典数据
-// @Description 获取JSON
-// @Tags 字典数据
-// @Accept  application/json
-// @Product application/json
-// @Param data body dto.SysDictDataUpdateReq true "body"
-// @Success 200 {object} response.Response	"{"code": 200, "message": "修改成功"}"
-// @Router /api/v1/dict/data/{dictCode} [put]
-// @Security Bearer
-func (e SysDictData) Update(c *gin.Context) {
-	s := service.SysDictData{}
-	req := dto.SysDictDataUpdateReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.JSON, nil).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-	req.SetUpdateBy(user.GetUserId(c))
-	err = s.Update(&req)
-	if err != nil {
-		e.Error(500, err, "更新失败")
-		return
-	}
-	e.OK(req.GetId(), "更新成功")
-}
-
-// Delete
-// @Summary 删除字典数据
-// @Description 删除数据
-// @Tags 字典数据
-// @Param dictCode body dto.SysDictDataDeleteReq true "body"
-// @Success 200 {object} response.Response	"{"code": 200, "message": "删除成功"}"
-// @Router /api/v1/dict/data [delete]
-// @Security Bearer
-func (e SysDictData) Delete(c *gin.Context) {
-	s := service.SysDictData{}
-	req := dto.SysDictDataDeleteReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.JSON, nil).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-	req.SetUpdateBy(user.GetUserId(c))
-	err = s.Remove(&req)
-	if err != nil {
-		e.Error(500, err, "删除失败")
-		return
-	}
-	e.OK(req.GetId(), "删除成功")
-}
-
-// GetAll 数据字典根据key获取 业务页面使用
-// @Summary 数据字典根据key获取
-// @Description 数据字典根据key获取
-// @Tags 字典数据
-// @Param dictType query int true "dictType"
-// @Success 200 {object} response.Response{data=[]dto.SysDictDataGetAllResp}  "{"code": 200, "data": [...]}"
-// @Router /api/v1/dict-data/option-select [get]
-// @Security Bearer
-func (e SysDictData) GetAll(c *gin.Context) {
-	s := service.SysDictData{}
-	req := dto.SysDictDataGetPageReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-	list := make([]models.SysDictData, 0)
-	err = s.GetAll(&req, &list)
-	if err != nil {
-		e.Error(500, err, "查询失败")
-		return
-	}
-	l := make([]dto.SysDictDataGetAllResp, 0)
-	for _, i := range list {
-		d := dto.SysDictDataGetAllResp{}
-		e.Translate(i, &d)
-		l = append(l, d)
-	}
-
-	e.OK(l,"查询成功")
-}

app/admin/apis/sys_dict_type.go

@@ -1,210 +0,0 @@
-package apis
-
-import (
-	"fmt"
-	"github.com/gin-gonic/gin"
-	"github.com/gin-gonic/gin/binding"
-	"github.com/go-admin-team/go-admin-core/sdk/api"
-	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
-	_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
-	"go-admin/app/admin/models"
-
-	"go-admin/app/admin/service"
-	"go-admin/app/admin/service/dto"
-)
-
-type SysDictType struct {
-	api.Api
-}
-
-// GetPage 字典类型列表数据
-// @Summary 字典类型列表数据
-// @Description 获取JSON
-// @Tags 字典类型
-// @Param dictName query string false "dictName"
-// @Param dictId query string false "dictId"
-// @Param dictType query string false "dictType"
-// @Param pageSize query int false "页条数"
-// @Param pageIndex query int false "页码"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/dict/type [get]
-// @Security Bearer
-func (e SysDictType) GetPage(c *gin.Context) {
-	s := service.SysDictType{}
-	req :=dto.SysDictTypeGetPageReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.Form).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-	list := make([]models.SysDictType, 0)
-	var count int64
-	err = s.GetPage(&req, &list, &count)
-	if err != nil {
-		e.Error(500, err, "查询失败")
-		return
-	}
-	e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
-}
-
-// Get 字典类型通过字典id获取
-// @Summary 字典类型通过字典id获取
-// @Description 获取JSON
-// @Tags 字典类型
-// @Param dictId path int true "字典类型编码"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/dict/type/{dictId} [get]
-// @Security Bearer
-func (e SysDictType) Get(c *gin.Context) {
-	s := service.SysDictType{}
-	req :=dto.SysDictTypeGetReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, nil).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-	var object models.SysDictType
-	err = s.Get(&req, &object)
-	if err != nil {
-		e.Error(500, err, "查询失败")
-		return
-	}
-	e.OK(object, "查询成功")
-}
-
-//Insert 字典类型创建
-// @Summary 添加字典类型
-// @Description 获取JSON
-// @Tags 字典类型
-// @Accept  application/json
-// @Product application/json
-// @Param data body dto.SysDictTypeInsertReq true "data"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/dict/type [post]
-// @Security Bearer
-func (e SysDictType) Insert(c *gin.Context) {
-	s := service.SysDictType{}
-	req :=dto.SysDictTypeInsertReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.JSON).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-	req.SetCreateBy(user.GetUserId(c))
-	err = s.Insert(&req)
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err,fmt.Sprintf(" 创建字典类型失败，详情：%s", err.Error()))
-		return
-	}
-	e.OK(req.GetId(), "创建成功")
-}
-
-// Update
-// @Summary 修改字典类型
-// @Description 获取JSON
-// @Tags 字典类型
-// @Accept  application/json
-// @Product application/json
-// @Param data body dto.SysDictTypeUpdateReq true "body"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/dict/type/{dictId} [put]
-// @Security Bearer
-func (e SysDictType) Update(c *gin.Context) {
-	s := service.SysDictType{}
-	req :=dto.SysDictTypeUpdateReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.JSON, nil).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Error(500, err, err.Error())
-		e.Logger.Error(err)
-		return
-	}
-	req.SetUpdateBy(user.GetUserId(c))
-	err = s.Update(&req)
-	if err != nil {
-		e.Logger.Error(err)
-		return
-	}
-	e.OK(req.GetId(), "更新成功")
-}
-
-// Delete
-// @Summary 删除字典类型
-// @Description 删除数据
-// @Tags 字典类型
-// @Param dictCode body dto.SysDictTypeDeleteReq true "body"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/dict/type [delete]
-// @Security Bearer
-func (e SysDictType) Delete(c *gin.Context) {
-	s := service.SysDictType{}
-	req :=dto.SysDictTypeDeleteReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.JSON, nil).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-	req.SetUpdateBy(user.GetUserId(c))
-	err = s.Remove(&req)
-	if err != nil {
-		e.Error(500, err, err.Error())
-		return
-	}
-	e.OK(req.GetId(), "删除成功")
-}
-
-// GetAll
-// @Summary 字典类型全部数据 代码生成使用接口
-// @Description 获取JSON
-// @Tags 字典类型
-// @Param dictName query string false "dictName"
-// @Param dictId query string false "dictId"
-// @Param dictType query string false "dictType"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/dict/type-option-select [get]
-// @Security Bearer
-func (e SysDictType) GetAll(c *gin.Context) {
-	s := service.SysDictType{}
-	req :=dto.SysDictTypeGetPageReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.Form).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-	list := make([]models.SysDictType, 0)
-	err = s.GetAll(&req, &list)
-	if err != nil {
-		e.Error(500, err, err.Error())
-		return
-	}
-	e.OK(list, "查询成功")
-}

app/admin/apis/sys_file/sys_file_dir.go

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

app/admin/apis/sys_file/sys_file_info.go

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

app/admin/apis/sys_job/sys_job.go

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

app/admin/apis/sys_login_log.go

@@ -1,110 +0,0 @@
-package apis
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/gin-gonic/gin/binding"
-	"github.com/go-admin-team/go-admin-core/sdk/api"
-	"go-admin/app/admin/models"
-
-	"go-admin/app/admin/service"
-	"go-admin/app/admin/service/dto"
-)
-
-type SysLoginLog struct {
-	api.Api
-}
-
-// GetPage 登录日志列表
-// @Summary 登录日志列表
-// @Description 获取JSON
-// @Tags 登录日志
-// @Param username query string false "用户名"
-// @Param ipaddr query string false "ip地址"
-// @Param loginLocation  query string false "归属地"
-// @Param status query string false "状态"
-// @Param beginTime query string false "开始时间"
-// @Param endTime query string false "结束时间"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/sys-login-log [get]
-// @Security Bearer
-func (e SysLoginLog) GetPage(c *gin.Context) {
-	s := service.SysLoginLog{}
-	req :=dto.SysLoginLogGetPageReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.Form).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-	list := make([]models.SysLoginLog, 0)
-	var count int64
-	err = s.GetPage(&req, &list, &count)
-	if err != nil {
-		e.Error(500, err, "查询失败")
-		return
-	}
-	e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
-}
-
-// Get 登录日志通过id获取
-// @Summary 登录日志通过id获取
-// @Description 获取JSON
-// @Tags 登录日志
-// @Param id path string false "id"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/sys-login-log/{id} [get]
-// @Security Bearer
-func (e SysLoginLog) Get(c *gin.Context) {
-	s := service.SysLoginLog{}
-	req :=dto.SysLoginLogGetReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-	var object models.SysLoginLog
-	err = s.Get(&req, &object)
-	if err != nil {
-		e.Error(500, err, "查询失败")
-		return
-	}
-	e.OK(object, "查询成功")
-}
-
-// Delete 登录日志删除
-// @Summary 登录日志删除
-// @Description 登录日志删除
-// @Tags 登录日志
-// @Param data body dto.SysLoginLogDeleteReq true "body"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/sys-login-log [delete]
-// @Security Bearer
-func (e SysLoginLog) Delete(c *gin.Context) {
-	s := service.SysLoginLog{}
-	req :=dto.SysLoginLogDeleteReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.JSON, nil).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-	err = s.Remove(&req)
-	if err != nil {
-		e.Error(500, err, "删除失败")
-		return
-	}
-	e.OK(req.GetId(), "删除成功")
-}

app/admin/apis/sys_menu.go

@@ -1,287 +0,0 @@
-package apis
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/gin-gonic/gin/binding"
-	"github.com/go-admin-team/go-admin-core/sdk/api"
-	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
-	"go-admin/app/admin/models"
-
-	"go-admin/app/admin/service"
-	"go-admin/app/admin/service/dto"
-)
-
-type SysMenu struct {
-	api.Api
-}
-
-// GetPage Menu列表数据
-// @Summary Menu列表数据
-// @Description 获取JSON
-// @Tags 菜单
-// @Param menuName query string false "menuName"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/menu [get]
-// @Security Bearer
-func (e SysMenu) GetPage(c *gin.Context) {
-	s := service.SysMenu{}
-	req := dto.SysMenuGetPageReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.Form).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-	var list = make([]models.SysMenu, 0)
-	err = s.GetPage(&req, &list).Error
-	if err != nil {
-		e.Error(500, err, "查询失败")
-		return
-	}
-	e.OK(list, "查询成功")
-}
-
-// Get 获取菜单详情
-// @Summary Menu详情数据
-// @Description 获取JSON
-// @Tags 菜单
-// @Param id path string false "id"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/menu/{id} [get]
-// @Security Bearer
-func (e SysMenu) Get(c *gin.Context) {
-	req := dto.SysMenuGetReq{}
-	s := new(service.SysMenu)
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, nil).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-	var object = models.SysMenu{}
-
-	err = s.Get(&req, &object).Error
-	if err != nil {
-		e.Error(500, err, "查询失败")
-		return
-	}
-	e.OK(object, "查询成功")
-}
-
-// Insert 创建菜单
-// @Summary 创建菜单
-// @Description 获取JSON
-// @Tags 菜单
-// @Accept  application/json
-// @Product application/json
-// @Param data body dto.SysMenuInsertReq true "data"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/menu [post]
-// @Security Bearer
-func (e SysMenu) Insert(c *gin.Context) {
-	req := dto.SysMenuInsertReq{}
-	s := new(service.SysMenu)
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.JSON).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-	// 设置创建人
-	req.SetCreateBy(user.GetUserId(c))
-	err = s.Insert(&req).Error
-	if err != nil {
-		e.Error(500, err, "创建失败")
-		return
-	}
-	e.OK(req.GetId(), "创建成功")
-}
-
-// Update 修改菜单
-// @Summary 修改菜单
-// @Description 获取JSON
-// @Tags 菜单
-// @Accept  application/json
-// @Product application/json
-// @Param id path int true "id"
-// @Param data body dto.SysMenuUpdateReq true "body"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/menu/{id} [put]
-// @Security Bearer
-func (e SysMenu) Update(c *gin.Context) {
-	req := dto.SysMenuUpdateReq{}
-	s := new(service.SysMenu)
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.JSON, nil).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-
-	req.SetUpdateBy(user.GetUserId(c))
-	err = s.Update(&req).Error
-	if err != nil {
-		e.Error(500, err, "更新失败")
-		return
-	}
-	e.OK(req.GetId(), "更新成功")
-}
-
-// Delete 删除菜单
-// @Summary 删除菜单
-// @Description 删除数据
-// @Tags 菜单
-// @Param data body dto.SysMenuDeleteReq true "body"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/menu [delete]
-// @Security Bearer
-func (e SysMenu) Delete(c *gin.Context) {
-	control := new(dto.SysMenuDeleteReq)
-	s := new(service.SysMenu)
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(control, binding.JSON).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-	err = s.Remove(control).Error
-	if err != nil {
-		e.Logger.Errorf("RemoveSysMenu error, %s", err)
-		e.Error(500, err, "删除失败")
-		return
-	}
-	e.OK(control.GetId(), "删除成功")
-}
-
-// GetMenuRole 根据登录角色名称获取菜单列表数据（左菜单使用）
-// @Summary 根据登录角色名称获取菜单列表数据（左菜单使用）
-// @Description 获取JSON
-// @Tags 菜单
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/menurole [get]
-// @Security Bearer
-func (e SysMenu) GetMenuRole(c *gin.Context) {
-	s := new(service.SysMenu)
-	err := e.MakeContext(c).
-		MakeOrm().
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-
-	result, err := s.SetMenuRole(user.GetRoleName(c))
-
-	if err != nil {
-		e.Error(500, err, "查询失败")
-		return
-	}
-
-	e.OK(result, "")
-}
-
-//// GetMenuIDS 获取角色对应的菜单id数组
-//// @Summary 获取角色对应的菜单id数组，设置角色权限使用
-//// @Description 获取JSON
-//// @Tags 菜单
-//// @Param id path int true "id"
-//// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-//// @Router /api/v1/menuids/{id} [get]
-//// @Security Bearer
-//func (e SysMenu) GetMenuIDS(c *gin.Context) {
-//	s := new(service.SysMenu)
-//	r := service.SysRole{}
-//	m := dto.SysRoleByName{}
-//	err := e.MakeContext(c).
-//		MakeOrm().
-//		Bind(&m, binding.JSON).
-//		MakeService(&s.Service).
-//		MakeService(&r.Service).
-//		Errors
-//	if err != nil {
-//		e.Logger.Error(err)
-//		e.Error(500, err, err.Error())
-//		return
-//	}
-//	var data models.SysRole
-//	err = r.GetWithName(&m, &data).Error
-//
-//	//data.RoleName = c.GetString("role")
-//	//data.UpdateBy = user.GetUserId(c)
-//	//result, err := data.GetIDS(s.Orm)
-//
-//	if err != nil {
-//		e.Logger.Errorf("GetIDS error, %s", err.Error())
-//		e.Error(500, err, "获取失败")
-//		return
-//	}
-//	e.OK(result, "")
-//}
-
-// GetMenuTreeSelect 根据角色ID查询菜单下拉树结构
-// @Summary 角色修改使用的菜单列表
-// @Description 获取JSON
-// @Tags 菜单
-// @Accept  application/json
-// @Product application/json
-// @Param roleId path int true "roleId"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/menuTreeselect/{roleId} [get]
-// @Security Bearer
-func (e SysMenu) GetMenuTreeSelect(c *gin.Context) {
-	m := service.SysMenu{}
-	r := service.SysRole{}
-	req :=dto.SelectRole{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		MakeService(&m.Service).
-		MakeService(&r.Service).
-		Bind(&req, nil).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-
-	result, err := m.SetLabel()
-	if err != nil {
-		e.Error(500, err, "查询失败")
-		return
-	}
-
-	menuIds := make([]int, 0)
-	if req.RoleId != 0 {
-		menuIds, err = r.GetRoleMenuId(req.RoleId)
-		if err != nil {
-			e.Error(500, err, "")
-			return
-		}
-	}
-	e.OK(gin.H{
-		"menus":       result,
-		"checkedKeys": menuIds,
-	}, "获取成功")
-}

app/admin/apis/sys_opera_log.go

@@ -1,118 +0,0 @@
-package apis
-
-import (
-	"fmt"
-	"github.com/gin-gonic/gin"
-	"github.com/gin-gonic/gin/binding"
-	"github.com/go-admin-team/go-admin-core/sdk/api"
-	"go-admin/app/admin/models"
-	"go-admin/app/admin/service"
-	"go-admin/app/admin/service/dto"
-)
-
-type SysOperaLog struct {
-	api.Api
-}
-
-// GetPage 操作日志列表
-// @Summary 操作日志列表
-// @Description 获取JSON
-// @Tags 操作日志
-// @Param title query string false "title"
-// @Param method query string false "method"
-// @Param requestMethod  query string false "requestMethod"
-// @Param operUrl query string false "operUrl"
-// @Param operIp query string false "operIp"
-// @Param status query string false "status"
-// @Param beginTime query string false "beginTime"
-// @Param endTime query string false "endTime"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/sys-opera-log [get]
-// @Security Bearer
-func (e SysOperaLog) GetPage(c *gin.Context) {
-	s := service.SysOperaLog{}
-	req := new(dto.SysOperaLogGetPageReq)
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(req, binding.Form).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-
-	list := make([]models.SysOperaLog, 0)
-	var count int64
-
-	err = s.GetPage(req, &list, &count)
-	if err != nil {
-		e.Error(500, err, "查询失败")
-		return
-	}
-
-	e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
-}
-
-// Get 操作日志通过id获取
-// @Summary 操作日志通过id获取
-// @Description 获取JSON
-// @Tags 操作日志
-// @Param id path string false "id"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/sys-opera-log/{id} [get]
-// @Security Bearer
-func (e SysOperaLog) Get(c *gin.Context) {
-	s := new(service.SysOperaLog)
-	req :=dto.SysOperaLogGetReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, nil).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-	var object models.SysOperaLog
-	err = s.Get(&req, &object)
-	if err != nil {
-		e.Error(500, err, "查询失败")
-		return
-	}
-	e.OK(object, "查询成功")
-}
-
-// Delete 操作日志删除
-// DeleteSysMenu 操作日志删除
-// @Summary 删除操作日志
-// @Description 删除数据
-// @Tags 操作日志
-// @Param data body dto.SysOperaLogDeleteReq true "body"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/sys-opera-log [delete]
-// @Security Bearer
-func (e SysOperaLog) Delete(c *gin.Context) {
-	s := new(service.SysOperaLog)
-	req :=dto.SysOperaLogDeleteReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.JSON).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-
-	err = s.Remove(&req)
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500,err, fmt.Sprintf("删除失败！错误详情：%s", err.Error()))
-		return
-	}
-	e.OK(req.GetId(), "删除成功")
-}

app/admin/apis/sys_post.go

@@ -1,184 +0,0 @@
-package apis
-
-import (
-	"fmt"
-	
-	"github.com/gin-gonic/gin"
-	"github.com/gin-gonic/gin/binding"
-	"github.com/go-admin-team/go-admin-core/sdk/api"
-	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
-	_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
-
-	"go-admin/app/admin/models"
-	"go-admin/app/admin/service"
-	"go-admin/app/admin/service/dto"
-)
-
-type SysPost struct {
-	api.Api
-}
-
-// GetPage
-// @Summary 岗位列表数据
-// @Description 获取JSON
-// @Tags 岗位
-// @Param postName query string false "postName"
-// @Param postCode query string false "postCode"
-// @Param postId query string false "postId"
-// @Param status query string false "status"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/post [get]
-// @Security Bearer
-func (e SysPost) GetPage(c *gin.Context) {
-	s := service.SysPost{}
-	req :=dto.SysPostPageReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.Form).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-
-	list := make([]models.SysPost, 0)
-	var count int64
-
-	err = s.GetPage(&req, &list, &count)
-	if err != nil {
-		e.Error(500, err, "查询失败")
-		return
-	}
-
-	e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
-}
-
-// Get
-// @Summary 获取岗位信息
-// @Description 获取JSON
-// @Tags 岗位
-// @Param id path int true "编码"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/post/{postId} [get]
-// @Security Bearer
-func (e SysPost) Get(c *gin.Context) {
-	s := service.SysPost{}
-	req :=dto.SysPostGetReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, nil).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-	var object models.SysPost
-
-	err = s.Get(&req, &object)
-	if err != nil {
-		e.Error(500, err, fmt.Sprintf("岗位信息获取失败！错误详情：%s", err.Error()))
-		return
-	}
-
-	e.OK(object, "查询成功")
-}
-
-// Insert
-// @Summary 添加岗位
-// @Description 获取JSON
-// @Tags 岗位
-// @Accept  application/json
-// @Product application/json
-// @Param data body dto.SysPostInsertReq true "data"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/post [post]
-// @Security Bearer
-func (e SysPost) Insert(c *gin.Context) {
-	s := service.SysPost{}
-	req :=dto.SysPostInsertReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.JSON).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-	req.SetCreateBy(user.GetUserId(c))
-	err = s.Insert(&req)
-	if err != nil {
-		e.Error(500, err, fmt.Sprintf("新建岗位失败！错误详情：%s", err.Error()))
-		return
-	}
-	e.OK(req.GetId(), "创建成功")
-}
-
-// Update
-// @Summary 修改岗位
-// @Description 获取JSON
-// @Tags 岗位
-// @Accept  application/json
-// @Product application/json
-// @Param data body dto.SysPostUpdateReq true "body"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/post/{id} [put]
-// @Security Bearer
-func (e SysPost) Update(c *gin.Context) {
-	s := service.SysPost{}
-	req :=dto.SysPostUpdateReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.JSON, nil).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-
-	req.SetUpdateBy(user.GetUserId(c))
-
-	err = s.Update(&req)
-	if err != nil {
-		e.Error(500, err, fmt.Sprintf("岗位更新失败！错误详情：%s", err.Error()))
-		return
-	}
-	e.OK(req.GetId(), "更新成功")
-}
-
-// Delete
-// @Summary 删除岗位
-// @Description 删除数据
-// @Tags 岗位
-// @Param id body dto.SysPostDeleteReq true "请求参数"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/post [delete]
-// @Security Bearer
-func (e SysPost) Delete(c *gin.Context) {
-	s := service.SysPost{}
-	req :=dto.SysPostDeleteReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.JSON).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-	req.SetUpdateBy(user.GetUserId(c))
-	err = s.Remove(&req)
-	if err != nil {
-		e.Error(500, err, fmt.Sprintf("岗位删除失败！错误详情：%s", err.Error()))
-		return
-	}
-	e.OK(req.GetId(), "删除成功")
-}

app/admin/apis/sys_role.go

@@ -1,284 +0,0 @@
-package apis
-
-import (
-	"fmt"
-	"go-admin/common/global"
-	"net/http"
-
-	"github.com/gin-gonic/gin/binding"
-	"github.com/go-admin-team/go-admin-core/sdk"
-	"go-admin/app/admin/models"
-
-	"github.com/gin-gonic/gin"
-	"github.com/go-admin-team/go-admin-core/sdk/api"
-	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
-	_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
-
-	"go-admin/app/admin/service"
-	"go-admin/app/admin/service/dto"
-)
-
-type SysRole struct {
-	api.Api
-}
-
-// GetPage
-// @Summary 角色列表数据
-// @Description Get JSON
-// @Tags 角色/Role
-// @Param roleName query string false "roleName"
-// @Param status query string false "status"
-// @Param roleKey query string false "roleKey"
-// @Param pageSize query int false "页条数"
-// @Param pageIndex query int false "页码"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/role [get]
-// @Security Bearer
-func (e SysRole) GetPage(c *gin.Context) {
-	s := service.SysRole{}
-	req := dto.SysRoleGetPageReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.Form).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-
-	list := make([]models.SysRole, 0)
-	var count int64
-
-	err = s.GetPage(&req, &list, &count)
-	if err != nil {
-		e.Error(500, err, "查询失败")
-		return
-	}
-
-	e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
-}
-
-// Get
-// @Summary 获取Role数据
-// @Description 获取JSON
-// @Tags 角色/Role
-// @Param roleId path string false "roleId"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/role/{id} [get]
-// @Security Bearer
-func (e SysRole) Get(c *gin.Context) {
-	s := service.SysRole{}
-	req := dto.SysRoleGetReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, nil).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, fmt.Sprintf(" %s ", err.Error()))
-		return
-	}
-
-	var object models.SysRole
-
-	err = s.Get(&req, &object)
-	if err != nil {
-		e.Error(http.StatusUnprocessableEntity, err, "查询失败")
-		return
-	}
-
-	e.OK(object, "查询成功")
-}
-
-// Insert
-// @Summary 创建角色
-// @Description 获取JSON
-// @Tags 角色/Role
-// @Accept  application/json
-// @Product application/json
-// @Param data body dto.SysRoleInsertReq true "data"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/role [post]
-// @Security Bearer
-func (e SysRole) Insert(c *gin.Context) {
-	s := service.SysRole{}
-	req := dto.SysRoleInsertReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.JSON).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-
-	// 设置创建人
-	req.CreateBy = user.GetUserId(c)
-	if req.Status == "" {
-		req.Status = "2"
-	}
-	cb := sdk.Runtime.GetCasbinKey(c.Request.Host)
-	err = s.Insert(&req, cb)
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, "创建失败,"+err.Error())
-		return
-	}
-	_, err = global.LoadPolicy(c)
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, "创建失败,"+err.Error())
-		return
-	}
-	e.OK(req.GetId(), "创建成功")
-}
-
-// Update 修改用户角色
-// @Summary 修改用户角色
-// @Description 获取JSON
-// @Tags 角色/Role
-// @Accept  application/json
-// @Product application/json
-// @Param data body dto.SysRoleUpdateReq true "body"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/role/{id} [put]
-// @Security Bearer
-func (e SysRole) Update(c *gin.Context) {
-	s := service.SysRole{}
-	req := dto.SysRoleUpdateReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, nil, binding.JSON).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-	cb := sdk.Runtime.GetCasbinKey(c.Request.Host)
-
-	req.SetUpdateBy(user.GetUserId(c))
-
-	err = s.Update(&req, cb)
-	if err != nil {
-		e.Logger.Error(err)
-		return
-	}
-
-	_, err = global.LoadPolicy(c)
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, "更新失败,"+err.Error())
-		return
-	}
-
-	e.OK(req.GetId(), "更新成功")
-}
-
-// Delete
-// @Summary 删除用户角色
-// @Description 删除数据
-// @Tags 角色/Role
-// @Param data body dto.SysRoleDeleteReq true "body"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/role [delete]
-// @Security Bearer
-func (e SysRole) Delete(c *gin.Context) {
-	s := new(service.SysRole)
-	req := dto.SysRoleDeleteReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.JSON).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, fmt.Sprintf("删除角色 %v 失败，\r\n失败信息 %s", req.Ids, err.Error()))
-		return
-	}
-
-	cb := sdk.Runtime.GetCasbinKey(c.Request.Host)
-	err = s.Remove(&req, cb)
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, "")
-		return
-	}
-
-	e.OK(req.GetId(), fmt.Sprintf("删除角色角色 %v 状态成功！", req.GetId()))
-}
-
-// Update2Status 修改用户角色状态
-// @Summary 修改用户角色
-// @Description 获取JSON
-// @Tags 角色/Role
-// @Accept  application/json
-// @Product application/json
-// @Param data body dto.UpdateStatusReq true "body"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/role-status/{id} [put]
-// @Security Bearer
-func (e SysRole) Update2Status(c *gin.Context) {
-	s := service.SysRole{}
-	req := dto.UpdateStatusReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.JSON, nil).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, fmt.Sprintf("更新角色状态失败，失败原因：%s ", err.Error()))
-		return
-	}
-	req.SetUpdateBy(user.GetUserId(c))
-	err = s.UpdateStatus(&req)
-	if err != nil {
-		e.Error(500, err, fmt.Sprintf("更新角色状态失败，失败原因：%s ", err.Error()))
-		return
-	}
-	e.OK(req.GetId(), fmt.Sprintf("更新角色 %v 状态成功！", req.GetId()))
-}
-
-// Update2DataScope 更新角色数据权限
-// @Summary 更新角色数据权限
-// @Description 获取JSON
-// @Tags 角色/Role
-// @Accept  application/json
-// @Product application/json
-// @Param data body dto.RoleDataScopeReq true "body"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/role-status/{id} [put]
-// @Security Bearer
-func (e SysRole) Update2DataScope(c *gin.Context) {
-	s := service.SysRole{}
-	req := dto.RoleDataScopeReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.JSON, nil).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-	data := &models.SysRole{
-		RoleId:    req.RoleId,
-		DataScope: req.DataScope,
-		DeptIds:   req.DeptIds,
-	}
-	data.UpdateBy = user.GetUserId(c)
-	err = s.UpdateDataScope(&req).Error
-	if err != nil {
-		e.Error(500, err, fmt.Sprintf("更新角色数据权限失败！错误详情：%s", err.Error()))
-		return
-	}
-	e.OK(nil, "操作成功")
-}

app/admin/apis/sys_user.go

@@ -1,459 +0,0 @@
-package apis
-
-import (
-	"github.com/gin-gonic/gin/binding"
-	"go-admin/app/admin/models"
-	"golang.org/x/crypto/bcrypt"
-	"net/http"
-
-	"github.com/gin-gonic/gin"
-	"github.com/go-admin-team/go-admin-core/sdk/api"
-	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
-	_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
-	"github.com/google/uuid"
-
-	"go-admin/app/admin/service"
-	"go-admin/app/admin/service/dto"
-	"go-admin/common/actions"
-)
-
-type SysUser struct {
-	api.Api
-}
-
-// GetPage
-// @Summary 列表用户信息数据
-// @Description 获取JSON
-// @Tags 用户
-// @Param username query string false "username"
-// @Success 200 {string} {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/sys-user [get]
-// @Security Bearer
-func (e SysUser) GetPage(c *gin.Context) {
-	s := service.SysUser{}
-	req := dto.SysUserGetPageReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-
-	//数据权限检查
-	p := actions.GetPermissionFromContext(c)
-
-	list := make([]models.SysUser, 0)
-	var count int64
-
-	err = s.GetPage(&req, p, &list, &count)
-	if err != nil {
-		e.Error(500, err, "查询失败")
-		return
-	}
-
-	e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
-}
-
-// Get
-// @Summary 获取用户
-// @Description 获取JSON
-// @Tags 用户
-// @Param userId path int true "用户编码"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/sys-user/{userId} [get]
-// @Security Bearer
-func (e SysUser) Get(c *gin.Context) {
-	s := service.SysUser{}
-	req := dto.SysUserById{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, nil).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-	var object models.SysUser
-	//数据权限检查
-	p := actions.GetPermissionFromContext(c)
-	err = s.Get(&req, p, &object)
-	if err != nil {
-		e.Error(http.StatusUnprocessableEntity, err, "查询失败")
-		return
-	}
-	e.OK(object, "查询成功")
-}
-
-// Insert
-// @Summary 创建用户
-// @Description 获取JSON
-// @Tags 用户
-// @Accept  application/json
-// @Product application/json
-// @Param data body dto.SysUserInsertReq true "用户数据"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/sys-user [post]
-// @Security Bearer
-func (e SysUser) Insert(c *gin.Context) {
-	s := service.SysUser{}
-	req := dto.SysUserInsertReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.JSON).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-	// 设置创建人
-	req.SetCreateBy(user.GetUserId(c))
-	err = s.Insert(&req)
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-
-	e.OK(req.GetId(), "创建成功")
-}
-
-// Update
-// @Summary 修改用户数据
-// @Description 获取JSON
-// @Tags 用户
-// @Accept  application/json
-// @Product application/json
-// @Param data body dto.SysUserUpdateReq true "body"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/sys-user/{userId} [put]
-// @Security Bearer
-func (e SysUser) Update(c *gin.Context) {
-	s := service.SysUser{}
-	req := dto.SysUserUpdateReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-
-	req.SetUpdateBy(user.GetUserId(c))
-
-	//数据权限检查
-	p := actions.GetPermissionFromContext(c)
-
-	err = s.Update(&req, p)
-	if err != nil {
-		e.Logger.Error(err)
-		return
-	}
-	e.OK(req.GetId(), "更新成功")
-}
-
-// Delete
-// @Summary 删除用户数据
-// @Description 删除数据
-// @Tags 用户
-// @Param userId path int true "userId"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/sys-user/{userId} [delete]
-// @Security Bearer
-func (e SysUser) Delete(c *gin.Context) {
-	s := service.SysUser{}
-	req := dto.SysUserById{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.JSON).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-
-	// 设置编辑人
-	req.SetUpdateBy(user.GetUserId(c))
-
-	// 数据权限检查
-	p := actions.GetPermissionFromContext(c)
-
-	err = s.Remove(&req, p)
-	if err != nil {
-		e.Logger.Error(err)
-		return
-	}
-	e.OK(req.GetId(), "删除成功")
-}
-
-// InsetAvatar
-// @Summary 修改头像
-// @Description 获取JSON
-// @Tags 个人中心
-// @Accept multipart/form-data
-// @Param file formData file true "file"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/user/avatar [post]
-// @Security Bearer
-func (e SysUser) InsetAvatar(c *gin.Context) {
-	s := service.SysUser{}
-	req := dto.UpdateSysUserAvatarReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-	// 数据权限检查
-	p := actions.GetPermissionFromContext(c)
-	form, _ := c.MultipartForm()
-	files := form.File["upload[]"]
-	guid := uuid.New().String()
-	filPath := "static/uploadfile/" + guid + ".jpg"
-	for _, file := range files {
-		e.Logger.Debugf("upload avatar file: %s", file.Filename)
-		// 上传文件至指定目录
-		err = c.SaveUploadedFile(file, filPath)
-		if err != nil {
-			e.Logger.Errorf("save file error, %s", err.Error())
-			e.Error(500, err, "")
-			return
-		}
-	}
-	req.UserId = p.UserId
-	req.Avatar = "/" + filPath
-
-	err = s.UpdateAvatar(&req, p)
-	if err != nil {
-		e.Logger.Error(err)
-		return
-	}
-	e.OK(filPath, "修改成功")
-}
-
-// UpdateStatus 修改用户状态
-// @Summary 修改用户状态
-// @Description 获取JSON
-// @Tags 用户
-// @Accept  application/json
-// @Product application/json
-// @Param data body dto.UpdateSysUserStatusReq true "body"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/user/status [put]
-// @Security Bearer
-func (e SysUser) UpdateStatus(c *gin.Context) {
-	s := service.SysUser{}
-	req := dto.UpdateSysUserStatusReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.JSON, nil).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-
-	req.SetUpdateBy(user.GetUserId(c))
-
-	//数据权限检查
-	p := actions.GetPermissionFromContext(c)
-
-	err = s.UpdateStatus(&req, p)
-	if err != nil {
-		e.Logger.Error(err)
-		return
-	}
-	e.OK(req.GetId(), "更新成功")
-}
-
-// ResetPwd 重置用户密码
-// @Summary 重置用户密码
-// @Description 获取JSON
-// @Tags 用户
-// @Accept  application/json
-// @Product application/json
-// @Param data body dto.ResetSysUserPwdReq true "body"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/user/pwd/reset [put]
-// @Security Bearer
-func (e SysUser) ResetPwd(c *gin.Context) {
-	s := service.SysUser{}
-	req := dto.ResetSysUserPwdReq{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req, binding.JSON).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-
-	req.SetUpdateBy(user.GetUserId(c))
-
-	//数据权限检查
-	p := actions.GetPermissionFromContext(c)
-
-	err = s.ResetPwd(&req, p)
-	if err != nil {
-		e.Logger.Error(err)
-		return
-	}
-	e.OK(req.GetId(), "更新成功")
-}
-
-// UpdatePwd
-// @Summary 修改密码
-// @Description 获取JSON
-// @Tags 用户
-// @Accept  application/json
-// @Product application/json
-// @Param data body dto.PassWord true "body"
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/user/pwd/set [put]
-// @Security Bearer
-func (e SysUser) UpdatePwd(c *gin.Context) {
-	s := service.SysUser{}
-	req := dto.PassWord{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		Bind(&req).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-
-	// 数据权限检查
-	p := actions.GetPermissionFromContext(c)
-	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, "密码修改成功")
-}
-
-// GetProfile
-// @Summary 获取个人中心用户
-// @Description 获取JSON
-// @Tags 个人中心
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/user/profile [get]
-// @Security Bearer
-func (e SysUser) GetProfile(c *gin.Context) {
-	s := service.SysUser{}
-	req := dto.SysUserById{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-
-	req.Id = user.GetUserId(c)
-
-	sysUser := models.SysUser{}
-	roles := make([]models.SysRole, 0)
-	posts := make([]models.SysPost, 0)
-	err = s.GetProfile(&req, &sysUser, &roles, &posts)
-	if err != nil {
-		e.Logger.Errorf("get user profile error, %s", err.Error())
-		e.Error(500, err, "获取用户信息失败")
-		return
-	}
-	e.OK(gin.H{
-		"user":  sysUser,
-		"roles": roles,
-		"posts": posts,
-	}, "查询成功")
-}
-
-// GetInfo
-// @Summary 获取个人信息
-// @Description 获取JSON
-// @Tags 个人中心
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/getinfo [get]
-// @Security Bearer
-func (e SysUser) GetInfo(c *gin.Context) {
-	req := dto.SysUserById{}
-	s := service.SysUser{}
-	r := service.SysRole{}
-	err := e.MakeContext(c).
-		MakeOrm().
-		MakeService(&r.Service).
-		MakeService(&s.Service).
-		Errors
-	if err != nil {
-		e.Logger.Error(err)
-		e.Error(500, err, err.Error())
-		return
-	}
-	p := actions.GetPermissionFromContext(c)
-	var roles = make([]string, 1)
-	roles[0] = user.GetRoleName(c)
-	var permissions = make([]string, 1)
-	permissions[0] = "*:*:*"
-	var buttons = make([]string, 1)
-	buttons[0] = "*:*:*"
-
-	var mp = make(map[string]interface{})
-	mp["roles"] = roles
-	if user.GetRoleName(c) == "admin" || user.GetRoleName(c) == "系统管理员" {
-		mp["permissions"] = permissions
-		mp["buttons"] = buttons
-	} else {
-		list, _ := r.GetById(user.GetRoleId(c))
-		mp["permissions"] = list
-		mp["buttons"] = list
-	}
-	sysUser := models.SysUser{}
-	req.Id = user.GetUserId(c)
-	err = s.Get(&req, p, &sysUser)
-	if err != nil {
-		e.Error(http.StatusUnauthorized, err, "登录失败")
-		return
-	}
-	mp["introduction"] = " am a super administrator"
-	mp["avatar"] = "https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif"
-	if sysUser.Avatar != "" {
-		mp["avatar"] = sysUser.Avatar
-	}
-	mp["userName"] = sysUser.NickName
-	mp["userId"] = sysUser.UserId
-	mp["deptId"] = sysUser.DeptId
-	mp["name"] = sysUser.NickName
-	mp["code"] = 200
-	e.OK(mp, "")
-}

app/admin/apis/sys_user/sys_user.go

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

app/admin/apis/system/captcha.go

@@ -0,0 +1,28 @@
+package system
+
+import (
+	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/captcha"
+	"go-admin/common/apis"
+)
+
+type System struct {
+	apis.Api
+}
+
+func (e System) GenerateCaptchaHandler(c *gin.Context) {
+	e.Context = c
+	log := e.GetLogger()
+	id, b64s, err := captcha.DriverDigitFunc()
+	if err != nil {
+		log.Errorf("DriverDigitFunc error, %s", err.Error())
+		e.Error(500, err, "验证码获取失败")
+		return
+	}
+	e.Custom(gin.H{
+		"code": 200,
+		"data": b64s,
+		"id":   id,
+		"msg":  "success",
+	})
+}

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

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

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

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

app/admin/apis/system/index.go

@@ -1,4 +1,4 @@
-package apis
+package system
 
 import (
 	"github.com/gin-gonic/gin"
@@ -17,7 +17,7 @@ body{
   overflow-y:hidden
 }
 </style>
-<script src="https://libs.baidu.com/jquery/1.9.0/jquery.js"></script>
+<script src="http://libs.baidu.com/jquery/1.9.0/jquery.js"></script>
 <script type="text/javascript"> 
 window.onerror=function(){return true;} 
 $(function(){ 
@@ -33,7 +33,7 @@ $(function(){
 </html>
 `
 
-func GoAdmin(c *gin.Context) {
+func HelloWorld(c *gin.Context) {
 	c.Header("Content-Type", "text/html; charset=utf-8")
 	c.String(200, INDEX)
 }

app/admin/apis/system/settings.go

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

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

@@ -0,0 +1,277 @@
+package sys_config
+
+import (
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
+
+	"go-admin/app/admin/models/system"
+	"go-admin/app/admin/service"
+	"go-admin/app/admin/service/dto"
+	"go-admin/common/apis"
+)
+
+type SysConfig struct {
+	apis.Api
+}
+
+func (e SysConfig) GetSysConfigList(c *gin.Context) {
+	e.Context = c
+	log := e.GetLogger()
+	d := new(dto.SysConfigSearch)
+	db, err := e.GetOrm()
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//查询列表
+	err = d.Bind(c)
+	if err != nil {
+		log.Errorf("参数验证失败, error:%s", err)
+		e.Error(500, err, "参数验证失败")
+		return
+	}
+
+	list := make([]system.SysConfig, 0)
+	var count int64
+	s := service.SysConfig{}
+	s.Log = log
+	s.Orm = db
+	err = s.GetSysConfigPage(d, &list, &count)
+	if err != nil {
+		log.Errorf("GetSysConfigPage 查询失败, error:%s", err)
+		e.Error(500, err, "查询失败")
+		return
+	}
+	e.PageOK(list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功")
+}
+
+// GetSysConfigBySysApp 获取系统配置信息，主要注意这里不在验证数据权限
+func (e SysConfig) GetSysConfigBySysApp(c *gin.Context) {
+	e.Context = c
+	log := e.GetLogger()
+	d := new(dto.SysConfigSearch)
+	db, err := e.GetOrm()
+	if err != nil {
+		log.Error(err)
+		return
+	}
+	err = d.Bind(c)
+	if err != nil {
+		log.Errorf("参数验证失败, error:%s", err)
+		e.Error(500, err, "参数验证失败")
+		return
+	}
+
+	// 控制只读前台的数据
+	d.IsFrontend = 1
+
+	list := make([]system.SysConfig, 0)
+	s := service.SysConfig{}
+	s.Log = log
+	s.Orm = db
+	err = s.GetSysConfigByKey(d, &list)
+	if err != nil {
+		log.Errorf("GetSysConfigPage 查询失败, error:%s", err)
+		e.Error(500, err, "查询失败")
+		return
+	}
+	mp := make(map[string]string)
+	for i := 0; i < len(list); i++ {
+		key := list[i].ConfigKey
+		if key != "" {
+			mp[key] = list[i].ConfigValue
+		}
+	}
+	e.OK(mp, "查询成功")
+}
+
+func (e SysConfig) GetSysConfig(c *gin.Context) {
+	e.Context = c
+	log := e.GetLogger()
+	control := new(dto.SysConfigById)
+	db, err := e.GetOrm()
+	if err != nil {
+		log.Error(err)
+		return
+	}
+	//查看详情
+	err = control.Bind(c)
+	if err != nil {
+		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
+		log.Errorf("Orm获取失败, error:%s", err)
+		e.Error(500, err, "Orm获取失败")
+		return
+	}
+	var object system.SysConfig
+
+	serviceSysLoginLog := service.SysConfig{}
+	serviceSysLoginLog.Log = log
+	serviceSysLoginLog.Orm = db
+	err = serviceSysLoginLog.GetSysConfig(control, &object)
+	if err != nil {
+		e.Error(http.StatusUnprocessableEntity, err, "查询失败")
+		log.Errorf("Orm获取失败, error:%s", err)
+		e.Error(500, err, "Orm获取失败")
+		return
+	}
+
+	e.OK(object, "查看成功")
+}
+
+func (e SysConfig) InsertSysConfig(c *gin.Context) {
+	e.Context = c
+	log := e.GetLogger()
+	control := new(dto.SysConfigControl)
+	db, err := e.GetOrm()
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//新增操作
+	err = control.Bind(c)
+	if err != nil {
+		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
+		log.Errorf("Orm获取失败, error:%s", err)
+		e.Error(500, err, "Orm获取失败")
+		return
+	}
+	object, err := control.Generate()
+	if err != nil {
+		e.Error(http.StatusInternalServerError, err, "模型生成失败")
+		log.Errorf("Orm获取失败, error:%s", err)
+		e.Error(500, err, "Orm获取失败")
+		return
+	}
+	// 设置创建人
+	object.SetCreateBy(user.GetUserId(c))
+
+	serviceSysLoginLog := service.SysConfig{}
+	serviceSysLoginLog.Orm = db
+	serviceSysLoginLog.Log = log
+	err = serviceSysLoginLog.InsertSysConfig(object)
+	if err != nil {
+		log.Error(err)
+		e.Error(http.StatusInternalServerError, err, "创建失败")
+		log.Errorf("Orm获取失败, error:%s", err)
+		e.Error(500, err, "Orm获取失败")
+		return
+	}
+
+	e.OK(object.GetId(), "创建成功")
+}
+
+func (e SysConfig) UpdateSysConfig(c *gin.Context) {
+	e.Context = c
+	log := e.GetLogger()
+	control := new(dto.SysConfigControl)
+	db, err := e.GetOrm()
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//更新操作
+	err = control.Bind(c)
+
+	if err != nil {
+		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
+		log.Errorf("Orm获取失败, error:%s", err)
+		e.Error(500, err, "Orm获取失败")
+		return
+	}
+	object, err := control.Generate()
+	if err != nil {
+		e.Error(http.StatusInternalServerError, err, "模型生成失败")
+		log.Errorf("Orm获取失败, error:%s", err)
+		e.Error(500, err, "Orm获取失败")
+		return
+	}
+	object.SetUpdateBy(user.GetUserId(c))
+
+	serviceSysLoginLog := service.SysConfig{}
+	serviceSysLoginLog.Orm = db
+	serviceSysLoginLog.Log = log
+	err = serviceSysLoginLog.UpdateSysConfig(object)
+	if err != nil {
+		e.Error(http.StatusUnprocessableEntity, err, "更新失败")
+		log.Errorf("Orm获取失败, error:%s", err)
+		e.Error(500, err, "Orm获取失败")
+		return
+	}
+	e.OK(object.GetId(), "更新成功")
+}
+
+func (e SysConfig) DeleteSysConfig(c *gin.Context) {
+	e.Context = c
+	log := e.GetLogger()
+	control := new(dto.SysConfigById)
+	db, err := e.GetOrm()
+	if err != nil {
+		log.Error(err)
+		return
+	}
+
+	//删除操作
+	err = control.Bind(c)
+	if err != nil {
+		log.Errorf("Bind error: %s", err)
+		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
+		log.Errorf("Orm获取失败, error:%s", err)
+		e.Error(500, err, "Orm获取失败")
+		return
+	}
+	object, err := control.GenerateM()
+	if err != nil {
+		e.Error(http.StatusInternalServerError, err, "模型生成失败")
+		log.Errorf("Orm获取失败, error:%s", err)
+		e.Error(500, err, "Orm获取失败")
+		return
+	}
+
+	// 设置编辑人
+	object.SetUpdateBy(user.GetUserId(c))
+
+	serviceSysLoginLog := service.SysConfig{}
+	serviceSysLoginLog.Orm = db
+	serviceSysLoginLog.Log = log
+	err = serviceSysLoginLog.RemoveSysConfig(control, object)
+	if err != nil {
+		e.Error(http.StatusUnprocessableEntity, err, "删除失败")
+		log.Errorf("Orm获取失败, error:%s", err)
+		e.Error(500, err, "Orm获取失败")
+		return
+	}
+	e.OK(object.GetId(), "删除成功")
+}
+
+// GetSysConfigByKEYForService 根据Key获取SysConfig的Service
+func (e SysConfig) GetSysConfigByKEYForService(c *gin.Context) {
+	e.Context = c
+	log := e.GetLogger()
+	db, err := e.GetOrm()
+	if err != nil {
+		log.Error(err)
+		return
+	}
+	var v dto.SysConfigControl
+	err = v.Bind(c)
+	if err != nil {
+		log.Errorf("参数验证错误, error:%s", err)
+		e.Error(422, err, "参数验证失败")
+		return
+	}
+	s := service.SysConfig{}
+	s.Log = log
+	s.Orm = db
+	err = s.GetSysConfigByKEY(&v)
+	if err != nil {
+		log.Errorf("通过Key获取配置失败, error:%s", err)
+		e.Error(500, err, "")
+		return
+	}
+	e.OK(v, s.Msg)
+}

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

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

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

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

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

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

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

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

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

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

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

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

app/admin/apis/tools/dbcolumns.go

@@ -1,23 +1,24 @@
 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/other/models/tools"
+	"go-admin/app/admin/models/tools"
 )
 
-// GetDBColumnList 分页列表数据
 // @Summary 分页列表数据 / page list data
 // @Description 数据库表列分页列表 / database table column page list
-// @Tags 工具 / 生成工具
+// @Tags 工具 / Tools
 // @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/db/columns/page [get]
-func (e Gen) GetDBColumnList(c *gin.Context) {
+func (e *Gen) GetDBColumnList(c *gin.Context) {
 	e.Context = c
 	log := e.GetLogger()
 	var data tools.DBColumns
@@ -36,7 +37,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(500, err, "数据库连接获取失败")
+		e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
 		return
 	}
 

app/admin/apis/tools/dbtables.go

@@ -2,24 +2,25 @@ 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/other/models/tools"
+	"go-admin/app/admin/models/tools"
 )
 
-// GetDBTableList 分页列表数据
 // @Summary 分页列表数据 / page list data
 // @Description 数据库表分页列表 / database table page list
-// @Tags 工具 / 生成工具
+// @Tags 工具 / Tools
 // @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/db/tables/page [get]
-func (e Gen) GetDBTableList(c *gin.Context) {
+func (e *Gen) GetDBTableList(c *gin.Context) {
 	//var res response.Response
 	var data tools.DBTables
 	var err error
@@ -31,6 +32,7 @@ func (e Gen) GetDBTableList(c *gin.Context) {
 		err = errors.New("对不起，sqlite3 或 postgres 不支持代码生成！")
 		log.Warn(err)
 		e.Error(403, err, "")
+		//c.JSON(http.StatusOK, res.ReturnError(500))
 		return
 	}
 
@@ -45,7 +47,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(500, err, "数据库连接获取失败")
+		e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
 		return
 	}
 

app/admin/apis/tools/gen.go

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

app/admin/apis/tools/systables.go

@@ -1,31 +1,31 @@
 package tools
 
 import (
+	"net/http"
 	"strings"
 
 	"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"
 	"gorm.io/gorm"
 
-	"go-admin/app/other/models/tools"
+	"go-admin/app/admin/models/tools"
+	"go-admin/common/apis"
 )
 
 type SysTable struct {
-	api.Api
+	apis.Api
 }
 
-// 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) GetPage(c *gin.Context) {
+func (e *SysTable) GetSysTableList(c *gin.Context) {
 	e.Context = c
 	log := e.GetLogger()
 	var data tools.SysTables
@@ -44,7 +44,7 @@ func (e SysTable) GetPage(c *gin.Context) {
 	db, err := e.GetOrm()
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		e.Error(500, err, "数据库连接获取失败")
+		e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
 		return
 	}
 
@@ -59,27 +59,26 @@ func (e SysTable) GetPage(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) Get(c *gin.Context) {
+func (e *SysTable) GetSysTables(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(500, err, "数据库连接获取失败")
+		e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
 		return
 	}
 
 	var data tools.SysTables
 	data.TableId, _ = pkg.StringToInt(c.Param("tableId"))
-	result, err := data.Get(db,true)
+	result, err := data.Get(db)
 	if err != nil {
 		log.Errorf("Get error, %s", err.Error())
 		e.Error(500, err, "")
@@ -92,13 +91,13 @@ func (e SysTable) Get(c *gin.Context) {
 	e.OK(mp, "")
 }
 
-func (e SysTable) GetSysTablesInfo(c *gin.Context) {
+func (e *SysTable) GetSysTablesInfo(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(500, err, "数据库连接获取失败")
+		e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
 		return
 	}
 
@@ -106,7 +105,7 @@ func (e SysTable) GetSysTablesInfo(c *gin.Context) {
 	if c.Request.FormValue("tableName") != "" {
 		data.TBName = c.Request.FormValue("tableName")
 	}
-	result, err := data.Get(db,true)
+	result, err := data.Get(db)
 	if err != nil {
 		log.Errorf("Get error, %s", err.Error())
 		e.Error(500, err, "抱歉未找到相关信息")
@@ -121,13 +120,13 @@ func (e SysTable) GetSysTablesInfo(c *gin.Context) {
 	//c.JSON(http.StatusOK, res.ReturnOK())
 }
 
-func (e SysTable) GetSysTablesTree(c *gin.Context) {
+func (e *SysTable) GetSysTablesTree(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(500, err, "数据库连接获取失败")
+		e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
 		return
 	}
 
@@ -142,10 +141,9 @@ 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 / 数据表名称"
@@ -153,13 +151,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) Insert(c *gin.Context) {
+func (e *SysTable) InsertSysTable(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(500, err, "数据库连接获取失败")
+		e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
 		return
 	}
 
@@ -202,23 +200,14 @@ 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.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
@@ -227,11 +216,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 = 2
+	data.IsActions = 1
 	data.IsDataScope = 1
 	data.IsAuth = 1
 
@@ -296,10 +285,9 @@ 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"
@@ -307,7 +295,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) Update(c *gin.Context) {
+func (e *SysTable) UpdateSysTable(c *gin.Context) {
 	var data tools.SysTables
 	err := c.Bind(&data)
 	pkg.HasError(err, "数据解析失败", 500)
@@ -317,7 +305,7 @@ func (e SysTable) Update(c *gin.Context) {
 	db, err := e.GetOrm()
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		e.Error(500, err, "数据库连接获取失败")
+		e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
 		return
 	}
 
@@ -331,21 +319,20 @@ func (e SysTable) Update(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) Delete(c *gin.Context) {
+func (e *SysTable) DeleteSysTables(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(500, err, "数据库连接获取失败")
+		e.Error(http.StatusInternalServerError, err, "数据库连接获取失败")
 		return
 	}
 

app/admin/models/casbin_rule.go

@@ -1,16 +0,0 @@
-package models
-
-type CasbinRule struct {
-	ID    uint   `gorm:"primaryKey;autoIncrement"`
-	Ptype string `gorm:"size:512;uniqueIndex:unique_index"`
-	V0    string `gorm:"size:512;uniqueIndex:unique_index"`
-	V1    string `gorm:"size:512;uniqueIndex:unique_index"`
-	V2    string `gorm:"size:512;uniqueIndex:unique_index"`
-	V3    string `gorm:"size:512;uniqueIndex:unique_index"`
-	V4    string `gorm:"size:512;uniqueIndex:unique_index"`
-	V5    string `gorm:"size:512;uniqueIndex:unique_index"`
-}
-
-func (CasbinRule) TableName() string {
-	return "sys_casbin_rule"
-}

app/admin/models/initdb.go

@@ -31,7 +31,7 @@ func ExecSql(db *gorm.DB, filePath string) error {
 			fmt.Println(sqlList[i])
 			continue
 		}
-		sql := strings.Replace(sqlList[i]+";", "\n", "", -1)
+		sql := strings.Replace(sqlList[i]+";", "\n", "", 0)
 		sql = strings.TrimSpace(sql)
 		if err = db.Exec(sql).Error; err != nil {
 			log.Printf("error sql: %s", sql)

app/admin/models/menu.go

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

app/admin/models/role.go

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

app/admin/models/sys_api.go

@@ -1,91 +0,0 @@
-package models
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"regexp"
-	"strings"
-
-	"github.com/bitly/go-simplejson"
-	"github.com/go-admin-team/go-admin-core/sdk"
-	"github.com/go-admin-team/go-admin-core/sdk/runtime"
-	"github.com/go-admin-team/go-admin-core/storage"
-
-	"go-admin/common/models"
-)
-
-type SysApi struct {
-	Id     int    `json:"id" gorm:"primaryKey;autoIncrement;comment:主键编码"`
-	Handle string `json:"handle" gorm:"size:128;comment:handle"`
-	Title  string `json:"title" gorm:"size:128;comment:标题"`
-	Path   string `json:"path" gorm:"size:128;comment:地址"`
-	Action string `json:"action" gorm:"size:16;comment:请求类型"`
-	Type   string `json:"type" gorm:"size:16;comment:接口类型"`
-	models.ModelTime
-	models.ControlBy
-}
-
-func (*SysApi) TableName() string {
-	return "sys_api"
-}
-
-func (e *SysApi) Generate() models.ActiveRecord {
-	o := *e
-	return &o
-}
-
-func (e *SysApi) GetId() interface{} {
-	return e.Id
-}
-
-func SaveSysApi(message storage.Messager) (err error) {
-	var rb []byte
-	rb, err = json.Marshal(message.GetValues())
-	if err != nil {
-		err = fmt.Errorf("json Marshal error, %v", err.Error())
-		return err
-	}
-
-	var l runtime.Routers
-	err = json.Unmarshal(rb, &l)
-	if err != nil {
-		err = fmt.Errorf("json Unmarshal error, %s", err.Error())
-		return err
-	}
-	dbList := sdk.Runtime.GetDb()
-	for _, d := range dbList {
-		for _, v := range l.List {
-			if v.HttpMethod != "HEAD" ||
-				strings.Contains(v.RelativePath, "/swagger/") ||
-				strings.Contains(v.RelativePath, "/static/") ||
-				strings.Contains(v.RelativePath, "/form-generator/") ||
-				strings.Contains(v.RelativePath, "/sys/tables") {
-
-				// 根据接口方法注释里的@Summary填充接口名称，适用于代码生成器
-				// 可在此处增加配置路径前缀的if判断，只对代码生成的自建应用进行定向的接口名称填充
-				jsonFile, _ := ioutil.ReadFile("docs/swagger.json")
-				jsonData, _ := simplejson.NewFromReader(bytes.NewReader(jsonFile))
-				urlPath := v.RelativePath
-				idPatten := "(.*)/:(\\w+)" // 正则替换，把:id换成{id}
-				reg, _ := regexp.Compile(idPatten)
-				if reg.MatchString(urlPath) {
-					urlPath = reg.ReplaceAllString(v.RelativePath, "${1}/{${2}}") // 把:id换成{id}
-				}
-				apiTitle, _ := jsonData.Get("paths").Get(urlPath).Get(strings.ToLower(v.HttpMethod)).Get("summary").String()
-
-				err := d.Debug().Where(SysApi{Path: v.RelativePath, Action: v.HttpMethod}).
-					Attrs(SysApi{Handle: v.Handler, Title: apiTitle}).
-					FirstOrCreate(&SysApi{}).
-					//Update("handle", v.Handler).
-					Error
-				if err != nil {
-					err := fmt.Errorf("Models SaveSysApi error: %s \r\n ", err.Error())
-					return err
-				}
-			}
-		}
-	}
-	return nil
-}

app/admin/models/sys_category.go

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

app/admin/models/sys_china_area_data.go

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

app/admin/models/sys_config.go

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

app/admin/models/sys_content.go

@@ -0,0 +1,33 @@
+package models
+
+import (
+	"go-admin/common/models"
+)
+
+type SysContent struct {
+	models.Model
+	CateId  int    `json:"cateId" gorm:"type:int(11);comment:分类id"`
+	Name    string `json:"name" gorm:"type:varchar(255);comment:名称"`
+	Status  int    `json:"status" gorm:"type:int(1);comment:状态"`
+	Img     string `json:"img" gorm:"type:varchar(255);comment:图片"`
+	Content string `json:"content" gorm:"type:text;comment:内容"`
+	Remark  string `json:"remark" gorm:"type:varchar(255);comment:备注"`
+	Sort    int    `json:"sort" gorm:"type:int(4);comment:排序"`
+	models.ControlBy
+	models.ModelTime
+}
+
+// TableName
+func (SysContent) TableName() string {
+	return "sys_content"
+}
+
+// Generate
+func (e *SysContent) Generate() models.ActiveRecord {
+	o := *e
+	return &o
+}
+
+func (e *SysContent) GetId() interface{} {
+	return e.Id
+}

app/admin/models/sys_dict_data.go

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

app/admin/models/sys_file_dir.go

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

app/admin/models/sys_file_info.go

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

app/admin/models/sys_job.go

@@ -23,7 +23,7 @@ type SysJob struct {
 	DataScope string `json:"dataScope" gorm:"-"`
 }
 
-func (*SysJob) TableName() string {
+func (SysJob) TableName() string {
 	return "sys_job"
 }
 
@@ -44,11 +44,37 @@ func (e *SysJob) SetUpdateBy(updateBy int) {
 	e.UpdateBy = updateBy
 }
 
+// 创建SysJob
+//func (e *SysJob) Create() (err error) {
+//	return orm.Eloquent.Table(e.TableName()).Create(e).Error
+//}
+
+// 获取SysJob
+//func (e *SysJob) Get(id interface{}) (err error) {
+//	return orm.Eloquent.Table(e.TableName()).First(e, id).Error
+//}
+
+// 获取SysJob带分页
+//func (e *SysJob) GetPage(pageSize int, pageIndex int, v interface{}, list interface{}) (int, error) {
+//	table := orm.Eloquent.Table(e.TableName()).Scopes(dto.MakeCondition(v))
+//
+//	// 数据权限控制(如果不需要数据权限请将此处去掉)
+//	//dataPermission := new(DataPermission)
+//	userid, _ := tools.StringToInt(e.DataScope)
+//
+//	var count int64
+//
+//	if err := table.Scopes(system.DataScopes(e.TableName(), userid), dto.Paginate(pageSize, pageIndex)).Find(list).Offset(-1).Limit(-1).Count(&count).Error; err != nil {
+//		return 0, err
+//	}
+//	return int(count), nil
+//}
+
 func (e *SysJob) GetList(tx *gorm.DB, list interface{}) (err error) {
 	return tx.Table(e.TableName()).Where("status = ?", 2).Find(list).Error
 }
 
-// Update 更新SysJob
+// 更新SysJob
 func (e *SysJob) Update(tx *gorm.DB, id interface{}) (err error) {
 	return tx.Table(e.TableName()).Where(id).Updates(&e).Error
 }
@@ -59,3 +85,25 @@ func (e *SysJob) RemoveAllEntryID(tx *gorm.DB) (update SysJob, err error) {
 	}
 	return
 }
+
+//func (e *SysJob) RemoveEntryID(entryID int) (update SysJob, err error) {
+//	if err = orm.Eloquent.Table(e.TableName()).Where("entry_id = ?", entryID).Updates(map[string]interface{}{"entry_id": 0}).Error; err != nil {
+//		return
+//	}
+//	return
+//}
+
+// 删除SysJob
+//func (e *SysJob) Delete(id int) (success bool, err error) {
+//	if err = orm.Eloquent.Table(e.TableName()).Where(id).Delete(&SysJob{}).Error; err != nil {
+//		success = false
+//		return
+//	}
+//	success = true
+//	return
+//}
+
+//批量删除
+//func (e *SysJob) BatchDelete(id []int) error {
+//	return orm.Eloquent.Table(e.TableName()).Where(id).Delete(&SysJob{}).Error
+//}

app/admin/models/sys_opera_log.go

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

app/admin/models/sys_role.go

@@ -1,35 +0,0 @@
-package models
-
-import "go-admin/common/models"
-
-type SysRole struct {
-	RoleId    int        `json:"roleId" gorm:"primaryKey;autoIncrement"` // 角色编码
-	RoleName  string     `json:"roleName" gorm:"size:128;"`              // 角色名称
-	Status    string     `json:"status" gorm:"size:4;"`                  // 状态 1禁用 2正常
-	RoleKey   string     `json:"roleKey" gorm:"size:128;"`               //角色代码
-	RoleSort  int        `json:"roleSort" gorm:""`                       //角色排序
-	Flag      string     `json:"flag" gorm:"size:128;"`                  //
-	Remark    string     `json:"remark" gorm:"size:255;"`                //备注
-	Admin     bool       `json:"admin" gorm:"size:4;"`
-	DataScope string     `json:"dataScope" gorm:"size:128;"`
-	Params    string     `json:"params" gorm:"-"`
-	MenuIds   []int      `json:"menuIds" gorm:"-"`
-	DeptIds   []int      `json:"deptIds" gorm:"-"`
-	SysDept   []SysDept  `json:"sysDept" gorm:"many2many:sys_role_dept;foreignKey:RoleId;joinForeignKey:role_id;references:DeptId;joinReferences:dept_id;"`
-	SysMenu   *[]SysMenu `json:"sysMenu" gorm:"many2many:sys_role_menu;foreignKey:RoleId;joinForeignKey:role_id;references:MenuId;joinReferences:menu_id;"`
-	models.ControlBy
-	models.ModelTime
-}
-
-func (*SysRole) TableName() string {
-	return "sys_role"
-}
-
-func (e *SysRole) Generate() models.ActiveRecord {
-	o := *e
-	return &o
-}
-
-func (e *SysRole) GetId() interface{} {
-	return e.RoleId
-}

app/admin/models/system.go

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

app/admin/models/system/casbin_rule.go

@@ -0,0 +1,16 @@
+package system
+
+//sys_casbin_rule
+type CasbinRule struct {
+	PType string `json:"p_type" gorm:"size:100;"`
+	V0    string `json:"v0" gorm:"size:100;"`
+	V1    string `json:"v1" gorm:"size:100;"`
+	V2    string `json:"v2" gorm:"size:100;"`
+	V3    string `json:"v3" gorm:"size:100;"`
+	V4    string `json:"v4" gorm:"size:100;"`
+	V5    string `json:"v5" gorm:"size:100;"`
+}
+
+func (CasbinRule) TableName() string {
+	return "sys_casbin_rule"
+}

app/admin/models/system/datascope.go

@@ -1,4 +1,4 @@
-package models
+package system
 
 import (
 	"errors"
@@ -49,33 +49,33 @@ func (e *DataPermission) GetDataScope(tableName string, db *gorm.DB) (*gorm.DB,
 	return db, nil
 }
 
-//func DataScopes(tableName string, userId int) func(db *gorm.DB) *gorm.DB {
-//	return func(db *gorm.DB) *gorm.DB {
-//		user := new(SysUser)
-//		role := new(SysRole)
-//		user.UserId = userId
-//		err := db.Find(user, userId).Error
-//		if err != nil {
-//			db.Error = errors.New("获取用户数据出错 msg:" + err.Error())
-//			return db
-//		}
-//		err = db.Find(role, user.RoleId).Error
-//		if err != nil {
-//			db.Error = errors.New("获取用户数据出错 msg:" + err.Error())
-//			return db
-//		}
-//		if role.DataScope == "2" {
-//			return db.Where(tableName+".create_by in (select sys_user.user_id from sys_role_dept left join sys_user on sys_user.dept_id=sys_role_dept.dept_id where sys_role_dept.role_id = ?)", user.RoleId)
-//		}
-//		if role.DataScope == "3" {
-//			return db.Where(tableName+".create_by in (SELECT user_id from sys_user where dept_id = ? )", user.DeptId)
-//		}
-//		if role.DataScope == "4" {
-//			return db.Where(tableName+".create_by in (SELECT user_id from sys_user where sys_user.dept_id in(select dept_id from sys_dept where dept_path like ? ))", "%"+pkg.IntToString(user.DeptId)+"%")
-//		}
-//		if role.DataScope == "5" || role.DataScope == "" {
-//			return db.Where(tableName+".create_by = ?", userId)
-//		}
-//		return db
-//	}
-//}
+func DataScopes(tableName string, userId int) func(db *gorm.DB) *gorm.DB {
+	return func(db *gorm.DB) *gorm.DB {
+		user := new(SysUser)
+		role := new(SysRole)
+		user.UserId = userId
+		err := db.Find(user, userId).Error
+		if err != nil {
+			db.Error = errors.New("获取用户数据出错 msg:" + err.Error())
+			return db
+		}
+		err = db.Find(role, user.RoleId).Error
+		if err != nil {
+			db.Error = errors.New("获取用户数据出错 msg:" + err.Error())
+			return db
+		}
+		if role.DataScope == "2" {
+			return db.Where(tableName+".create_by in (select sys_user.user_id from sys_role_dept left join sys_user on sys_user.dept_id=sys_role_dept.dept_id where sys_role_dept.role_id = ?)", user.RoleId)
+		}
+		if role.DataScope == "3" {
+			return db.Where(tableName+".create_by in (SELECT user_id from sys_user where dept_id = ? )", user.DeptId)
+		}
+		if role.DataScope == "4" {
+			return db.Where(tableName+".create_by in (SELECT user_id from sys_user where sys_user.dept_id in(select dept_id from sys_dept where dept_path like ? ))", "%"+pkg.IntToString(user.DeptId)+"%")
+		}
+		if role.DataScope == "5" || role.DataScope == "" {
+			return db.Where(tableName+".create_by = ?", userId)
+		}
+		return db
+	}
+}

app/admin/models/system/role_dept.go

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

app/admin/models/system/role_menu.go

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

app/admin/models/system/sys_config.go

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

app/admin/models/system/sys_dept.go

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

app/admin/models/system/sys_dict_data.go

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

app/admin/models/system/sys_dict_type.go

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

app/admin/models/system/sys_login_log.go

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

app/admin/models/system/sys_menu.go

@@ -1,4 +1,4 @@
-package models
+package system
 
 import "go-admin/common/models"
 
@@ -19,24 +19,38 @@ type SysMenu struct {
 	Sort       int       `json:"sort" gorm:"size:4;"`
 	Visible    string    `json:"visible" gorm:"size:1;"`
 	IsFrame    string    `json:"isFrame" gorm:"size:1;DEFAULT:0;"`
-	SysApi     []SysApi  `json:"sysApi" gorm:"many2many:sys_menu_api_rule"`
-	Apis       []int     `json:"apis" gorm:"-"`
 	DataScope  string    `json:"dataScope" gorm:"-"`
 	Params     string    `json:"params" gorm:"-"`
 	RoleId     int       `gorm:"-"`
-	Children   []SysMenu `json:"children,omitempty" gorm:"-"`
+	Children   []SysMenu `json:"children" gorm:"-"`
 	IsSelect   bool      `json:"is_select" gorm:"-"`
 	models.ControlBy
 	models.ModelTime
 }
 
-type SysMenuSlice []SysMenu
+type SysMenus struct {
+	MenuId     int       `json:"menuId" gorm:"column:menu_id;primaryKey;autoIncrement;"`
+	MenuName   string    `json:"menuName" gorm:"column:menu_name"`
+	Title      string    `json:"title" gorm:"column:title"`
+	Icon       string    `json:"icon" gorm:"column:icon"`
+	Path       string    `json:"path" gorm:"column:path"`
+	MenuType   string    `json:"menuType" gorm:"column:menu_type"`
+	Action     string    `json:"action" gorm:"column:action"`
+	Permission string    `json:"permission" gorm:"column:permission"`
+	ParentId   int       `json:"parentId" gorm:"column:parent_id"`
+	NoCache    bool      `json:"noCache" gorm:"column:no_cache"`
+	Breadcrumb string    `json:"breadcrumb" gorm:"column:breadcrumb"`
+	Component  string    `json:"component" gorm:"column:component"`
+	Sort       int       `json:"sort" gorm:"column:sort"`
+	Visible    string    `json:"visible" gorm:"column:visible"`
+	Children   []SysMenu `json:"children" gorm:"-"`
+	models.ControlBy
+	models.ModelTime
+	DataScope string `json:"dataScope" gorm:"-"`
+	Params    string `json:"params" gorm:"-"`
+}
 
-func (x SysMenuSlice) Len() int           { return len(x) }
-func (x SysMenuSlice) Less(i, j int) bool { return x[i].Sort < x[j].Sort }
-func (x SysMenuSlice) Swap(i, j int)      { x[i], x[j] = x[j], x[i] }
-
-func (*SysMenu) TableName() string {
+func (SysMenu) TableName() string {
 	return "sys_menu"
 }
 

app/admin/models/system/sys_opera_log.go

@@ -0,0 +1,85 @@
+package system
+
+import (
+	"encoding/json"
+	"errors"
+	"time"
+
+	log "github.com/go-admin-team/go-admin-core/logger"
+	"github.com/go-admin-team/go-admin-core/sdk"
+	"github.com/go-admin-team/go-admin-core/storage"
+
+	"go-admin/common/models"
+)
+
+type SysOperaLog struct {
+	models.Model
+	Title         string    `json:"title" gorm:"type:varchar(255);comment:操作模块"`
+	BusinessType  string    `json:"businessType" gorm:"type:varchar(128);comment:操作类型"`
+	BusinessTypes string    `json:"businessTypes" gorm:"type:varchar(128);comment:BusinessTypes"`
+	Method        string    `json:"method" gorm:"type:varchar(128);comment:函数"`
+	RequestMethod string    `json:"requestMethod" gorm:"type:varchar(128);comment:请求方式"`
+	OperatorType  string    `json:"operatorType" gorm:"type:varchar(128);comment:操作类型"`
+	OperName      string    `json:"operName" gorm:"type:varchar(128);comment:操作者"`
+	DeptName      string    `json:"deptName" gorm:"type:varchar(128);comment:部门名称"`
+	OperUrl       string    `json:"operUrl" gorm:"type:varchar(255);comment:访问地址"`
+	OperIp        string    `json:"operIp" gorm:"type:varchar(128);comment:客户端ip"`
+	OperLocation  string    `json:"operLocation" gorm:"type:varchar(128);comment:访问位置"`
+	OperParam     string    `json:"operParam" gorm:"type:varchar(255);comment:请求参数"`
+	Status        string    `json:"status" gorm:"type:varchar(4);comment:操作状态"`
+	OperTime      time.Time `json:"operTime" gorm:"type:timestamp;comment:操作时间"`
+	JsonResult    string    `json:"jsonResult" gorm:"type:varchar(255);comment:返回数据"`
+	Remark        string    `json:"remark" gorm:"type:varchar(255);comment:备注"`
+	LatencyTime   string    `json:"latencyTime" gorm:"type:varchar(128);comment:耗时"`
+	UserAgent     string    `json:"userAgent" gorm:"type:varchar(255);comment:ua"`
+	CreatedAt     time.Time `json:"createdAt" gorm:"comment:创建时间"`
+	UpdatedAt     time.Time `json:"updatedAt" gorm:"comment:最后更新时间"`
+	models.ControlBy
+}
+
+func (SysOperaLog) TableName() string {
+	return "sys_opera_log"
+}
+
+func (e *SysOperaLog) Generate() models.ActiveRecord {
+	o := *e
+	return &o
+}
+
+func (e *SysOperaLog) GetId() interface{} {
+	return e.Id
+}
+
+// SaveOperaLog 从队列中获取操作日志
+func SaveOperaLog(message storage.Messager) (err error) {
+	//准备db
+	db := sdk.Runtime.GetDbByKey(message.GetPrefix())
+	if db == nil {
+		err = errors.New("db not exist")
+		log.Errorf("host[%s]'s %s", message.GetPrefix(), err.Error())
+		return err
+	}
+	var rb []byte
+	rb, err = json.Marshal(message.GetValues())
+	if err != nil {
+		log.Errorf("json Marshal error, %s", err.Error())
+		return err
+	}
+	var l SysOperaLog
+	err = json.Unmarshal(rb, &l)
+	if err != nil {
+		log.Errorf("json Unmarshal error, %s", err.Error())
+		return err
+	}
+	if l.Title == "" {
+		m := &SysMenu{}
+		db.Model(m).Select("Title").Where("action = ?", l.Method).Where("path = ?", message.GetValues()["_fullPath"]).First(m)
+		l.Title = m.Title
+	}
+	err = db.Create(&l).Error
+	if err != nil {
+		log.Errorf("db create error, %s", err.Error())
+		return err
+	}
+	return nil
+}

app/admin/models/system/sys_post.go

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

app/admin/models/system/sys_role.go

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

app/admin/models/system/sys_user.go

@@ -1,4 +1,4 @@
-package models
+package system
 
 import (
 	"go-admin/common/models"
@@ -7,29 +7,29 @@ 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:密码"`
-	NickName string   `json:"nickName" gorm:"size:128;comment:昵称"`
-	Phone    string   `json:"phone" gorm:"size:11;comment:手机号"`
-	RoleId   int      `json:"roleId" gorm:"size:20;comment:角色ID"`
-	Salt     string   `json:"-" gorm:"size:255;comment:加盐"`
-	Avatar   string   `json:"avatar" gorm:"size:255;comment:头像"`
-	Sex      string   `json:"sex" gorm:"size:255;comment:性别"`
-	Email    string   `json:"email" gorm:"size:128;comment:邮箱"`
-	DeptId   int      `json:"deptId" gorm:"size:20;comment:部门"`
-	PostId   int      `json:"postId" gorm:"size:20;comment:岗位"`
-	Remark   string   `json:"remark" gorm:"size:255;comment:备注"`
-	Status   string   `json:"status" gorm:"size:4;comment:状态"`
+	Username string   `json:"username" gorm:"type:varchar(64);comment:用户名"`
+	Password string   `json:"-" gorm:"type:varchar(128);comment:密码"`
+	NickName string   `json:"nickName" gorm:"type:varchar(128);comment:昵称"`
+	Phone    string   `json:"phone" gorm:"type:varchar(11);comment:手机号"`
+	RoleId   int      `json:"roleId" gorm:"type:bigint(20);comment:角色ID"`
+	Salt     string   `json:"-" gorm:"type:varchar(255);comment:加盐"`
+	Avatar   string   `json:"avatar" gorm:"type:varchar(255);comment:头像"`
+	Sex      string   `json:"sex" gorm:"type:varchar(255);comment:性别"`
+	Email    string   `json:"email" gorm:"type:varchar(128);comment:邮箱"`
+	DeptId   int      `json:"deptId" gorm:"type:bigint(20);comment:部门"`
+	PostId   int      `json:"postId" gorm:"type:bigint(20);comment:岗位"`
+	Remark   string   `json:"remark" gorm:"type:varchar(255);comment:备注"`
+	Status   string   `json:"status" gorm:"type:varchar(4);comment:状态"`
 	DeptIds  []int    `json:"deptIds" gorm:"-"`
 	PostIds  []int    `json:"postIds" gorm:"-"`
 	RoleIds  []int    `json:"roleIds" gorm:"-"`
 	Dept     *SysDept `json:"dept"`
-	models.ControlBy
-	models.ModelTime
 }
 
-func (*SysUser) TableName() string {
+func (SysUser) TableName() string {
 	return "sys_user"
 }
 
@@ -42,7 +42,7 @@ func (e *SysUser) GetId() interface{} {
 	return e.UserId
 }
 
-// Encrypt 加密
+//加密
 func (e *SysUser) Encrypt() (err error) {
 	if e.Password == "" {
 		return

app/admin/models/tools/dbcolumns.go

@@ -2,10 +2,11 @@ package tools
 
 import (
 	"errors"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+
+	"gorm.io/gorm"
 
 	"github.com/go-admin-team/go-admin-core/sdk/config"
-	"github.com/go-admin-team/go-admin-core/sdk/pkg"
-	"gorm.io/gorm"
 )
 
 type DBColumns struct {
@@ -67,4 +68,4 @@ func (e *DBColumns) GetList(tx *gorm.DB) ([]DBColumns, error) {
 		return doc, err
 	}
 	return doc, nil
-}
+}

app/admin/models/tools/syscolumns.go

@@ -47,24 +47,16 @@ type SysColumns struct {
 	models.BaseModel
 }
 
-func (*SysColumns) TableName() string {
+func (SysColumns) TableName() string {
 	return "sys_columns"
 }
 
-func (e *SysColumns) GetList(tx *gorm.DB, exclude bool) ([]SysColumns, error) {
+func (e *SysColumns) GetList(tx *gorm.DB) ([]SysColumns, error) {
 	var doc []SysColumns
+
 	table := tx.Table("sys_columns")
-	table = table.Where("table_id = ? ", e.TableId)
-	if 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)
-	}
+
+	table = table.Where("table_id = ?", e.TableId)
 
 	if err := table.Find(&doc).Error; err != nil {
 		return nil, err

app/admin/models/tools/systables.go

@@ -1,53 +1,49 @@
 package tools
 
 import (
-	common "go-admin/common/models"
-	"strings"
-
 	"gorm.io/gorm"
+	"strings"
 
 	"go-admin/app/admin/models"
 )
 
 type SysTables struct {
-	TableId             int    `gorm:"primaryKey;autoIncrement" json:"tableId"`        //表编码
-	TBName              string `gorm:"column:table_name;size:255;" json:"tableName"`   //表名称
-	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"`                   //
-	PackageName         string `gorm:"size:255;" json:"packageName"`                   //包名
-	ModuleName          string `gorm:"size:255;" json:"moduleName"`                    //go文件名
-	ModuleFrontName     string `gorm:"size:255;comment:前端文件名;" json:"moduleFrontName"` //前端文件名
-	BusinessName        string `gorm:"size:255;" json:"businessName"`                  //
-	FunctionName        string `gorm:"size:255;" json:"functionName"`                  //功能名称
-	FunctionAuthor      string `gorm:"size:255;" json:"functionAuthor"`                //功能作者
-	PkColumn            string `gorm:"size:255;" json:"pkColumn"`
-	PkGoField           string `gorm:"size:255;" json:"pkGoField"`
-	PkJsonField         string `gorm:"size:255;" json:"pkJsonField"`
-	Options             string `gorm:"size:255;" json:"options"`
-	TreeCode            string `gorm:"size:255;" json:"treeCode"`
-	TreeParentCode      string `gorm:"size:255;" json:"treeParentCode"`
-	TreeName            string `gorm:"size:255;" json:"treeName"`
-	Tree                bool   `gorm:"size:1;default:0;" json:"tree"`
-	Crud                bool   `gorm:"size:1;default:1;" json:"crud"`
-	Remark              string `gorm:"size:255;" json:"remark"`
-	IsDataScope         int    `gorm:"size:1;" json:"isDataScope"`
-	IsActions           int    `gorm:"size:1;" json:"isActions"`
-	IsAuth              int    `gorm:"size:1;" json:"isAuth"`
-	IsLogicalDelete     string `gorm:"size:1;" json:"isLogicalDelete"`
-	LogicalDelete       bool   `gorm:"size:1;" json:"logicalDelete"`
-	LogicalDeleteColumn string `gorm:"size:128;" json:"logicalDeleteColumn"`
-	common.ModelTime
-	common.ControlBy
-	DataScope string       `gorm:"-" json:"dataScope"`
-	Params    Params       `gorm:"-" json:"params"`
-	Columns   []SysColumns `gorm:"-" json:"columns"`
+	TableId             int          `gorm:"primaryKey;autoIncrement" json:"tableId"`      //表编码
+	TBName              string       `gorm:"column:table_name;size:255;" json:"tableName"` //表名称
+	TableComment        string       `gorm:"size:255;" json:"tableComment"`                //表备注
+	ClassName           string       `gorm:"size:255;" json:"className"`                   //类名
+	TplCategory         string       `gorm:"size:255;" json:"tplCategory"`                 //
+	PackageName         string       `gorm:"size:255;" json:"packageName"`                 //包名
+	ModuleName          string       `gorm:"size:255;" json:"moduleName"`                  //模块名
+	BusinessName        string       `gorm:"size:255;" json:"businessName"`                //
+	FunctionName        string       `gorm:"size:255;" json:"functionName"`                //功能名称
+	FunctionAuthor      string       `gorm:"size:255;" json:"functionAuthor"`              //功能作者
+	PkColumn            string       `gorm:"size:255;" json:"pkColumn"`
+	PkGoField           string       `gorm:"size:255;" json:"pkGoField"`
+	PkJsonField         string       `gorm:"size:255;" json:"pkJsonField"`
+	Options             string       `gorm:"size:255;" json:"options"`
+	TreeCode            string       `gorm:"size:255;" json:"treeCode"`
+	TreeParentCode      string       `gorm:"size:255;" json:"treeParentCode"`
+	TreeName            string       `gorm:"size:255;" json:"treeName"`
+	Tree                bool         `gorm:"size:1;" json:"tree"`
+	Crud                bool         `gorm:"size:1;" json:"crud"`
+	Remark              string       `gorm:"size:255;" json:"remark"`
+	IsDataScope         int          `gorm:"size:1;" json:"isDataScope"`
+	IsActions           int          `gorm:"size:1;" json:"isActions"`
+	IsAuth              int          `gorm:"size:1;" json:"isAuth"`
+	IsLogicalDelete     string       `gorm:"size:1;" json:"isLogicalDelete"`
+	LogicalDelete       bool         `gorm:"size:1;" json:"logicalDelete"`
+	LogicalDeleteColumn string       `gorm:"size:128;" json:"logicalDeleteColumn"`
+	CreateBy            int          `gorm:"size:128;" json:"createBy"`
+	UpdateBy            int          `gorm:"size:128;" json:"updateBy"`
+	DataScope           string       `gorm:"-" json:"dataScope"`
+	Params              Params       `gorm:"-" json:"params"`
+	Columns             []SysColumns `gorm:"-" json:"columns"`
 
 	models.BaseModel
 }
 
-func (*SysTables) TableName() string {
+func (SysTables) TableName() string {
 	return "sys_tables"
 }
 
@@ -78,7 +74,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, exclude bool) (SysTables, error) {
+func (e *SysTables) Get(tx *gorm.DB) (SysTables, error) {
 	var doc SysTables
 	var err error
 	table := tx.Table("sys_tables")
@@ -98,7 +94,7 @@ func (e *SysTables) Get(tx *gorm.DB, exclude bool) (SysTables, error) {
 	}
 	var col SysColumns
 	col.TableId = doc.TableId
-	if doc.Columns, err = col.GetList(tx, exclude); err != nil {
+	if doc.Columns, err = col.GetList(tx); err != nil {
 		return doc, err
 	}
 
@@ -127,7 +123,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, false); err != nil {
+		if doc[i].Columns, err = col.GetList(tx); err != nil {
 			return doc, err
 		}
 
@@ -189,17 +185,16 @@ 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
-				t.MLTBName = strings.Replace(t.TBName, "_", "-", -1)
-				e.Columns[i].FkTableNamePackage = t.MLTBName
+				e.Columns[i].FkTableNamePackage = t.ModuleName
 			} 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/admin/router/init_router.go

@@ -6,7 +6,12 @@ import (
 	"github.com/gin-gonic/gin"
 	log "github.com/go-admin-team/go-admin-core/logger"
 	"github.com/go-admin-team/go-admin-core/sdk"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
+	"github.com/go-admin-team/go-admin-core/sdk/config"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+
 	common "go-admin/common/middleware"
+	"go-admin/common/middleware/handler"
 )
 
 // InitRouter 路由初始化，不要怀疑，这里用到了
@@ -14,8 +19,8 @@ func InitRouter() {
 	var r *gin.Engine
 	h := sdk.Runtime.GetEngine()
 	if h == nil {
-		log.Fatal("not found engine...")
-		os.Exit(-1)
+		h = gin.New()
+		sdk.Runtime.SetEngine(h)
 	}
 	switch h.(type) {
 	case *gin.Engine:
@@ -24,7 +29,14 @@ func InitRouter() {
 		log.Fatal("not support other engine")
 		os.Exit(-1)
 	}
+	if config.SslConfig.Enable {
+		r.Use(handler.TlsHandler())
+	}
 
+	r.Use(common.Sentinel()).
+		Use(common.RequestId(pkg.TrafficKey)).
+		Use(api.SetRequestLogger)
+	common.InitMiddleware(r)
 	// the jwt middleware
 	authMiddleware, err := common.AuthInit()
 	if err != nil {

app/admin/router/monitor.go

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

app/admin/router/router.go

@@ -12,6 +12,7 @@ var (
 	routerCheckRole   = make([]func(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware), 0)
 )
 
+// 路由示例
 func InitExamplesRouter(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware) *gin.Engine {
 
 	// 无需认证的路由
@@ -26,15 +27,24 @@ func InitExamplesRouter(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware) *gi
 func examplesNoCheckRoleRouter(r *gin.Engine) {
 	// 可根据业务需求来设置接口版本
 	v1 := r.Group("/api/v1")
+	// 空接口防止v1定义无使用报错
+	v1.GET("/nilcheckrole", nil)
+
 	for _, f := range routerNoCheckRole {
 		f(v1)
 	}
+
+	// {{无需认证路由自动补充在此处请勿删除}}
+	//registerSysFileInfoRouter(v1)
 }
 
 // 需要认证的路由示例
 func examplesCheckRoleRouter(r *gin.Engine, authMiddleware *jwtauth.GinJWTMiddleware) {
 	// 可根据业务需求来设置接口版本
 	v1 := r.Group("/api/v1")
+	// 空接口防止v1定义无使用报错
+	v1.GET("/checkrole", nil)
+
 	for _, f := range routerCheckRole {
 		f(v1, authMiddleware)
 	}

app/admin/router/sys_api.go

@@ -1,24 +0,0 @@
-package router
-
-import (
-	"github.com/gin-gonic/gin"
-	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
-
-	"go-admin/app/admin/apis"
-	"go-admin/common/middleware"
-)
-
-func init() {
-	routerCheckRole = append(routerCheckRole, registerSysApiRouter)
-}
-
-// registerSysApiRouter
-func registerSysApiRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
-	api := apis.SysApi{}
-	r := v1.Group("/sys-api").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
-	{
-		r.GET("", api.GetPage)
-		r.GET("/:id", api.Get)
-		r.PUT("/:id", api.Update)
-	}
-}

app/admin/router/sys_category.go

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

app/admin/router/sys_china_area_data.go

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

app/admin/router/sys_config.go

@@ -1,11 +1,10 @@
 package router
 
 import (
-	"go-admin/app/admin/apis"
-	"go-admin/common/middleware"
-
 	"github.com/gin-gonic/gin"
 	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
+	"go-admin/app/admin/apis/system/sys_config"
+	middleware2 "go-admin/common/middleware"
 )
 
 func init() {
@@ -14,14 +13,15 @@ func init() {
 
 // 需认证的路由代码
 func registerSysConfigRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
-	api := apis.SysConfig{}
-	r := v1.Group("/config").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+	api := sys_config.SysConfig{}
+	r := v1.Group("/config").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
 	{
-		r.GET("", api.GetPage)
-		r.GET("/:id", api.Get)
-		r.POST("", api.Insert)
-		r.PUT("/:id", api.Update)
-		r.DELETE("", api.Delete)
+
+		r.GET("", api.GetSysConfigList)
+		r.GET("/:id", api.GetSysConfig)
+		r.POST("", api.InsertSysConfig)
+		r.PUT("/:id", api.UpdateSysConfig)
+		r.DELETE("", api.DeleteSysConfig)
 	}
 
 	r1 := v1.Group("/configKey").Use(authMiddleware.MiddlewareFunc())
@@ -31,13 +31,7 @@ func registerSysConfigRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMidd
 
 	r2 := v1.Group("/app-config")
 	{
-		r2.GET("", api.Get2SysApp)
+		r2.GET("", api.GetSysConfigBySysApp)
 	}
 
-	r3 := v1.Group("/set-config").Use(authMiddleware.MiddlewareFunc())
-	{
-		r3.PUT("", api.Update2Set)
-		r3.GET("", api.Get2Set)
-	}
-
-}
+}

app/admin/router/sys_content.go

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

app/admin/router/sys_dept.go

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

app/admin/router/sys_dict.go

@@ -1,37 +0,0 @@
-package router
-
-import (
-	"github.com/gin-gonic/gin"
-	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
-	"go-admin/app/admin/apis"
-	"go-admin/common/middleware"
-)
-
-func init() {
-	routerCheckRole = append(routerCheckRole, registerDictRouter)
-}
-
-func registerDictRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
-	dictApi := apis.SysDictType{}
-	dataApi := apis.SysDictData{}
-	dicts := v1.Group("/dict").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
-	{
-
-		dicts.GET("/data", dataApi.GetPage)
-		dicts.GET("/data/:dictCode", dataApi.Get)
-		dicts.POST("/data", dataApi.Insert)
-		dicts.PUT("/data/:dictCode", dataApi.Update)
-		dicts.DELETE("/data", dataApi.Delete)
-
-		dicts.GET("/type-option-select", dictApi.GetAll)
-		dicts.GET("/type", dictApi.GetPage)
-		dicts.GET("/type/:id", dictApi.Get)
-		dicts.POST("/type", dictApi.Insert)
-		dicts.PUT("/type/:id", dictApi.Update)
-		dicts.DELETE("/type", dictApi.Delete)
-	}
-	opSelect := v1.Group("/dict-data").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
-	{
-		opSelect.GET("/option-select", dataApi.GetAll)
-	}
-}

app/admin/router/sys_file_dir.go

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

app/admin/router/sys_file_info.go

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

app/admin/router/sys_job.go

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

app/admin/router/sys_login_log.go

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