publish🚀: 版本号更新至 2.3.0

if 表达式中不应使用 ${{ }} 包裹：startsWith(${{github.ref}}, 'refs/tags/')
会先将 github.ref 替换为裸字符串再参与表达式求值，导致条件判断失效，
使得每次 push 到 master 都会构建并推送镜像至 ghcr.io，而非仅在打 tag 时发布。

同时 on.push 缺少 tags 配置，打 tag 实际不会触发该工作流。

修正后：push 分支仅执行 Go 构建，打 tag 才发布镜像。

.github/ISSUE_TEMPLATE/config.yml

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

@@ -0,0 +1,66 @@
+<!--
+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

@@ -0,0 +1,61 @@
+<!--
+首先，感谢你的贡献！😄
+
+新特性请提交至 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

@@ -0,0 +1,57 @@
+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@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+
+      - name: Set up Go
+        uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
+        with:
+          go-version: 1.26.5
+
+      - 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@0ff4204d59e8e51228ff73bce53f80d53301dee2 # v1.2.5
+        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/codeql-analysis.yml

@@ -19,11 +19,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@24c7eb380a2dc368f2d129e4c65e51d172983a1e # v4
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -34,7 +34,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@24c7eb380a2dc368f2d129e4c65e51d172983a1e # v4
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -48,4 +48,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@24c7eb380a2dc368f2d129e4c65e51d172983a1e # v4

.github/workflows/dev-lwx.yml

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

.github/workflows/go.yml

@@ -2,9 +2,13 @@ name: build
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, dev ]
+    tags: [ 'v*', '[0-9]*' ]
   pull_request:
     branches: [ master ]
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
 
 jobs:
 
@@ -13,22 +17,51 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - name: Set up Go 1.14
-      uses: actions/setup-go@v1
+    - name: Set up Go 1.26
+      uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
       with:
-        go-version: 1.14
+        go-version: 1.26.5
       id: go
 
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
+      uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
     - name: Get dependencies
-      run: |
-        go get -v -t -d ./...
-        if [ -f Gopkg.toml ]; then
-            curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
-            dep ensure
-        fi
-
+      run: go mod tidy
     - name: Build
-      run: go build -v .
+      run: make build
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
+      if: startsWith(github.ref, 'refs/tags/')
+
+    - name: Log in to the Container registry
+      uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
+      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@dc802804100637a589fabce1cb79ff13a1411302 # v6.2.0
+      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@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
+      if: startsWith(github.ref, 'refs/tags/')
+      with:
+        context: .
+        file: scripts/Dockerfile
+        push: true
+        tags: ${{ steps.meta.outputs.tags }}
+        labels: ${{ steps.meta.outputs.labels }}

.github/workflows/mirror.yaml

@@ -0,0 +1,33 @@
+name: 'GitHub Actions Mirror'
+
+on: [push, delete]
+
+jobs:
+  mirror_to_gitee:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout'
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          fetch-depth: 0
+      - name: 'Mirror to gitee'
+        uses: pixta-dev/repository-mirroring-action@674e65a7d483ca28dafaacba0d07351bdcc8bd75 # 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@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          fetch-depth: 0
+      - name: 'Mirror to gitlab'
+        uses: pixta-dev/repository-mirroring-action@674e65a7d483ca28dafaacba0d07351bdcc8bd75 # 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,8 +17,9 @@ 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
 config/settings.deva.yml
+go-admin-server
+CLAUDE.md
+.claude/
+config/settings.local.dev.yml

Dockerfile

@@ -1,14 +1,18 @@
 FROM alpine
 
-ENV GOPROXY https://goproxy.cn/
+# ENV GOPROXY https://goproxy.cn/
+
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories
 
 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.prod.yml /config/settings.yml
+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"]

Dockerfilebak

@@ -0,0 +1,28 @@
+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 wenjianzhang
+Copyright (c) 2026 go-admin-team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -2,9 +2,41 @@ PROJECT:=go-admin
 
 .PHONY: build
 build:
-	CGO_ENABLED=0 go build -o go-admin main.go
+	CGO_ENABLED=0 go build -ldflags="-w -s" -a -installsuffix "" -o go-admin .
+
+# make build-linux
+build-linux:
+	@docker build -t go-admin:latest .
+	@echo "build successful"
+
 build-sqlite:
-	go build -tags sqlite3 -o go-admin main.go
+	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"
+
+
 #.PHONY: test
 #test:
 #	go test -v ./... -cover
@@ -12,3 +44,11 @@ build-sqlite:
 #.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://gitee.com/mydearzwj/image/raw/master/img/go-admin.svg">
+  <img align="right" width="320" src="https://doc-image.zhangwj.com/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,18 +9,25 @@
 
 [English](https://github.com/go-admin-team/go-admin/blob/master/README.md) | 简体中文
 
-基于Gin + Vue + Element UI的前后端分离权限管理系统,系统初始化极度简单，只需要配置文件中，修改数据库连接，系统支持多指令操作，迁移指令可以让初始化数据库信息变得更简单，服务指令可以很简单的启动api服务
+基于Gin + Vue + Element UI OR Arco Design OR Ant Design的前后端分离权限管理系统,系统初始化极度简单，只需要配置文件中，修改数据库连接，系统支持多指令操作，迁移指令可以让初始化数据库信息变得更简单，服务指令可以很简单的启动api服务
 
-[在线文档](https://doc.go-admin.dev)
-
-[github在线文档](https://wenjianzhang.github.io)
-
-[gitee在线文档](http://mydearzwj.gitee.io/go-admin-doc/)
+[在线文档](https://www.go-admin.pro)
 
 [前端项目](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 设计规范
@@ -74,9 +81,9 @@
 
 ### 轻松实现go-admin写出第一个应用 - 文档教程
 
-[步骤一 - 基础内容介绍](http://doc.zhangwj.com/go-admin-site/guide/intro/tutorial01.html)
+[步骤一 - 基础内容介绍](https://doc.zhangwj.com/guide/intro/tutorial01.html)
 
-[步骤二 - 实际应用 - 编写增删改查](http://doc.zhangwj.com/go-admin-site/guide/intro/tutorial02.html)
+[步骤二 - 实际应用 - 编写增删改查](https://doc.zhangwj.com/guide/intro/tutorial02.html)
 
 ### 手把手教你从入门到放弃 - 视频教程
 
@@ -100,6 +107,14 @@
 
 ## 📦 本地开发
 
+### 环境要求
+
+go 1.26.5
+
+node版本: v22+（推荐 v24 LTS）
+
+包管理器: pnpm v9+（UI 项目使用 pnpm）
+
 ### 开发目录创建
 
 ```bash
@@ -130,19 +145,22 @@ 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/setting.yml 
+vi ./config/settings.yml
 
 # 1. 配置文件中修改数据库信息 
 # 注意: settings.database 下对应的配置数据
 # 2. 确认log路径
 ```
 
-:::tip ⚠️注意 在windows环境如果没有安装中CGO，会出现这个问题；
+⚠️注意 在windows环境如果没有安装中CGO，会出现这个问题；
 
 ```bash
 E:\go-admin>go build
@@ -158,19 +176,18 @@ D:\Code\go-admin>go build
 cgo: exec gcc: exec: "gcc": executable file not found in %PATH%
 ```
 
-[解决cgo问题进入](https://doc.go-admin.dev/guide/other/faq.html#_5-cgo-exec-missing-cc-exec-missing-cc-file-does-not-exist)
+[解决cgo问题进入](https://doc.go-admin.dev/zh-CN/guide/faq#cgo-%E7%9A%84%E9%97%AE%E9%A2%98)
 
-:::
 
 #### 初始化数据库，以及服务启动
 
 ``` bash
 # 首次配置需要初始化数据库资源信息
 # macOS or linux 下使用
-$ ./go-admin migrate -c=config/settings.dev.yml
+$ ./go-admin migrate -c config/settings.dev.yml
 
 # ⚠️注意:windows 下使用
-$ go-admin.exe migrate -c=config/settings.dev.yml
+$ go-admin.exe migrate -c config/settings.dev.yml
 
 
 # 启动项目，也可以用IDE进行调试
@@ -182,6 +199,13 @@ $ ./go-admin server -c config/settings.yml
 $ go-admin.exe server -c config/settings.yml
 ```
 
+#### sys_api 表的数据如何添加
+
+在项目启动时，使用`-a true` 系统会自动添加缺少的接口数据
+```bash
+./go-admin server -c config/settings.yml -a true
+```
+
 #### 使用docker 编译启动
 
 ```shell
@@ -213,43 +237,83 @@ env GOOS=linux GOARCH=amd64 go build main.go
 ### UI交互端启动说明
 
 ```bash
-# 安装依赖
-npm install
+# 安装 pnpm（若未安装）
+npm install -g pnpm
 
-# 建议不要直接使用 cnpm 安装依赖，会有各种诡异的 bug。可以通过如下操作解决 npm 下载速度慢的问题
-npm install --registry=https://registry.npm.taobao.org
+# 安装依赖
+pnpm install
+
+# 国内网络可指定镜像源加速
+pnpm install --registry=https://registry.npmmirror.com
 
 # 启动服务
-npm run dev
+pnpm dev
 ```
 
-## 🎬 在线体验
-
-> admin / 123456
-
-演示地址：[http://www.go-admin.dev](http://www.go-admin.dev/#/login)
-
 ## 📨 互动
 
 <table>
    <tr>
     <td><img src="https://raw.githubusercontent.com/wenjianzhang/image/master/img/wx.png" width="180px"></td>
-    <td><img src="https://raw.githubusercontent.com/wenjianzhang/image/master/img/qq.png" width="200px"></td>
+    <td><img src="https://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>微信</td>
-    <td><a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=I8ZMqsExqCHpyu8SL4rbya700rBBXYLO&jump_from=webapi"><img border="0" src="//pub.idqqimg.com/wpa/images/group.png" alt="go-admin技术交流甲号" title="go-admin技术交流甲号"></a></td>
+    <td>公众号🔥🔥🔥</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 开源证书支持
 
@@ -259,16 +323,20 @@ npm run dev
 
 ## 🤝 特别感谢
 
-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)
+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)
+
 
 ## 🤟 打赏
 
@@ -284,4 +352,4 @@ npm run dev
 
 [MIT](https://github.com/go-admin-team/go-admin/blob/master/LICENSE.md)
 
-Copyright (c) 2020 wenjianzhang
+Copyright (c) 2024 wenjianzhang

README.md

@@ -1,7 +1,7 @@
 
 # go-admin
 
-<img align="right" width="320" src="https://gitee.com/mydearzwj/image/raw/master/img/go-admin.svg">
+<img align="right" width="320" src="https://raw.githubusercontent.com/wenjianzhang/image/203c5930b9ed08d5cf2fcb4516b85e412f8e0e60/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,14 +10,25 @@
 
 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 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 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.
 
-[documentation](https://doc.go-admin.dev)
+[documentation](https://www.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
@@ -68,9 +79,9 @@ At the same time, a series of tutorials including videos and documents are provi
 
 ### Easily implement go-admin to write the first application-documentation tutorial
 
-[Step 1 - basic content introduction](http://doc.zhangwj.com/go-admin-site/guide/intro/tutorial01.html)
+[Step 1 - basic content introduction](https://doc.zhangwj.com/guide/intro/tutorial01.html)
 
-[Step 2 - Practical application - writing database operations](http://doc.zhangwj.com/go-admin-site/guide/intro/tutorial02.html)
+[Step 2 - Practical application - writing database operations](https://doc.zhangwj.com/guide/intro/tutorial02.html)
 
 ### Teach you from getting started to giving up-video tutorial
 
@@ -94,6 +105,14 @@ At the same time, a series of tutorials including videos and documents are provi
 
 ## 📦 Local development
 
+### Environmental requirements
+
+go 1.26.5
+
+nodejs: v22+ (v24 LTS recommended)
+
+package manager: pnpm v9+ (the UI project uses pnpm)
+
 ### Development directory creation
 
 ```bash
@@ -124,19 +143,22 @@ 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/setting.yml 
+vi ./config/settings.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 windows environment;
+:::tip ⚠️Note that this problem will occur if CGO is not installed in the windows10+ environment;
 
 ```bash
 E:\go-admin>go build
@@ -152,7 +174,7 @@ D:\Code\go-admin>go build
 cgo: exec gcc: exec: "gcc": executable file not found in %PATH%
 ```
 
-[Solve the cgo problem and enter](https://doc.go-admin.dev/guide/other/faq.html#_5-cgo-exec-missing-cc-exec-missing-cc-file-does-not-exist)
+[Solve the cgo problem and enter](https://doc.go-admin.dev/guide/faq#cgo-%E7%9A%84%E9%97%AE%E9%A2%98)
 
 :::
 
@@ -161,10 +183,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
@@ -207,38 +229,79 @@ env GOOS=linux GOARCH=amd64 go build main.go
 ### UI interactive terminal startup instructions
 
 ```bash
+# Install pnpm if you don't have it
+npm install -g pnpm
+
 # Installation dependencies
-npm install   # or cnpm install
+pnpm install
 
 # Start service
-npm run dev
+pnpm 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>
 
-## 💎 Members
+## 💎 Contributors
 
-<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>
 
 
 
@@ -250,7 +313,11 @@ The `go-admin` project has always been developed in the GoLand integrated develo
 
 
 ## 🤝 Thanks
-1. [chengxiao](https://github.com/chengxiao)
+
+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)
 2. [gin](https://github.com/gin-gonic/gin)
 2. [casbin](https://github.com/casbin/casbin)
 2. [spf13/viper](https://github.com/spf13/viper)
@@ -268,10 +335,11 @@ The `go-admin` project has always been developed in the GoLand integrated develo
 <img class="no-margin" src="https://raw.githubusercontent.com/wenjianzhang/image/master/img/pay.png"  height="200px" >
 
 ## 🤝 Link
-[Go developer growth roadmap](http://www.golangroadmap.com/)
+- [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) 2020 wenjianzhang
+Copyright (c) 2022 wenjianzhang

app/admin/apis/captcha.go

@@ -17,17 +17,17 @@ type System struct {
 // @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 {
+	if err := e.MakeContext(c).Errors; err != nil {
 		e.Error(500, err, "服务初始化失败！")
 		return
 	}
-	id, b64s, err := captcha.DriverDigitFunc()
+	id, b64s, answer, err := captcha.DriverDigitFunc()
 	if err != nil {
 		e.Logger.Errorf("DriverDigitFunc error, %s", err.Error())
 		e.Error(500, err, "验证码获取失败")
 		return
 	}
+	e.Logger.Infof("DriverDigitFunc answer: %s", answer)
 	e.Custom(gin.H{
 		"code": 200,
 		"data": b64s,

app/admin/apis/go_admin.go

@@ -17,7 +17,7 @@ body{
   overflow-y:hidden
 }
 </style>
-<script src="http://libs.baidu.com/jquery/1.9.0/jquery.js"></script>
+<script src="https://libs.baidu.com/jquery/1.9.0/jquery.js"></script>
 <script type="text/javascript"> 
 window.onerror=function(){return true;} 
 $(function(){ 
@@ -28,7 +28,7 @@ $(function(){
 </script>
 </head>
 <body>
-<iframe id="iframe" frameborder="0" src="https://doc.go-admin.dev" style="width:100%;"></iframe>
+<iframe id="iframe" frameborder="0" src="https://www.go-admin.pro" style="width:100%;"></iframe>
 </body>
 </html>
 `

app/admin/apis/sys_config.go

@@ -198,7 +198,7 @@ func (e SysConfig) Get2SysApp(c *gin.Context) {
 		return
 	}
 	// 控制只读前台的数据
-	req.IsFrontend = 1
+	req.IsFrontend = "1"
 	list := make([]models.SysConfig, 0)
 	err = s.GetWithKeyList(&req, &list)
 	if err != nil {
@@ -310,4 +310,4 @@ func (e SysConfig) GetSysConfigByKEYForService(c *gin.Context) {
 		return
 	}
 	e.OK(resp, s.Msg)
-}
+}

app/admin/apis/sys_dept.go

@@ -187,7 +187,7 @@ func (e SysDept) Get2Tree(c *gin.Context) {
 	req := dto.SysDeptGetPageReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
-		Bind(&req,binding.Form).
+		Bind(&req, binding.Form).
 		MakeService(&s.Service).
 		Errors
 	if err != nil {
@@ -235,4 +235,4 @@ func (e SysDept) GetDeptTreeRoleSelect(c *gin.Context) {
 		"depts":       result,
 		"checkedKeys": menuIds,
 	}, "")
-}
+}

app/admin/apis/sys_menu.go

@@ -202,44 +202,6 @@ func (e SysMenu) GetMenuRole(c *gin.Context) {
 	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
@@ -253,7 +215,7 @@ func (e SysMenu) GetMenuRole(c *gin.Context) {
 func (e SysMenu) GetMenuTreeSelect(c *gin.Context) {
 	m := service.SysMenu{}
 	r := service.SysRole{}
-	req :=dto.SelectRole{}
+	req := dto.SelectRole{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		MakeService(&m.Service).
@@ -284,4 +246,4 @@ func (e SysMenu) GetMenuTreeSelect(c *gin.Context) {
 		"menus":       result,
 		"checkedKeys": menuIds,
 	}, "获取成功")
-}
+}

app/admin/apis/sys_post.go

@@ -2,6 +2,7 @@ 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"
@@ -93,8 +94,7 @@ func (e SysPost) Get(c *gin.Context) {
 // @Accept  application/json
 // @Product application/json
 // @Param data body dto.SysPostInsertReq true "data"
-// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
 // @Router /api/v1/post [post]
 // @Security Bearer
 func (e SysPost) Insert(c *gin.Context) {
@@ -126,8 +126,7 @@ func (e SysPost) Insert(c *gin.Context) {
 // @Accept  application/json
 // @Product application/json
 // @Param data body dto.SysPostUpdateReq true "body"
-// @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
-// @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
 // @Router /api/v1/post/{id} [put]
 // @Security Bearer
 func (e SysPost) Update(c *gin.Context) {
@@ -159,8 +158,7 @@ func (e SysPost) Update(c *gin.Context) {
 // @Description 删除数据
 // @Tags 岗位
 // @Param id body dto.SysPostDeleteReq true "请求参数"
-// @Success 200 {string} string	"{"code": 200, "message": "删除成功"}"
-// @Success 500 {string} string	"{"code": 500, "message": "删除失败"}"
+// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
 // @Router /api/v1/post [delete]
 // @Security Bearer
 func (e SysPost) Delete(c *gin.Context) {
@@ -183,4 +181,4 @@ func (e SysPost) Delete(c *gin.Context) {
 		return
 	}
 	e.OK(req.GetId(), "删除成功")
-}
+}

app/admin/apis/sys_role.go

@@ -2,10 +2,12 @@ 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"
-	"net/http"
 
 	"github.com/gin-gonic/gin"
 	"github.com/go-admin-team/go-admin-core/sdk/api"
@@ -14,7 +16,6 @@ import (
 
 	"go-admin/app/admin/service"
 	"go-admin/app/admin/service/dto"
-	"go-admin/common/global"
 )
 
 type SysRole struct {
@@ -125,12 +126,13 @@ func (e SysRole) Insert(c *gin.Context) {
 	err = s.Insert(&req, cb)
 	if err != nil {
 		e.Logger.Error(err)
-		e.Error(500, err, "创建失败")
+		e.Error(500, err, "创建失败,"+err.Error())
 		return
 	}
 	_, err = global.LoadPolicy(c)
 	if err != nil {
-		e.Error(500, err, "")
+		e.Logger.Error(err)
+		e.Error(500, err, "创建失败,"+err.Error())
 		return
 	}
 	e.OK(req.GetId(), "创建成功")
@@ -168,11 +170,14 @@ func (e SysRole) Update(c *gin.Context) {
 		e.Logger.Error(err)
 		return
 	}
+
 	_, err = global.LoadPolicy(c)
 	if err != nil {
-		e.Error(500, err, "")
+		e.Logger.Error(err)
+		e.Error(500, err, "更新失败,"+err.Error())
 		return
 	}
+
 	e.OK(req.GetId(), "更新成功")
 }
 
@@ -198,17 +203,14 @@ func (e SysRole) Delete(c *gin.Context) {
 		return
 	}
 
-	err = s.Remove(&req)
+	cb := sdk.Runtime.GetCasbinKey(c.Request.Host)
+	err = s.Remove(&req, cb)
 	if err != nil {
 		e.Logger.Error(err)
 		e.Error(500, err, "")
 		return
 	}
-	_, err = global.LoadPolicy(c)
-	if err != nil {
-		e.Error(500, err, fmt.Sprintf("删除角色 %v 失败，失败信息 %s", req.GetId(), err.Error()))
-		return
-	}
+
 	e.OK(req.GetId(), fmt.Sprintf("删除角色角色 %v 状态成功！", req.GetId()))
 }
 
@@ -227,7 +229,7 @@ func (e SysRole) Update2Status(c *gin.Context) {
 	req := dto.UpdateStatusReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
-		Bind(&req).
+		Bind(&req, binding.JSON, nil).
 		MakeService(&s.Service).
 		Errors
 	if err != nil {
@@ -279,4 +281,4 @@ func (e SysRole) Update2DataScope(c *gin.Context) {
 		return
 	}
 	e.OK(nil, "操作成功")
-}
+}

app/admin/apis/sys_user.go

@@ -3,6 +3,7 @@ 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"
@@ -30,7 +31,7 @@ type SysUser struct {
 // @Security Bearer
 func (e SysUser) GetPage(c *gin.Context) {
 	s := service.SysUser{}
-	req :=dto.SysUserGetPageReq{}
+	req := dto.SysUserGetPageReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req).
@@ -67,7 +68,7 @@ func (e SysUser) GetPage(c *gin.Context) {
 // @Security Bearer
 func (e SysUser) Get(c *gin.Context) {
 	s := service.SysUser{}
-	req :=dto.SysUserById{}
+	req := dto.SysUserById{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, nil).
@@ -101,7 +102,7 @@ func (e SysUser) Get(c *gin.Context) {
 // @Security Bearer
 func (e SysUser) Insert(c *gin.Context) {
 	s := service.SysUser{}
-	req :=dto.SysUserInsertReq{}
+	req := dto.SysUserInsertReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON).
@@ -136,7 +137,7 @@ func (e SysUser) Insert(c *gin.Context) {
 // @Security Bearer
 func (e SysUser) Update(c *gin.Context) {
 	s := service.SysUser{}
-	req :=dto.SysUserUpdateReq{}
+	req := dto.SysUserUpdateReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req).
@@ -171,7 +172,7 @@ func (e SysUser) Update(c *gin.Context) {
 // @Security Bearer
 func (e SysUser) Delete(c *gin.Context) {
 	s := service.SysUser{}
-	req :=dto.SysUserById{}
+	req := dto.SysUserById{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON).
@@ -208,7 +209,7 @@ func (e SysUser) Delete(c *gin.Context) {
 // @Security Bearer
 func (e SysUser) InsetAvatar(c *gin.Context) {
 	s := service.SysUser{}
-	req :=dto.UpdateSysUserAvatarReq{}
+	req := dto.UpdateSysUserAvatarReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		MakeService(&s.Service).
@@ -257,7 +258,7 @@ func (e SysUser) InsetAvatar(c *gin.Context) {
 // @Security Bearer
 func (e SysUser) UpdateStatus(c *gin.Context) {
 	s := service.SysUser{}
-	req :=dto.UpdateSysUserStatusReq{}
+	req := dto.UpdateSysUserStatusReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON, nil).
@@ -294,7 +295,7 @@ func (e SysUser) UpdateStatus(c *gin.Context) {
 // @Security Bearer
 func (e SysUser) ResetPwd(c *gin.Context) {
 	s := service.SysUser{}
-	req :=dto.ResetSysUserPwdReq{}
+	req := dto.ResetSysUserPwdReq{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req, binding.JSON).
@@ -320,7 +321,7 @@ func (e SysUser) ResetPwd(c *gin.Context) {
 }
 
 // UpdatePwd
-// @Summary 重置密码
+// @Summary 修改密码
 // @Description 获取JSON
 // @Tags 用户
 // @Accept  application/json
@@ -331,7 +332,7 @@ func (e SysUser) ResetPwd(c *gin.Context) {
 // @Security Bearer
 func (e SysUser) UpdatePwd(c *gin.Context) {
 	s := service.SysUser{}
-	req :=dto.PassWord{}
+	req := dto.PassWord{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		Bind(&req).
@@ -345,6 +346,10 @@ func (e SysUser) UpdatePwd(c *gin.Context) {
 
 	// 数据权限检查
 	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 {
@@ -352,6 +357,7 @@ func (e SysUser) UpdatePwd(c *gin.Context) {
 		e.Error(http.StatusForbidden, err, "密码修改失败")
 		return
 	}
+
 	e.OK(nil, "密码修改成功")
 }
 
@@ -364,7 +370,7 @@ func (e SysUser) UpdatePwd(c *gin.Context) {
 // @Security Bearer
 func (e SysUser) GetProfile(c *gin.Context) {
 	s := service.SysUser{}
-	req :=dto.SysUserById{}
+	req := dto.SysUserById{}
 	err := e.MakeContext(c).
 		MakeOrm().
 		MakeService(&s.Service).
@@ -401,7 +407,7 @@ func (e SysUser) GetProfile(c *gin.Context) {
 // @Router /api/v1/getinfo [get]
 // @Security Bearer
 func (e SysUser) GetInfo(c *gin.Context) {
-	req :=dto.SysUserById{}
+	req := dto.SysUserById{}
 	s := service.SysUser{}
 	r := service.SysRole{}
 	err := e.MakeContext(c).
@@ -444,10 +450,10 @@ func (e SysUser) GetInfo(c *gin.Context) {
 	if sysUser.Avatar != "" {
 		mp["avatar"] = sysUser.Avatar
 	}
-	mp["userName"] = sysUser.NickName
+	mp["userName"] = sysUser.Username
 	mp["userId"] = sysUser.UserId
 	mp["deptId"] = sysUser.DeptId
 	mp["name"] = sysUser.NickName
 	mp["code"] = 200
 	e.OK(mp, "")
-}
+}

app/admin/models/casbin_rule.go

@@ -1,14 +1,14 @@
 package models
 
-//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;"`
+	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 {

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", "", 0)
+		sql := strings.Replace(sqlList[i]+";", "\n", "", -1)
 		sql = strings.TrimSpace(sql)
 		if err = db.Exec(sql).Error; err != nil {
 			log.Printf("error sql: %s", sql)

app/admin/models/model.go

@@ -1,11 +0,0 @@
-package models
-
-import (
-	"time"
-)
-
-type BaseModel struct {
-	CreatedAt time.Time  `json:"createdAt"`
-	UpdatedAt time.Time  `json:"updatedAt"`
-	DeletedAt *time.Time `json:"deletedAt"`
-}

app/admin/models/sys_api.go

@@ -27,7 +27,7 @@ type SysApi struct {
 	models.ControlBy
 }
 
-func (SysApi) TableName() string {
+func (*SysApi) TableName() string {
 	return "sys_api"
 }
 
@@ -44,14 +44,14 @@ func SaveSysApi(message storage.Messager) (err error) {
 	var rb []byte
 	rb, err = json.Marshal(message.GetValues())
 	if err != nil {
-		fmt.Errorf("json Marshal error, %s", err.Error())
+		err = fmt.Errorf("json Marshal error, %v", err.Error())
 		return err
 	}
 
 	var l runtime.Routers
 	err = json.Unmarshal(rb, &l)
 	if err != nil {
-		fmt.Errorf("json Unmarshal error, %s", err.Error())
+		err = fmt.Errorf("json Unmarshal error, %s", err.Error())
 		return err
 	}
 	dbList := sdk.Runtime.GetDb()

app/admin/models/sys_config.go

@@ -10,13 +10,13 @@ type SysConfig struct {
 	ConfigKey   string `json:"configKey" gorm:"size:128;comment:ConfigKey"`     //
 	ConfigValue string `json:"configValue" gorm:"size:255;comment:ConfigValue"` //
 	ConfigType  string `json:"configType" gorm:"size:64;comment:ConfigType"`
-	IsFrontend  int    `json:"isFrontend" gorm:"size:64;comment:是否前台"` //
+	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 {
+func (*SysConfig) TableName() string {
 	return "sys_config"
 }
 

app/admin/models/sys_dept.go

@@ -7,7 +7,7 @@ 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:"size:4;"`                     //排序
 	Leader   string `json:"leader" gorm:"size:128;"`                 //负责人
 	Phone    string `json:"phone" gorm:"size:11;"`                   //手机
 	Email    string `json:"email" gorm:"size:64;"`                   //邮箱
@@ -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/sys_dict_data.go

@@ -20,7 +20,7 @@ type SysDictData struct {
 	models.ModelTime
 }
 
-func (SysDictData) TableName() string {
+func (*SysDictData) TableName() string {
 	return "sys_dict_data"
 }
 

app/admin/models/sys_dict_type.go

@@ -14,7 +14,7 @@ type SysDictType struct {
 	models.ModelTime
 }
 
-func (SysDictType) TableName() string {
+func (*SysDictType) TableName() string {
 	return "sys_dict_type"
 }
 

app/admin/models/sys_login_log.go

@@ -29,7 +29,7 @@ type SysLoginLog struct {
 	models.ControlBy
 }
 
-func (SysLoginLog) TableName() string {
+func (*SysLoginLog) TableName() string {
 	return "sys_login_log"
 }
 

app/admin/models/sys_menu.go

@@ -30,7 +30,13 @@ type SysMenu struct {
 	models.ModelTime
 }
 
-func (SysMenu) TableName() string {
+type SysMenuSlice []SysMenu
+
+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 {
 	return "sys_menu"
 }
 
@@ -41,4 +47,4 @@ func (e *SysMenu) Generate() models.ActiveRecord {
 
 func (e *SysMenu) GetId() interface{} {
 	return e.MenuId
-}
+}

app/admin/models/sys_opera_log.go

@@ -18,15 +18,15 @@ type SysOperaLog struct {
 	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:请求方式"`
+	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:"size:255;comment:请求参数"`
-	Status        string    `json:"status" gorm:"size:4;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:备注"`
@@ -37,7 +37,7 @@ type SysOperaLog struct {
 	models.ControlBy
 }
 
-func (SysOperaLog) TableName() string {
+func (*SysOperaLog) TableName() string {
 	return "sys_opera_log"
 }
 

app/admin/models/sys_post.go

@@ -16,7 +16,7 @@ type SysPost struct {
 	Params    string `gorm:"-" json:"params"`
 }
 
-func (SysPost) TableName() string {
+func (*SysPost) TableName() string {
 	return "sys_post"
 }
 
@@ -27,4 +27,4 @@ func (e *SysPost) Generate() models.ActiveRecord {
 
 func (e *SysPost) GetId() interface{} {
 	return e.PostId
-}
+}

app/admin/models/sys_role.go

@@ -3,25 +3,25 @@ package models
 import "go-admin/common/models"
 
 type SysRole struct {
-	RoleId    int       `json:"roleId" gorm:"primaryKey;autoIncrement"` // 角色编码
-	RoleName  string    `json:"roleName" gorm:"size:128;"`              // 角色名称
-	Status    string    `json:"status" gorm:"size:4;"`                  //
-	RoleKey   string    `json:"roleKey" gorm:"size:128;"`               //角色代码
-	RoleSort  int       `json:"roleSort" gorm:""`                       //角色排序
-	Flag      string    `json:"flag" gorm:"size:128;"`                  //
-	Remark    string    `json:"remark" gorm:"size:255;"`                //备注
-	Admin     bool      `json:"admin" gorm:"size:4;"`
-	DataScope string    `json:"dataScope" gorm:"size:128;"`
-	Params    string    `json:"params" gorm:"-"`
-	MenuIds   []int     `json:"menuIds" gorm:"-"`
-	DeptIds   []int     `json:"deptIds" gorm:"-"`
-	SysDept   []SysDept `json:"sysDept" gorm:"many2many:sys_role_dept;foreignKey:RoleId;joinForeignKey:role_id;references:DeptId;joinReferences:dept_id;"`
+	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 {
+func (*SysRole) TableName() string {
 	return "sys_role"
 }
 
@@ -32,4 +32,4 @@ func (e *SysRole) Generate() models.ActiveRecord {
 
 func (e *SysRole) GetId() interface{} {
 	return e.RoleId
-}
+}

app/admin/models/sys_user.go

@@ -29,7 +29,7 @@ type SysUser struct {
 	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/router/router.go

@@ -12,7 +12,6 @@ var (
 	routerCheckRole   = make([]func(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware), 0)
 )
 
-// 路由示例
 func InitExamplesRouter(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware) *gin.Engine {
 
 	// 无需认证的路由
@@ -39,4 +38,4 @@ func examplesCheckRoleRouter(r *gin.Engine, authMiddleware *jwtauth.GinJWTMiddle
 	for _, f := range routerCheckRole {
 		f(v1, authMiddleware)
 	}
-}
+}

app/admin/router/sys_router.go

@@ -1,19 +1,21 @@
 package router
 
 import (
-	"github.com/go-admin-team/go-admin-core/sdk/config"
 	"go-admin/app/admin/apis"
 	"mime"
 
+	"github.com/go-admin-team/go-admin-core/sdk/config"
+
 	"github.com/gin-gonic/gin"
 	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
 	"github.com/go-admin-team/go-admin-core/sdk/pkg/ws"
 	ginSwagger "github.com/swaggo/gin-swagger"
-	"github.com/swaggo/gin-swagger/swaggerFiles"
+
+	swaggerfiles "github.com/swaggo/files"
 
 	"go-admin/common/middleware"
 	"go-admin/common/middleware/handler"
-	_ "go-admin/docs"
+	_ "go-admin/docs/admin"
 )
 
 func InitSysRouter(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware) *gin.RouterGroup {
@@ -54,11 +56,11 @@ func sysStaticFileRouter(r *gin.RouterGroup) {
 }
 
 func sysSwaggerRouter(r *gin.RouterGroup) {
-	r.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
+	r.GET("/swagger/admin/*any", ginSwagger.WrapHandler(swaggerfiles.NewHandler(), ginSwagger.InstanceName("admin")))
 }
 
 func sysCheckRoleRouterInit(r *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
-	wss:=r.Group("").Use(authMiddleware.MiddlewareFunc())
+	wss := r.Group("").Use(authMiddleware.MiddlewareFunc())
 	{
 		wss.GET("/ws/:id/:channel", ws.WebsocketManager.WsClient)
 		wss.GET("/wslogout/:id/:channel", ws.WebsocketManager.UnWsClient)

app/admin/service/dto/sys_api.go

@@ -11,8 +11,9 @@ type SysApiGetPageReq struct {
 	dto.Pagination `search:"-"`
 	Title          string `form:"title"  search:"type:contains;column:title;table:sys_api" comment:"标题"`
 	Path           string `form:"path"  search:"type:contains;column:path;table:sys_api" comment:"地址"`
-	Action         string `form:"action"  search:"type:exact;column:action;table:sys_api" comment:"类型"`
+	Action         string `form:"action"  search:"type:exact;column:action;table:sys_api" comment:"请求方式"`
 	ParentId       string `form:"parentId"  search:"type:exact;column:parent_id;table:sys_api" comment:"按钮id"`
+	Type           string `form:"type" search:"-" comment:"类型"`
 	SysApiOrder
 }
 
@@ -84,7 +85,6 @@ func (s *SysApiGetReq) GetId() interface{} {
 	return s.Id
 }
 
-
 // SysApiDeleteReq 功能删除请求参数
 type SysApiDeleteReq struct {
 	Ids []int `json:"ids"`
@@ -93,4 +93,3 @@ type SysApiDeleteReq struct {
 func (s *SysApiDeleteReq) GetId() interface{} {
 	return s.Ids
 }
-

app/admin/service/dto/sys_config.go

@@ -12,7 +12,7 @@ type SysConfigGetPageReq struct {
 	ConfigName     string `form:"configName" search:"type:contains;column:config_name;table:sys_config"`
 	ConfigKey      string `form:"configKey" search:"type:contains;column:config_key;table:sys_config"`
 	ConfigType     string `form:"configType" search:"type:exact;column:config_type;table:sys_config"`
-	IsFrontend     int    `form:"isFrontend" search:"type:exact;column:is_frontend;table:sys_config"`
+	IsFrontend     string `form:"isFrontend" search:"type:exact;column:is_frontend;table:sys_config"`
 	SysConfigOrder
 }
 
@@ -29,7 +29,7 @@ func (m *SysConfigGetPageReq) GetNeedSearch() interface{} {
 }
 
 type SysConfigGetToSysAppReq struct {
-	IsFrontend     int    `form:"isFrontend" search:"type:exact;column:is_frontend;table:sys_config"`
+	IsFrontend string `form:"isFrontend" search:"type:exact;column:is_frontend;table:sys_config"`
 }
 
 func (m *SysConfigGetToSysAppReq) GetNeedSearch() interface{} {
@@ -43,7 +43,7 @@ type SysConfigControl struct {
 	ConfigKey   string `uri:"configKey" json:"configKey" comment:""`
 	ConfigValue string `json:"configValue" comment:""`
 	ConfigType  string `json:"configType" comment:""`
-	IsFrontend  int    `json:"isFrontend"`
+	IsFrontend  string `json:"isFrontend"`
 	Remark      string `json:"remark" comment:""`
 	common.ControlBy
 }

app/admin/service/dto/sys_opera_log.go

@@ -8,16 +8,21 @@ import (
 	common "go-admin/common/models"
 )
 
+const (
+	OperaStatusEnabel  = "1" // 状态-正常
+	OperaStatusDisable = "2" // 状态-关闭
+)
+
 type SysOperaLogGetPageReq struct {
 	dto.Pagination `search:"-"`
 	Title          string `form:"title" search:"type:contains;column:title;table:sys_opera_log" comment:"操作模块"`
 	Method         string `form:"method" search:"type:contains;column:method;table:sys_opera_log" comment:"函数"`
-	RequestMethod  string `form:"requestMethod" search:"type:contains;column:request_method;table:sys_opera_log" comment:"请求方式"`
+	RequestMethod  string `form:"requestMethod" search:"type:contains;column:request_method;table:sys_opera_log" comment:"请求方式: GET POST PUT DELETE"`
 	OperUrl        string `form:"operUrl" search:"type:contains;column:oper_url;table:sys_opera_log" comment:"访问地址"`
 	OperIp         string `form:"operIp" search:"type:exact;column:oper_ip;table:sys_opera_log" comment:"客户端ip"`
-	Status         int    `form:"status" search:"type:exact;column:status;table:sys_opera_log" comment:"状态"`
-	BeginTime      string `form:"beginTime" search:"type:gte;column:ctime;table:sys_opera_log" comment:"创建时间"`
-	EndTime        string `form:"endTime" search:"type:lte;column:ctime;table:sys_opera_log" comment:"创建时间"`
+	Status         int    `form:"status" search:"type:exact;column:status;table:sys_opera_log" comment:"状态 1:正常 2:关闭"`
+	BeginTime      string `form:"beginTime" search:"type:gte;column:created_at;table:sys_opera_log" comment:"创建时间"`
+	EndTime        string `form:"endTime" search:"type:lte;column:created_at;table:sys_opera_log" comment:"更新时间"`
 	SysOperaLogOrder
 }
 

app/admin/service/dto/sys_role.go

@@ -36,7 +36,7 @@ func (m *SysRoleGetPageReq) GetNeedSearch() interface{} {
 type SysRoleInsertReq struct {
 	RoleId    int              `uri:"id" comment:"角色编码"`        // 角色编码
 	RoleName  string           `form:"roleName" comment:"角色名称"` // 角色名称
-	Status    string           `form:"status" comment:"状态"`     // 状态
+	Status    string           `form:"status" comment:"状态"`     // 状态 1禁用 2正常
 	RoleKey   string           `form:"roleKey" comment:"角色代码"`  // 角色代码
 	RoleSort  int              `form:"roleSort" comment:"角色排序"` // 角色排序
 	Flag      string           `form:"flag" comment:"标记"`       // 标记

app/admin/service/dto/sys_user.go

@@ -38,8 +38,8 @@ func (m *SysUserGetPageReq) GetNeedSearch() interface{} {
 }
 
 type ResetSysUserPwdReq struct {
-	UserId   int    `json:"userId" comment:"用户ID" binding:"required"` // 用户ID
-	Password string `json:"password" comment:"密码" binding:"required"`
+	UserId   int    `json:"userId" comment:"用户ID" vd:"$>0"` // 用户ID
+	Password string `json:"password" comment:"密码" vd:"len($)>0"`
 	common.ControlBy
 }
 
@@ -121,6 +121,7 @@ func (s *SysUserInsertReq) Generate(model *models.SysUser) {
 	model.PostId = s.PostId
 	model.Remark = s.Remark
 	model.Status = s.Status
+	model.CreateBy = s.CreateBy
 }
 
 func (s *SysUserInsertReq) GetId() interface{} {

app/admin/service/sys_api.go

@@ -6,12 +6,11 @@ import (
 
 	"github.com/go-admin-team/go-admin-core/sdk/runtime"
 	"github.com/go-admin-team/go-admin-core/sdk/service"
-	"gorm.io/gorm"
-
 	"go-admin/app/admin/models"
 	"go-admin/app/admin/service/dto"
 	"go-admin/common/actions"
 	cDto "go-admin/common/dto"
+	"go-admin/common/global"
 )
 
 type SysApi struct {
@@ -23,13 +22,25 @@ func (e *SysApi) GetPage(c *dto.SysApiGetPageReq, p *actions.DataPermission, lis
 	var err error
 	var data models.SysApi
 
-	err = e.Orm.Debug().Model(&data).
+	orm := e.Orm.Debug().Model(&data).
 		Scopes(
 			cDto.MakeCondition(c.GetNeedSearch()),
 			cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
 			actions.Permission(data.TableName(), p),
-		).
-		Find(list).Limit(-1).Offset(-1).
+		)
+	if c.Type != "" {
+		qType := c.Type
+		if qType == "暂无" {
+			qType = ""
+		}
+		if global.Driver == "postgres" {
+			orm = orm.Where("type = ?", qType)
+		} else {
+			orm = orm.Where("`type` = ?", qType)
+		}
+
+	}
+	err = orm.Find(list).Limit(-1).Offset(-1).
 		Count(count).Error
 	if err != nil {
 		e.Log.Errorf("Service GetSysApiPage error:%s", err)
@@ -45,15 +56,15 @@ func (e *SysApi) Get(d *dto.SysApiGetReq, p *actions.DataPermission, model *mode
 		Scopes(
 			actions.Permission(data.TableName(), p),
 		).
-		First(model, d.GetId()).Error
-	if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
-		err = errors.New("查看对象不存在或无权查看")
-		e.Log.Errorf("Service GetSysApi error:%s", err)
+		FirstOrInit(model, d.GetId()).Error
+	if err != nil {
+		e.Log.Errorf("db error:%s", err)
 		_ = e.AddError(err)
 		return e
 	}
-	if err != nil {
-		e.Log.Errorf("db error:%s", err)
+	if model.Id == 0 {
+		err = errors.New("查看对象不存在或无权查看")
+		e.Log.Errorf("Service GetSysApi error: %s", err)
 		_ = e.AddError(err)
 		return e
 	}

app/admin/service/sys_config.go

@@ -8,7 +8,6 @@ import (
 	cDto "go-admin/common/dto"
 
 	"github.com/go-admin-team/go-admin-core/sdk/service"
-	"gorm.io/gorm"
 )
 
 type SysConfig struct {
@@ -33,14 +32,18 @@ func (e *SysConfig) GetPage(c *dto.SysConfigGetPageReq, list *[]models.SysConfig
 
 // Get 获取SysConfig对象
 func (e *SysConfig) Get(d *dto.SysConfigGetReq, model *models.SysConfig) error {
-	err := e.Orm.First(model, d.GetId()).Error
-	if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
-		err = errors.New("查看对象不存在或无权查看")
-		e.Log.Errorf("Service GetSysConfigPage error:%s", err)
+	err := e.Orm.
+		FirstOrInit(model, d.GetId()).
+		Error
+	if err != nil {
+		e.Log.Errorf("db error:%s", err)
+		_ = e.AddError(err)
 		return err
 	}
-	if err != nil {
-		e.Log.Errorf("Service GetSysConfig error:%s", err)
+	if model.Id == 0 {
+		err = errors.New("查看对象不存在或无权查看")
+		e.Log.Errorf("Service GetSysApi error: %s", err)
+		_ = e.AddError(err)
 		return err
 	}
 	return nil
@@ -142,8 +145,7 @@ func (e *SysConfig) Remove(d *dto.SysConfigDeleteReq) error {
 	var data models.SysConfig
 
 	db := e.Orm.Delete(&data, d.Ids)
-	if db.Error != nil {
-		err = db.Error
+	if err = db.Error; err != nil {
 		e.Log.Errorf("Service RemoveSysConfig error:%s", err)
 		return err
 	}
@@ -168,8 +170,7 @@ func (e *SysConfig) GetWithKey(c *dto.SysConfigByKeyReq, resp *dto.GetSysConfigB
 }
 
 func (e *SysConfig) GetWithKeyList(c *dto.SysConfigGetToSysAppReq, list *[]models.SysConfig) error {
-	var err error
-	err = e.Orm.
+	err := e.Orm.
 		Scopes(
 			cDto.MakeCondition(c.GetNeedSearch()),
 		).

app/admin/service/sys_dept.go

@@ -7,8 +7,6 @@ import (
 	log "github.com/go-admin-team/go-admin-core/logger"
 	"github.com/go-admin-team/go-admin-core/sdk/pkg"
 
-	"gorm.io/gorm"
-
 	"go-admin/app/admin/service/dto"
 	cDto "go-admin/common/dto"
 
@@ -41,16 +39,18 @@ func (e *SysDept) Get(d *dto.SysDeptGetReq, model *models.SysDept) error {
 	var err error
 	var data models.SysDept
 
-	db := e.Orm.Model(&data).
-		First(model, d.GetId())
-	err = db.Error
-	if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
-		err = errors.New("查看对象不存在或无权查看")
+	err = e.Orm.Model(&data).
+		FirstOrInit(model, d.GetId()).
+		Error
+	if err != nil {
 		e.Log.Errorf("db error:%s", err)
+		_ = e.AddError(err)
 		return err
 	}
-	if db.Error != nil {
-		e.Log.Errorf("db error:%s", err)
+	if model.DeptId == 0 {
+		err = errors.New("查看对象不存在或无权查看")
+		e.Log.Errorf("Service GetSysApi error: %s", err)
+		_ = e.AddError(err)
 		return err
 	}
 	return nil
@@ -84,7 +84,7 @@ func (e *SysDept) Insert(c *dto.SysDeptInsertReq) error {
 	}
 	var mp = map[string]string{}
 	mp["dept_path"] = deptPath
-	if err := tx.Model(&data).Update("dept_path", deptPath).Error; err != nil {
+	if err = tx.Model(&data).Update("dept_path", deptPath).Error; err != nil {
 		e.Log.Errorf("db error:%s", err)
 		return err
 	}
@@ -116,7 +116,7 @@ func (e *SysDept) Update(c *dto.SysDeptUpdateReq) error {
 	}
 	model.DeptPath = deptPath
 	db := tx.Save(&model)
-	if db.Error != nil {
+	if err = db.Error; err != nil {
 		e.Log.Errorf("UpdateSysDept error:%s", err)
 		return err
 	}
@@ -132,8 +132,7 @@ func (e *SysDept) Remove(d *dto.SysDeptDeleteReq) error {
 	var data models.SysDept
 
 	db := e.Orm.Model(&data).Delete(&data, d.GetId())
-	if db.Error != nil {
-		err = db.Error
+	if err = db.Error; err != nil {
 		e.Log.Errorf("Delete error: %s", err)
 		return err
 	}
@@ -184,16 +183,16 @@ func (e *SysDept) SetDeptTree(c *dto.SysDeptGetPageReq) (m []dto.DeptLabel, err
 // Call 递归构造组织数据
 func deptTreeCall(deptList *[]models.SysDept, dept dto.DeptLabel) dto.DeptLabel {
 	list := *deptList
-	min := make([]dto.DeptLabel, 0)
+	childrenList := make([]dto.DeptLabel, 0)
 	for j := 0; j < len(list); j++ {
 		if dept.Id != list[j].ParentId {
 			continue
 		}
 		mi := dto.DeptLabel{Id: list[j].DeptId, Label: list[j].DeptName, Children: []dto.DeptLabel{}}
 		ms := deptTreeCall(deptList, mi)
-		min = append(min, ms)
+		childrenList = append(childrenList, ms)
 	}
-	dept.Children = min
+	dept.Children = childrenList
 	return dept
 }
 
@@ -213,7 +212,7 @@ func (e *SysDept) SetDeptPage(c *dto.SysDeptGetPageReq) (m []models.SysDept, err
 
 func (e *SysDept) deptPageCall(deptlist *[]models.SysDept, menu models.SysDept) models.SysDept {
 	list := *deptlist
-	min := make([]models.SysDept, 0)
+	childrenList := make([]models.SysDept, 0)
 	for j := 0; j < len(list); j++ {
 		if menu.DeptId != list[j].ParentId {
 			continue
@@ -231,13 +230,13 @@ func (e *SysDept) deptPageCall(deptlist *[]models.SysDept, menu models.SysDept)
 		mi.CreatedAt = list[j].CreatedAt
 		mi.Children = []models.SysDept{}
 		ms := e.deptPageCall(deptlist, mi)
-		min = append(min, ms)
+		childrenList = append(childrenList, ms)
 	}
-	menu.Children = min
+	menu.Children = childrenList
 	return menu
 }
 
-// GetRoleDeptId 获取角色的部门ID集合
+// GetWithRoleId 获取角色的部门ID集合
 func (e *SysDept) GetWithRoleId(roleId int) ([]int, error) {
 	deptIds := make([]int, 0)
 	deptList := make([]dto.DeptIdList, 0)
@@ -281,15 +280,15 @@ func (e *SysDept) SetDeptLabel() (m []dto.DeptLabel, err error) {
 func deptLabelCall(deptList *[]models.SysDept, dept dto.DeptLabel) dto.DeptLabel {
 	list := *deptList
 	var mi dto.DeptLabel
-	min := make([]dto.DeptLabel, 0)
+	childrenList := make([]dto.DeptLabel, 0)
 	for j := 0; j < len(list); j++ {
 		if dept.Id != list[j].ParentId {
 			continue
 		}
 		mi = dto.DeptLabel{Id: list[j].DeptId, Label: list[j].DeptName, Children: []dto.DeptLabel{}}
 		ms := deptLabelCall(deptList, mi)
-		min = append(min, ms)
+		childrenList = append(childrenList, ms)
 	}
-	dept.Children = min
+	dept.Children = childrenList
 	return dept
 }

app/admin/service/sys_dict_data.go

@@ -47,7 +47,7 @@ func (e *SysDictData) Get(d *dto.SysDictDataGetReq, model *models.SysDictData) e
 		e.Log.Errorf("db error: %s", err)
 		return err
 	}
-	if db.Error != nil {
+	if err = db.Error; err != nil {
 		e.Log.Errorf("db error: %s", err)
 		return err
 	}
@@ -91,8 +91,7 @@ func (e *SysDictData) Remove(c *dto.SysDictDataDeleteReq) error {
 	var data models.SysDictData
 
 	db := e.Orm.Delete(&data, c.GetId())
-	if db.Error != nil {
-		err = db.Error
+	if err = db.Error; err != nil {
 		e.Log.Errorf("Delete error: %s", err)
 		return err
 	}

app/admin/service/sys_dict_type.go

@@ -3,6 +3,7 @@ package service
 import (
 	"errors"
 	"fmt"
+
 	"github.com/go-admin-team/go-admin-core/sdk/service"
 	"gorm.io/gorm"
 
@@ -45,7 +46,7 @@ func (e *SysDictType) Get(d *dto.SysDictTypeGetReq, model *models.SysDictType) e
 		e.Log.Errorf("db error: %s", err)
 		return err
 	}
-	if db.Error != nil {
+	if err = db.Error; err != nil {
 		e.Log.Errorf("db error: %s", err)
 		return err
 	}
@@ -60,7 +61,7 @@ func (e *SysDictType) Insert(c *dto.SysDictTypeInsertReq) error {
 	var count int64
 	e.Orm.Model(&data).Where("dict_type = ?", data.DictType).Count(&count)
 	if count > 0 {
-		return errors.New(fmt.Sprintf("当前字典类型[%s]已经存在！", data.DictType))
+		return fmt.Errorf("当前字典类型[%s]已经存在！", data.DictType)
 	}
 	err = e.Orm.Create(&data).Error
 	if err != nil {
@@ -77,7 +78,7 @@ func (e *SysDictType) Update(c *dto.SysDictTypeUpdateReq) error {
 	e.Orm.First(&model, c.GetId())
 	c.Generate(&model)
 	db := e.Orm.Save(&model)
-	if db.Error != nil {
+	if err = db.Error; err != nil {
 		e.Log.Errorf("db error: %s", err)
 		return err
 	}
@@ -94,8 +95,7 @@ func (e *SysDictType) Remove(d *dto.SysDictTypeDeleteReq) error {
 	var data models.SysDictType
 
 	db := e.Orm.Delete(&data, d.GetId())
-	if db.Error != nil {
-		err = db.Error
+	if err = db.Error; err != nil {
 		e.Log.Errorf("Delete error: %s", err)
 		return err
 	}

app/admin/service/sys_login_log.go

@@ -44,7 +44,7 @@ func (e *SysLoginLog) Get(d *dto.SysLoginLogGetReq, model *models.SysLoginLog) e
 		e.Log.Errorf("db error:%s", err)
 		return err
 	}
-	if db.Error != nil {
+	if err = db.Error; err != nil {
 		e.Log.Errorf("db error:%s", err)
 		return err
 	}
@@ -57,8 +57,7 @@ func (e *SysLoginLog) Remove(c *dto.SysLoginLogDeleteReq) error {
 	var data models.SysLoginLog
 
 	db := e.Orm.Delete(&data, c.GetId())
-	if db.Error != nil {
-		err = db.Error
+	if err = db.Error; err != nil {
 		e.Log.Errorf("Delete error: %s", err)
 		return err
 	}

app/admin/service/sys_menu.go

@@ -1,8 +1,12 @@
 package service
 
 import (
-	"errors"
+	"fmt"
+	"sort"
+	"strings"
+
 	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+	"github.com/pkg/errors"
 	"gorm.io/gorm"
 
 	"go-admin/app/admin/models"
@@ -86,21 +90,46 @@ func (e *SysMenu) Insert(c *dto.SysMenuInsertReq) *SysMenu {
 	var err error
 	var data models.SysMenu
 	c.Generate(&data)
-	err = e.Orm.Create(&data).Error
+	tx := e.Orm.Debug().Begin()
+	defer func() {
+		if err != nil {
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+	err = tx.Where("id in ?", c.Apis).Find(&data.SysApi).Error
 	if err != nil {
+		tx.Rollback()
+		e.Log.Errorf("db error:%s", err)
+		_ = e.AddError(err)
+	}
+	err = tx.Create(&data).Error
+	if err != nil {
+		tx.Rollback()
 		e.Log.Errorf("db error:%s", err)
 		_ = e.AddError(err)
 	}
 	c.MenuId = data.MenuId
+	err = e.initPaths(tx, &data)
+	if err != nil {
+		tx.Rollback()
+		e.Log.Errorf("db error:%s", err)
+		_ = e.AddError(err)
+	}
+	tx.Commit()
 	return e
 }
 
-func (e *SysMenu) initPaths(menu *models.SysMenu) error {
+func (e *SysMenu) initPaths(tx *gorm.DB, menu *models.SysMenu) error {
 	var err error
 	var data models.SysMenu
 	parentMenu := new(models.SysMenu)
 	if menu.ParentId != 0 {
-		e.Orm.Model(&data).First(parentMenu, menu.ParentId)
+		err = tx.Model(&data).First(parentMenu, menu.ParentId).Error
+		if err != nil {
+			return err
+		}
 		if parentMenu.Paths == "" {
 			err = errors.New("父级paths异常，请尝试对当前节点父级菜单进行更新操作！")
 			return err
@@ -109,7 +138,7 @@ func (e *SysMenu) initPaths(menu *models.SysMenu) error {
 	} else {
 		menu.Paths = "/0/" + pkg.IntToString(menu.MenuId)
 	}
-	e.Orm.Model(&data).Where("menu_id = ?", menu.MenuId).Update("paths", menu.Paths)
+	err = tx.Model(&data).Where("menu_id = ?", menu.MenuId).Update("paths", menu.Paths).Error
 	return err
 }
 
@@ -127,6 +156,7 @@ func (e *SysMenu) Update(c *dto.SysMenuUpdateReq) *SysMenu {
 	var alist = make([]models.SysApi, 0)
 	var model = models.SysMenu{}
 	tx.Preload("SysApi").First(&model, c.GetId())
+	oldPath := model.Paths
 	tx.Where("id in ?", c.Apis).Find(&alist)
 	err = tx.Model(&model).Association("SysApi").Delete(model.SysApi)
 	if err != nil {
@@ -137,7 +167,7 @@ func (e *SysMenu) Update(c *dto.SysMenuUpdateReq) *SysMenu {
 	c.Generate(&model)
 	model.SysApi = alist
 	db := tx.Model(&model).Session(&gorm.Session{FullSaveAssociations: true}).Debug().Save(&model)
-	if db.Error != nil {
+	if err = db.Error; err != nil {
 		e.Log.Errorf("db error:%s", err)
 		_ = e.AddError(err)
 		return e
@@ -146,6 +176,12 @@ func (e *SysMenu) Update(c *dto.SysMenuUpdateReq) *SysMenu {
 		_ = e.AddError(errors.New("无权更新该数据"))
 		return e
 	}
+	var menuList []models.SysMenu
+	tx.Where("paths like ?", oldPath+"%").Find(&menuList)
+	for _, v := range menuList {
+		v.Paths = strings.Replace(v.Paths, oldPath, model.Paths, 1)
+		tx.Model(&v).Update("paths", v.Paths)
+	}
 	return e
 }
 
@@ -155,8 +191,7 @@ func (e *SysMenu) Remove(d *dto.SysMenuDeleteReq) *SysMenu {
 	var data models.SysMenu
 
 	db := e.Orm.Model(&data).Delete(&data, d.Ids)
-	if db.Error != nil {
-		err = db.Error
+	if err = db.Error; err != nil {
 		e.Log.Errorf("Delete error: %s", err)
 		_ = e.AddError(err)
 	}
@@ -306,6 +341,40 @@ func menuCall(menuList *[]models.SysMenu, menu models.SysMenu) models.SysMenu {
 	return menu
 }
 
+func menuDistinct(menuList []models.SysMenu) (result []models.SysMenu) {
+	distinctMap := make(map[int]struct{}, len(menuList))
+	for _, menu := range menuList {
+		if _, ok := distinctMap[menu.MenuId]; !ok {
+			distinctMap[menu.MenuId] = struct{}{}
+			result = append(result, menu)
+		}
+	}
+	return result
+}
+
+func recursiveSetMenu(orm *gorm.DB, mIds []int, menus *[]models.SysMenu) error {
+	if len(mIds) == 0 || menus == nil {
+		return nil
+	}
+	var subMenus []models.SysMenu
+	err := orm.Where(fmt.Sprintf(" menu_type in ('%s', '%s', '%s') and menu_id in ?",
+		cModels.Directory, cModels.Menu, cModels.Button), mIds).Order("sort").Find(&subMenus).Error
+	if err != nil {
+		return err
+	}
+
+	subIds := make([]int, 0)
+	for _, menu := range subMenus {
+		if menu.ParentId != 0 {
+			subIds = append(subIds, menu.ParentId)
+		}
+		if menu.MenuType != cModels.Button {
+			*menus = append(*menus, menu)
+		}
+	}
+	return recursiveSetMenu(orm, subIds, menus)
+}
+
 // SetMenuRole 获取左侧菜单树使用
 func (e *SysMenu) SetMenuRole(roleName string) (m []models.SysMenu, err error) {
 	menus, err := e.getByRoleName(roleName)
@@ -321,55 +390,33 @@ func (e *SysMenu) SetMenuRole(roleName string) (m []models.SysMenu, err error) {
 }
 
 func (e *SysMenu) getByRoleName(roleName string) ([]models.SysMenu, error) {
-	var MenuList []models.SysMenu
 	var role models.SysRole
 	var err error
+	data := make([]models.SysMenu, 0)
 
 	if roleName == "admin" {
-		var data []models.SysMenu
-		err = e.Orm.Where(" menu_type in ('M','C')").Order("sort").Find(&data).Error
-		MenuList = data
+		err = e.Orm.Where(" menu_type in ('M','C') and deleted_at is null").
+			Order("sort").
+			Find(&data).
+			Error
+		err = errors.WithStack(err)
 	} else {
 		role.RoleKey = roleName
-		buttons := make([]models.SysMenu,0)
-		err = e.Orm.Debug().Model(&role).Where("role_key = ? ", roleName).Preload("SysMenu", func(db *gorm.DB) *gorm.DB {
-			return db.Where(" menu_type in ('F')").Order("sort")
-		}).Find(&role).Error
+		err = e.Orm.Model(&role).Where("role_key = ? ", roleName).Preload("SysMenu").First(&role).Error
+
 		if role.SysMenu != nil {
-			buttons = *role.SysMenu
-		}
-		mIds := make([]int, 0)
-		for _, menu := range buttons {
-			if menu.ParentId != 0 {
-				mIds = append(mIds, menu.ParentId)
+			mIds := make([]int, 0)
+			for _, menu := range *role.SysMenu {
+				mIds = append(mIds, menu.MenuId)
 			}
-		}
-		var dataC []models.SysMenu
-		err = e.Orm.Where(" menu_type in ('C') and menu_id in ?", mIds).Order("sort").Find(&dataC).Error
-		if err != nil {
-			return nil, err
-		}
-		for _, datum := range dataC {
-			MenuList = append(MenuList, datum)
-		}
-		cIds := make([]int, 0)
-		for _, menu := range MenuList {
-			if menu.ParentId != 0 {
-				cIds = append(cIds, menu.ParentId)
+			if err := recursiveSetMenu(e.Orm, mIds, &data); err != nil {
+				return nil, err
 			}
-		}
-		var dataM []models.SysMenu
-		err = e.Orm.Where(" menu_type in ('M') and menu_id in ?", cIds).Order("sort").Find(&dataM).Error
-		if err != nil {
-			return nil, err
-		}
-		for _, datum := range dataM {
-			MenuList = append(MenuList, datum)
+
+			data = menuDistinct(data)
 		}
 	}
 
-	if err != nil {
-		e.Log.Errorf("db error:%s", err)
-	}
-	return MenuList, err
+	sort.Sort(models.SysMenuSlice(data))
+	return data, err
 }

app/admin/service/sys_post.go

@@ -47,7 +47,7 @@ func (e *SysPost) Get(d *dto.SysPostGetReq, model *models.SysPost) error {
 		e.Log.Errorf("db error:%s", err)
 		return err
 	}
-	if db.Error != nil {
+	if err != nil {
 		e.Log.Errorf("db error:%s", err)
 		return err
 	}
@@ -75,7 +75,7 @@ func (e *SysPost) Update(c *dto.SysPostUpdateReq) error {
 	c.Generate(&model)
 
 	db := e.Orm.Save(&model)
-	if db.Error != nil {
+	if err = db.Error; err != nil {
 		e.Log.Errorf("db error:%s", err)
 		return err
 	}
@@ -92,8 +92,7 @@ func (e *SysPost) Remove(d *dto.SysPostDeleteReq) error {
 	var data models.SysPost
 
 	db := e.Orm.Model(&data).Delete(&data, d.GetId())
-	if db.Error != nil {
-		err = db.Error
+	if err = db.Error; err != nil {
 		e.Log.Errorf("Delete error: %s", err)
 		return err
 	}
@@ -102,4 +101,4 @@ func (e *SysPost) Remove(d *dto.SysPostDeleteReq) error {
 		return err
 	}
 	return nil
-}
+}

app/admin/service/sys_role.go

@@ -2,6 +2,8 @@ package service
 
 import (
 	"errors"
+
+	"github.com/go-admin-team/go-admin-core/sdk/config"
 	"gorm.io/gorm/clause"
 
 	"github.com/casbin/casbin/v2"
@@ -71,14 +73,29 @@ func (e *SysRole) Insert(c *dto.SysRoleInsertReq, cb *casbin.SyncedEnforcer) err
 	}
 	c.SysMenu = dataMenu
 	c.Generate(&data)
-	tx := e.Orm.Begin()
-	defer func() {
-		if err != nil {
-			tx.Rollback()
-		} else {
-			tx.Commit()
-		}
-	}()
+	tx := e.Orm
+	if config.DatabaseConfig.Driver != "sqlite3" {
+		tx = e.Orm.Begin()
+		defer func() {
+			if err != nil {
+				tx.Rollback()
+			} else {
+				tx.Commit()
+			}
+		}()
+	}
+	var count int64
+	err = tx.Model(&data).Where("role_key = ?", c.RoleKey).Count(&count).Error
+	if err != nil {
+		e.Log.Errorf("db error:%s", err)
+		return err
+	}
+
+	if count > 0 {
+		err = errors.New("roleKey已存在，需更换在提交！")
+		e.Log.Errorf("db error:%s", err)
+		return err
+	}
 
 	err = tx.Create(&data).Error
 	if err != nil {
@@ -86,36 +103,44 @@ func (e *SysRole) Insert(c *dto.SysRoleInsertReq, cb *casbin.SyncedEnforcer) err
 		return err
 	}
 
+	mp := make(map[string]interface{}, 0)
+	polices := make([][]string, 0)
 	for _, menu := range dataMenu {
 		for _, api := range menu.SysApi {
-			_, err = cb.AddNamedPolicy("p", data.RoleKey, api.Path, api.Action)
+			if mp[data.RoleKey+"-"+api.Path+"-"+api.Action] != "" {
+				mp[data.RoleKey+"-"+api.Path+"-"+api.Action] = ""
+				polices = append(polices, []string{data.RoleKey, api.Path, api.Action})
+			}
 		}
 	}
-	_ = cb.SavePolicy()
-	//if len(c.MenuIds) > 0 {
-	//	s := SysRoleMenu{}
-	//	s.Orm = e.Orm
-	//	s.Log = e.Log
-	//	err = s.ReloadRule(tx, c.RoleId, c.MenuIds)
-	//	if err != nil {
-	//		e.Log.Errorf("reload casbin rule error, %", err.Error())
-	//		return err
-	//	}
-	//}
+
+	if len(polices) <= 0 {
+		return nil
+	}
+
+	// 写入 sys_casbin_rule 权限表里 当前角色数据的记录
+	_, err = cb.AddNamedPolicies("p", polices)
+	if err != nil {
+		return err
+	}
+
 	return nil
 }
 
 // Update 修改SysRole对象
 func (e *SysRole) Update(c *dto.SysRoleUpdateReq, cb *casbin.SyncedEnforcer) error {
 	var err error
-	tx := e.Orm.Debug().Begin()
-	defer func() {
-		if err != nil {
-			tx.Rollback()
-		} else {
-			tx.Commit()
-		}
-	}()
+	tx := e.Orm
+	if config.DatabaseConfig.Driver != "sqlite3" {
+		tx = e.Orm.Begin()
+		defer func() {
+			if err != nil {
+				tx.Rollback()
+			} else {
+				tx.Commit()
+			}
+		}()
+	}
 	var model = models.SysRole{}
 	var mlist = make([]models.SysMenu, 0)
 	tx.Preload("SysMenu").First(&model, c.GetId())
@@ -127,9 +152,10 @@ func (e *SysRole) Update(c *dto.SysRoleUpdateReq, cb *casbin.SyncedEnforcer) err
 	}
 	c.Generate(&model)
 	model.SysMenu = &mlist
+	// 更新关联的数据，使用 FullSaveAssociations 模式
 	db := tx.Session(&gorm.Session{FullSaveAssociations: true}).Debug().Save(&model)
 
-	if db.Error != nil {
+	if err = db.Error; err != nil {
 		e.Log.Errorf("db error:%s", err)
 		return err
 	}
@@ -137,43 +163,65 @@ func (e *SysRole) Update(c *dto.SysRoleUpdateReq, cb *casbin.SyncedEnforcer) err
 		return errors.New("无权更新该数据")
 	}
 
+	// 清除 sys_casbin_rule 权限表里 当前角色的所有记录
 	_, err = cb.RemoveFilteredPolicy(0, model.RoleKey)
 	if err != nil {
 		e.Log.Errorf("delete policy error:%s", err)
 		return err
 	}
-
+	mp := make(map[string]interface{}, 0)
+	polices := make([][]string, 0)
 	for _, menu := range mlist {
 		for _, api := range menu.SysApi {
-			_, err = cb.AddNamedPolicy("p", model.RoleKey, api.Path, api.Action)
+			if mp[model.RoleKey+"-"+api.Path+"-"+api.Action] != "" {
+				mp[model.RoleKey+"-"+api.Path+"-"+api.Action] = ""
+				//_, err = cb.AddNamedPolicy("p", model.RoleKey, api.Path, api.Action)
+				polices = append(polices, []string{model.RoleKey, api.Path, api.Action})
+			}
 		}
 	}
-	_ = cb.SavePolicy()
+	if len(polices) <= 0 {
+		return nil
+	}
+
+	// 写入 sys_casbin_rule 权限表里 当前角色数据的记录
+	_, err = cb.AddNamedPolicies("p", polices)
+	if err != nil {
+		return err
+	}
 	return nil
 }
 
 // Remove 删除SysRole
-func (e *SysRole) Remove(c *dto.SysRoleDeleteReq) error {
+func (e *SysRole) Remove(c *dto.SysRoleDeleteReq, cb *casbin.SyncedEnforcer) error {
 	var err error
-	tx := e.Orm.Begin()
-	defer func() {
-		if err != nil {
-			tx.Rollback()
-		} else {
-			tx.Commit()
-		}
-	}()
+	tx := e.Orm
+	if config.DatabaseConfig.Driver != "sqlite3" {
+		tx = e.Orm.Begin()
+		defer func() {
+			if err != nil {
+				tx.Rollback()
+			} else {
+				tx.Commit()
+			}
+		}()
+	}
 	var model = models.SysRole{}
 	tx.Preload("SysMenu").Preload("SysDept").First(&model, c.GetId())
+	//删除 SysRole 时，同时删除角色所有 关联其它表 记录 (SysMenu 和 SysMenu)
 	db := tx.Select(clause.Associations).Delete(&model)
 
-	if db.Error != nil {
+	if err = db.Error; err != nil {
 		e.Log.Errorf("db error:%s", err)
 		return err
 	}
 	if db.RowsAffected == 0 {
 		return errors.New("无权更新该数据")
 	}
+
+	// 清除 sys_casbin_rule 权限表里 当前角色的所有记录
+	_, _ = cb.RemoveFilteredPolicy(0, model.RoleKey)
+
 	return nil
 }
 
@@ -194,18 +242,22 @@ func (e *SysRole) GetRoleMenuId(roleId int) ([]int, error) {
 
 func (e *SysRole) UpdateDataScope(c *dto.RoleDataScopeReq) *SysRole {
 	var err error
-	tx := e.Orm.Begin()
-	defer func() {
-		if err != nil {
-			tx.Rollback()
-		} else {
-			tx.Commit()
-		}
-	}()
+	tx := e.Orm
+	if config.DatabaseConfig.Driver != "sqlite3" {
+		tx = e.Orm.Begin()
+		defer func() {
+			if err != nil {
+				tx.Rollback()
+			} else {
+				tx.Commit()
+			}
+		}()
+	}
 	var dlist = make([]models.SysDept, 0)
 	var model = models.SysRole{}
 	tx.Preload("SysDept").First(&model, c.RoleId)
-	tx.Where("id in ?", c.DeptIds).Find(&dlist)
+	tx.Where("dept_id in ?", c.DeptIds).Find(&dlist)
+	// 删除SysRole 和 SysDept 的关联关系
 	err = tx.Model(&model).Association("SysDept").Delete(model.SysDept)
 	if err != nil {
 		e.Log.Errorf("delete SysDept error:%s", err)
@@ -214,8 +266,9 @@ func (e *SysRole) UpdateDataScope(c *dto.RoleDataScopeReq) *SysRole {
 	}
 	c.Generate(&model)
 	model.SysDept = dlist
+	// 更新关联的数据，使用 FullSaveAssociations 模式
 	db := tx.Model(&model).Session(&gorm.Session{FullSaveAssociations: true}).Debug().Save(&model)
-	if db.Error != nil {
+	if err = db.Error; err != nil {
 		e.Log.Errorf("db error:%s", err)
 		_ = e.AddError(err)
 		return e
@@ -230,19 +283,23 @@ func (e *SysRole) UpdateDataScope(c *dto.RoleDataScopeReq) *SysRole {
 // UpdateStatus 修改SysRole对象status
 func (e *SysRole) UpdateStatus(c *dto.UpdateStatusReq) error {
 	var err error
-	tx := e.Orm.Debug().Begin()
-	defer func() {
-		if err != nil {
-			tx.Rollback()
-		} else {
-			tx.Commit()
-		}
-	}()
+	tx := e.Orm
+	if config.DatabaseConfig.Driver != "sqlite3" {
+		tx = e.Orm.Begin()
+		defer func() {
+			if err != nil {
+				tx.Rollback()
+			} else {
+				tx.Commit()
+			}
+		}()
+	}
 	var model = models.SysRole{}
 	tx.First(&model, c.GetId())
 	c.Generate(&model)
+	// 更新关联的数据，使用 FullSaveAssociations 模式
 	db := tx.Session(&gorm.Session{FullSaveAssociations: true}).Debug().Save(&model)
-	if db.Error != nil {
+	if err = db.Error; err != nil {
 		e.Log.Errorf("db error:%s", err)
 		return err
 	}
@@ -287,7 +344,9 @@ func (e *SysRole) GetById(roleId int) ([]string, error) {
 	}
 	l := *model.SysMenu
 	for i := 0; i < len(l); i++ {
-		permissions = append(permissions, l[i].Permission)
+		if l[i].Permission != "" {
+			permissions = append(permissions, l[i].Permission)
+		}
 	}
 	return permissions, nil
-}
+}

app/admin/service/sys_user.go

@@ -127,8 +127,7 @@ func (e *SysUser) UpdateAvatar(c *dto.UpdateSysUserAvatarReq, p *actions.DataPer
 		return errors.New("无权更新该数据")
 
 	}
-	c.Generate(&model)
-	err = e.Orm.Save(&model).Error
+	err = e.Orm.Table(model.TableName()).Where("user_id =? ", c.UserId).Updates(c).Error
 	if err != nil {
 		e.Log.Errorf("Service UpdateSysUser error: %s", err)
 		return err
@@ -151,8 +150,7 @@ func (e *SysUser) UpdateStatus(c *dto.UpdateSysUserStatusReq, p *actions.DataPer
 		return errors.New("无权更新该数据")
 
 	}
-	c.Generate(&model)
-	err = e.Orm.Save(&model).Error
+	err = e.Orm.Table(model.TableName()).Where("user_id =? ", c.UserId).Updates(c).Error
 	if err != nil {
 		e.Log.Errorf("Service UpdateSysUser error: %s", err)
 		return err
@@ -175,7 +173,7 @@ func (e *SysUser) ResetPwd(c *dto.ResetSysUserPwdReq, p *actions.DataPermission)
 		return errors.New("无权更新该数据")
 	}
 	c.Generate(&model)
-	err = e.Orm.Save(&model).Error
+	err = e.Orm.Omit("username", "nick_name", "phone", "role_id", "avatar", "sex").Save(&model).Error
 	if err != nil {
 		e.Log.Errorf("At Service ResetSysUserPwd error: %s", err)
 		return err
@@ -235,7 +233,9 @@ func (e *SysUser) UpdatePwd(id int, oldPassword, newPassword string, p *actions.
 		return err
 	}
 	c.Password = newPassword
-	db := e.Orm.Model(c).Where("user_id = ?", id).Select("Password", "Salt").Updates(c)
+	db := e.Orm.Model(c).Where("user_id = ?", id).
+		Select("Password", "Salt").
+		Updates(c)
 	if err = db.Error; err != nil {
 		e.Log.Errorf("db error: %s", err)
 		return err

app/jobs/apis/sys_job.go

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

app/jobs/examples.go

@@ -5,15 +5,17 @@ import (
 	"time"
 )
 
+// InitJob
 // 需要将定义的struct 添加到字典中；
 // 字典 key 可以配置到 自动任务 调用目标 中；
 func InitJob() {
-	jobList = map[string]JobsExec{
+	jobList = map[string]JobExec{
 		"ExamplesOne": ExamplesOne{},
 		// ...
 	}
 }
 
+// ExamplesOne
 // 新添加的job 必须按照以下格式定义，并实现Exec函数
 type ExamplesOne struct {
 }

app/jobs/jobbase.go

@@ -6,7 +6,6 @@ import (
 	"github.com/go-admin-team/go-admin-core/sdk"
 	models2 "go-admin/app/jobs/models"
 	"gorm.io/gorm"
-	"sync"
 	"time"
 
 	"github.com/robfig/cron/v3"
@@ -18,8 +17,9 @@ import (
 var timeFormat = "2006-01-02 15:04:05"
 var retryCount = 3
 
-var jobList map[string]JobsExec
-var lock sync.Mutex
+var jobList map[string]JobExec
+
+//var lock sync.Mutex
 
 type JobCore struct {
 	InvokeTarget   string
@@ -30,7 +30,7 @@ type JobCore struct {
 	Args           string
 }
 
-// 任务类型 http
+// HttpJob 任务类型 http
 type HttpJob struct {
 	JobCore
 }
@@ -46,7 +46,7 @@ func (e *ExecJob) Run() {
 		log.Warn("[Job] ExecJob Run job nil")
 		return
 	}
-	err := CallExec(obj.(JobsExec), e.Args)
+	err := CallExec(obj.(JobExec), e.Args)
 	if err != nil {
 		// 如果失败暂停一段时间重试
 		fmt.Println(time.Now().Format(timeFormat), " [ERROR] mission failed! ", err)
@@ -59,11 +59,11 @@ func (e *ExecJob) Run() {
 	//TODO: 待完善部分
 	//str := time.Now().Format(timeFormat) + " [INFO] JobCore " + string(e.EntryId) + "exec success , spend :" + latencyTime.String()
 	//ws.SendAll(str)
-	log.Info("[Job] JobCore %s exec success , spend :%v", e.Name, latencyTime)
+	log.Infof("[Job] JobCore %s exec success , spend :%v", e.Name, latencyTime)
 	return
 }
 
-//http 任务接口
+// Run http 任务接口
 func (h *HttpJob) Run() {
 
 	startTime := time.Now()
@@ -77,8 +77,8 @@ LOOP:
 		str, err = pkg.Get(h.InvokeTarget)
 		if err != nil {
 			// 如果失败暂停一段时间重试
-			fmt.Println(time.Now().Format(timeFormat), " [ERROR] mission failed! ", err)
-			fmt.Printf(time.Now().Format(timeFormat)+" [INFO] Retry after the task fails %d seconds! %s \n", (count+1)*5, str)
+			log.Warnf("[Job] mission failed! %v", err)
+			log.Warnf("[Job] Retry after the task fails %d seconds! %s \n", (count+1)*5, str)
 			time.Sleep(time.Duration(count+1) * 5 * time.Second)
 			count = count + 1
 			goto LOOP
@@ -95,7 +95,7 @@ LOOP:
 	return
 }
 
-// 初始化
+// Setup 初始化
 func Setup(dbs map[string]*gorm.DB) {
 
 	fmt.Println(time.Now().Format(timeFormat), " [INFO] JobCore Starting...")
@@ -152,7 +152,7 @@ func setup(key string, db *gorm.DB) {
 	select {}
 }
 
-// 添加任务 AddJob(invokeTarget string, jobId int, jobName string, cronExpression string)
+// AddJob 添加任务 AddJob(invokeTarget string, jobId int, jobName string, cronExpression string)
 func AddJob(c *cron.Cron, job Job) (int, error) {
 	if job == nil {
 		fmt.Println("unknown")
@@ -171,8 +171,8 @@ func (h *HttpJob) addJob(c *cron.Cron) (int, error) {
 	return EntryId, nil
 }
 
-func (h *ExecJob) addJob(c *cron.Cron) (int, error) {
-	id, err := c.AddJob(h.CronExpression, h)
+func (e *ExecJob) addJob(c *cron.Cron) (int, error) {
+	id, err := c.AddJob(e.CronExpression, e)
 	if err != nil {
 		fmt.Println(time.Now().Format(timeFormat), " [ERROR] JobCore AddJob error", err)
 		return 0, err
@@ -181,7 +181,7 @@ func (h *ExecJob) addJob(c *cron.Cron) (int, error) {
 	return EntryId, nil
 }
 
-// 移除任务
+// Remove 移除任务
 func Remove(c *cron.Cron, entryID int) chan bool {
 	ch := make(chan bool)
 	go func() {

app/jobs/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"
 }
 
@@ -48,7 +48,7 @@ func (e *SysJob) GetList(tx *gorm.DB, list interface{}) (err error) {
 	return tx.Table(e.TableName()).Where("status = ?", 2).Find(list).Error
 }
 
-// 更新SysJob
+// Update 更新SysJob
 func (e *SysJob) Update(tx *gorm.DB, id interface{}) (err error) {
 	return tx.Table(e.TableName()).Where(id).Updates(&e).Error
 }

app/jobs/service/sys_job.go

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

app/jobs/type.go

@@ -7,10 +7,10 @@ type Job interface {
 	addJob(*cron.Cron) (int, error)
 }
 
-type JobsExec interface {
+type JobExec interface {
 	Exec(arg interface{}) error
 }
 
-func CallExec(e JobsExec, arg interface{}) error {
+func CallExec(e JobExec, arg interface{}) error {
 	return e.Exec(arg)
 }

app/other/apis/file.go

@@ -44,63 +44,61 @@ type File struct {
 func (e File) UploadFile(c *gin.Context) {
 	e.MakeContext(c)
 	tag, _ := c.GetPostForm("type")
-	urlPrefix := fmt.Sprintf("http://%s/", c.Request.Host)
-	var fileResponse FileResponse
+	urlPrefix := fmt.Sprintf("%s://%s/", "http", c.Request.Host)
 
 	switch tag {
 	case "1": // 单图
-		var done bool
-		fileResponse, done = e.singleFile(c, fileResponse, urlPrefix)
-		if done {
-			return
-		}
-		e.OK(fileResponse, "上传成功")
-		return
+		e.handleSingleFile(c, urlPrefix)
 	case "2": // 多图
-		multipartFile := e.multipleFile(c, urlPrefix)
-		e.OK(multipartFile, "上传成功")
-		return
+		e.handleMultipleFiles(c, urlPrefix)
 	case "3": // base64
-		fileResponse = e.baseImg(c, fileResponse, urlPrefix)
-		e.OK(fileResponse, "上传成功")
+		e.handleBase64File(c, urlPrefix)
 	default:
-		var done bool
-		fileResponse, done = e.singleFile(c, fileResponse, urlPrefix)
-		if done {
-			return
-		}
-		e.OK(fileResponse, "上传成功")
-		return
+		e.handleSingleFile(c, urlPrefix)
 	}
-
 }
 
-func (e File) baseImg(c *gin.Context, fileResponse FileResponse, urlPerfix string) FileResponse {
+func (e File) handleSingleFile(c *gin.Context, urlPrefix string) {
+	fileResponse, done := e.singleFile(c, FileResponse{}, urlPrefix)
+	if done {
+		return
+	}
+	e.OK(fileResponse, "上传成功")
+}
+
+func (e File) handleMultipleFiles(c *gin.Context, urlPrefix string) {
+	multipartFile := e.multipleFile(c, urlPrefix)
+	e.OK(multipartFile, "上传成功")
+}
+
+func (e File) handleBase64File(c *gin.Context, urlPrefix string) {
+	fileResponse := e.baseImg(c, FileResponse{}, urlPrefix)
+	e.OK(fileResponse, "上传成功")
+}
+
+func (e File) baseImg(c *gin.Context, fileResponse FileResponse, urlPrefix string) FileResponse {
 	files, _ := c.GetPostForm("file")
 	file2list := strings.Split(files, ",")
-	ddd, _ := base64.StdEncoding.DecodeString(file2list[1])
-	guid := uuid.New().String()
-	fileName := guid + ".jpg"
-	err := utils.IsNotExistMkDir(path)
-	if err != nil {
+	decodedData, _ := base64.StdEncoding.DecodeString(file2list[1])
+	fileName := uuid.New().String() + ".jpg"
+
+	if err := utils.IsNotExistMkDir(path); err != nil {
 		e.Error(500, errors.New(""), "初始化文件路径失败")
+		return fileResponse
 	}
+
 	base64File := path + fileName
-	_ = ioutil.WriteFile(base64File, ddd, 0666)
+	_ = ioutil.WriteFile(base64File, decodedData, 0666)
 	typeStr := strings.Replace(strings.Replace(file2list[0], "data:", "", -1), ";base64", "", -1)
-	fileResponse = FileResponse{
-		Size:     pkg.GetFileSize(base64File),
-		Path:     base64File,
-		FullPath: urlPerfix + base64File,
-		Name:     "",
-		Type:     typeStr,
-	}
+
+	fileResponse = e.buildFileResponse(base64File, urlPrefix, "", typeStr)
 	source, _ := c.GetPostForm("source")
-	err = thirdUpload(source, fileName, base64File)
-	if err != nil {
+
+	if err := thirdUpload(source, fileName, base64File); err != nil {
 		e.Error(200, errors.New(""), "上传第三方失败")
 		return fileResponse
 	}
+
 	if source != "1" {
 		fileResponse.Path = "/static/uploadfile/" + fileName
 		fileResponse.FullPath = "/static/uploadfile/" + fileName
@@ -108,81 +106,76 @@ func (e File) baseImg(c *gin.Context, fileResponse FileResponse, urlPerfix strin
 	return fileResponse
 }
 
-func (e File) multipleFile(c *gin.Context, urlPerfix string) []FileResponse {
+func (e File) multipleFile(c *gin.Context, urlPrefix string) []FileResponse {
 	files := c.Request.MultipartForm.File["file"]
 	source, _ := c.GetPostForm("source")
 	var multipartFile []FileResponse
-	for _, f := range files {
-		guid := uuid.New().String()
-		fileName := guid + utils.GetExt(f.Filename)
 
-		err := utils.IsNotExistMkDir(path)
-		if err != nil {
+	for _, f := range files {
+		fileName := uuid.New().String() + utils.GetExt(f.Filename)
+
+		if err := utils.IsNotExistMkDir(path); err != nil {
 			e.Error(500, errors.New(""), "初始化文件路径失败")
+			continue
 		}
+
 		multipartFileName := path + fileName
-		err1 := c.SaveUploadedFile(f, multipartFileName)
-		fileType, _ := utils.GetType(multipartFileName)
-		if err1 == nil {
-			err := thirdUpload(source, fileName, multipartFileName)
-			if err != nil {
-				e.Error(500, errors.New(""), "上传第三方失败")
-			} else {
-				fileResponse := FileResponse{
-					Size:     pkg.GetFileSize(multipartFileName),
-					Path:     multipartFileName,
-					FullPath: urlPerfix + multipartFileName,
-					Name:     f.Filename,
-					Type:     fileType,
-				}
-				if source != "1" {
-					fileResponse.Path = "/static/uploadfile/" + fileName
-					fileResponse.FullPath = "/static/uploadfile/" + fileName
-				}
-				multipartFile = append(multipartFile, fileResponse)
-			}
+		if err := c.SaveUploadedFile(f, multipartFileName); err != nil {
+			continue
 		}
+
+		fileType, _ := utils.GetType(multipartFileName)
+		if err := thirdUpload(source, fileName, multipartFileName); err != nil {
+			e.Error(500, errors.New(""), "上传第三方失败")
+			continue
+		}
+
+		fileResponse := e.buildFileResponse(multipartFileName, urlPrefix, f.Filename, fileType)
+		if source != "1" {
+			fileResponse.Path = "/static/uploadfile/" + fileName
+			fileResponse.FullPath = "/static/uploadfile/" + fileName
+		}
+		multipartFile = append(multipartFile, fileResponse)
 	}
 	return multipartFile
 }
 
-func (e File) singleFile(c *gin.Context, fileResponse FileResponse, urlPerfix string) (FileResponse, bool) {
+func (e File) singleFile(c *gin.Context, fileResponse FileResponse, urlPrefix string) (FileResponse, bool) {
 	files, err := c.FormFile("file")
-
 	if err != nil {
 		e.Error(200, errors.New(""), "图片不能为空")
 		return FileResponse{}, true
 	}
-	// 上传文件至指定目录
-	guid := uuid.New().String()
 
-	fileName := guid + utils.GetExt(files.Filename)
-
-	err = utils.IsNotExistMkDir(path)
-	if err != nil {
+	fileName := uuid.New().String() + utils.GetExt(files.Filename)
+	if err := utils.IsNotExistMkDir(path); err != nil {
 		e.Error(500, errors.New(""), "初始化文件路径失败")
+		return FileResponse{}, true
 	}
+
 	singleFile := path + fileName
-	_ = c.SaveUploadedFile(files, singleFile)
-	fileType, _ := utils.GetType(singleFile)
-	fileResponse = FileResponse{
-		Size:     pkg.GetFileSize(singleFile),
-		Path:     singleFile,
-		FullPath: urlPerfix + singleFile,
-		Name:     files.Filename,
-		Type:     fileType,
+	if err := c.SaveUploadedFile(files, singleFile); err != nil {
+		e.Error(500, errors.New(""), "文件保存失败")
+		return FileResponse{}, true
 	}
-	//source, _ := c.GetPostForm("source")
-	//err = thirdUpload(source, fileName, singleFile)
-	//if err != nil {
-	//	e.Error(200, errors.New(""), "上传第三方失败")
-	//	return FileResponse{}, true
-	//}
+
+	fileType, _ := utils.GetType(singleFile)
+	fileResponse = e.buildFileResponse(singleFile, urlPrefix, files.Filename, fileType)
 	fileResponse.Path = "/static/uploadfile/" + fileName
 	fileResponse.FullPath = "/static/uploadfile/" + fileName
 	return fileResponse, false
 }
 
+func (e File) buildFileResponse(filePath, urlPrefix, fileName, fileType string) FileResponse {
+	return FileResponse{
+		Size:     pkg.GetFileSize(filePath),
+		Path:     filePath,
+		FullPath: urlPrefix + filePath,
+		Name:     fileName,
+		Type:     fileType,
+	}
+}
+
 func thirdUpload(source string, name string, path string) error {
 	switch source {
 	case "2":
@@ -201,4 +194,4 @@ func ossUpload(name string, path string) error {
 func qiniuUpload(name string, path string) error {
 	oss := file_store.ALiYunOSS{}
 	return oss.UpLoad(name, path)
-}
+}

app/other/apis/sys_server_monitor.go

@@ -2,18 +2,19 @@ package apis
 
 import (
 	"fmt"
-	"github.com/shirou/gopsutil/host"
+	"github.com/shirou/gopsutil/v3/net"
 	"runtime"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/gin-gonic/gin"
 	"github.com/go-admin-team/go-admin-core/sdk/api"
 	"github.com/go-admin-team/go-admin-core/sdk/pkg"
-	_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
-	"github.com/shirou/gopsutil/cpu"
-	"github.com/shirou/gopsutil/disk"
-	"github.com/shirou/gopsutil/mem"
+	"github.com/shirou/gopsutil/v3/cpu"
+	"github.com/shirou/gopsutil/v3/disk"
+	"github.com/shirou/gopsutil/v3/host"
+	"github.com/shirou/gopsutil/v3/mem"
 )
 
 const (
@@ -23,94 +24,160 @@ const (
 	GB = 1024 * MB
 )
 
+var excludeNetInterfaces = []string{
+	"lo", "tun", "docker", "veth", "br-", "vmbr", "vnet", "kube",
+}
+
 type ServerMonitor struct {
 	api.Api
 }
 
-//获取相差时间
+// GetHourDiffer 获取相差时间
 func GetHourDiffer(startTime, endTime string) int64 {
-	var hour int64
-	t1, err := time.ParseInLocation("2006-01-02 15:04:05", startTime, time.Local)
-	t2, err := time.ParseInLocation("2006-01-02 15:04:05", endTime, time.Local)
-	if err == nil && t1.Before(t2) {
-		diff := t2.Unix() - t1.Unix() //
-		hour = diff / 3600
-		return hour
-	} else {
-		return hour
+	t1, err1 := time.ParseInLocation("2006-01-02 15:04:05", startTime, time.Local)
+	t2, err2 := time.ParseInLocation("2006-01-02 15:04:05", endTime, time.Local)
+	if err1 != nil || err2 != nil || !t1.Before(t2) {
+		return 0
 	}
+	return (t2.Unix() - t1.Unix()) / 3600
 }
 
 // ServerInfo 获取系统信息
-// @Summary 系统信息
-// @Description 获取JSON
-// @Tags 系统信息
-// @Success 200 {object} response.Response "{"code": 200, "data": [...]}"
-// @Router /api/v1/server-monitor [get]
-// @Security Bearer
 func (e ServerMonitor) ServerInfo(c *gin.Context) {
 	e.Context = c
 
-	sysInfo, err := host.Info()
-	osDic := make(map[string]interface{}, 0)
-	osDic["goOs"] = runtime.GOOS
-	osDic["arch"] = runtime.GOARCH
-	osDic["mem"] = runtime.MemProfileRate
-	osDic["compiler"] = runtime.Compiler
-	osDic["version"] = runtime.Version()
-	osDic["numGoroutine"] = runtime.NumGoroutine()
-	osDic["ip"] = pkg.GetLocaHonst()
-	osDic["projectDir"] = pkg.GetCurrentPath()
-	osDic["hostName"] = sysInfo.Hostname
-	osDic["time"] = time.Now().Format("2006-01-02 15:04:05")
+	osInfo := getOSInfo()
+	memInfo := getMemoryInfo()
+	swapInfo := getSwapInfo()
+	cpuInfo := getCPUInfo()
+	diskInfo := getDiskInfo()
+	netInfo := getNetworkInfo()
 
-	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
+	bootTime, _ := host.BootTime()
+	cachedBootTime := time.Unix(int64(bootTime), 0)
 
-	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
+	e.Custom(gin.H{
+		"code":     200,
+		"os":       osInfo,
+		"mem":      memInfo,
+		"cpu":      cpuInfo,
+		"disk":     diskInfo,
+		"net":      netInfo,
+		"swap":     swapInfo,
+		"location": "Aliyun",
+		"bootTime": GetHourDiffer(cachedBootTime.Format("2006-01-02 15:04:05"), time.Now().Format("2006-01-02 15:04:05")),
+	})
+}
 
-	cpuDic := make(map[string]interface{}, 0)
-	cpuDic["cpuInfo"], _ = cpu.Info()
+func getOSInfo() map[string]interface{} {
+	sysInfo, _ := host.Info()
+	return map[string]interface{}{
+		"goOs":         runtime.GOOS,
+		"arch":         runtime.GOARCH,
+		"mem":          runtime.MemProfileRate,
+		"compiler":     runtime.Compiler,
+		"version":      runtime.Version(),
+		"numGoroutine": runtime.NumGoroutine(),
+		"ip":           pkg.GetLocalHost(),
+		"projectDir":   pkg.GetCurrentPath(),
+		"hostName":     sysInfo.Hostname,
+		"time":         time.Now().Format("2006-01-02 15:04:05"),
+	}
+}
+
+func getMemoryInfo() map[string]interface{} {
+	memory, _ := mem.VirtualMemory()
+	return map[string]interface{}{
+		"used":    memory.Used / MB,
+		"total":   memory.Total / MB,
+		"percent": pkg.Round(memory.UsedPercent, 2),
+	}
+}
+
+func getSwapInfo() map[string]interface{} {
+	memory, _ := mem.VirtualMemory()
+	return map[string]interface{}{
+		"used":  memory.SwapTotal - memory.SwapFree,
+		"total": memory.SwapTotal,
+	}
+}
+
+func getCPUInfo() map[string]interface{} {
+	cpuInfo, _ := cpu.Info()
 	percent, _ := cpu.Percent(0, false)
-	cpuDic["Percent"] = pkg.Round(percent[0], 2)
-	cpuDic["cpuNum"], _ = cpu.Counts(false)
+	cpuNum, _ := cpu.Counts(false)
+	return map[string]interface{}{
+		"cpuInfo": cpuInfo,
+		"percent": pkg.Round(percent[0], 2),
+		"cpuNum":  cpuNum,
+	}
+}
+
+func getDiskInfo() map[string]interface{} {
+	var diskTotal, diskUsed, diskUsedPercent float64
+	diskList := make([]disk.UsageStat, 0)
 
-	//服务器磁盘信息
-	disklist := make([]disk.UsageStat, 0)
-	//所有分区
 	diskInfo, err := disk.Partitions(true)
 	if err == nil {
 		for _, p := range diskInfo {
 			diskDetail, err := disk.Usage(p.Mountpoint)
 			if err == nil {
 				diskDetail.UsedPercent, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", diskDetail.UsedPercent), 64)
-				diskDetail.Total = diskDetail.Total / 1024 / 1024
-				diskDetail.Used = diskDetail.Used / 1024 / 1024
-				diskDetail.Free = diskDetail.Free / 1024 / 1024
-				disklist = append(disklist, *diskDetail)
+				diskDetail.Total /= MB
+				diskDetail.Used /= MB
+				diskDetail.Free /= MB
+				diskList = append(diskList, *diskDetail)
 			}
 		}
 	}
 
-	e.Custom(gin.H{
-		"code": 200,
-		"os":   osDic,
-		"mem":  memDic,
-		"cpu":  cpuDic,
-		"disk": diskDic,
-		"diskList": disklist,
-	})
+	d, _ := disk.Usage("/")
+	diskTotal = float64(d.Total / GB)
+	diskUsed = float64(d.Used / GB)
+	diskUsedPercent, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", d.UsedPercent), 64)
+
+	return map[string]interface{}{
+		"total":   diskTotal,
+		"used":    diskUsed,
+		"percent": diskUsedPercent,
+	}
+}
+
+func getNetworkInfo() map[string]interface{} {
+	netInSpeed, netOutSpeed := trackNetworkSpeed()
+	return map[string]interface{}{
+		"in":  pkg.Round(float64(netInSpeed/KB), 2),
+		"out": pkg.Round(float64(netOutSpeed/KB), 2),
+	}
+}
+
+func trackNetworkSpeed() (uint64, uint64) {
+	var netInSpeed, netOutSpeed, netInTransfer, netOutTransfer, lastUpdateNetStats uint64
+	nc, err := net.IOCounters(true)
+	if err == nil {
+		for _, v := range nc {
+			if isListContainsStr(excludeNetInterfaces, v.Name) {
+				continue
+			}
+			netInTransfer += v.BytesRecv
+			netOutTransfer += v.BytesSent
+		}
+		now := uint64(time.Now().Unix())
+		diff := now - lastUpdateNetStats
+		if diff > 0 {
+			netInSpeed = (netInTransfer - netInTransfer) / diff
+			netOutSpeed = (netOutTransfer - netOutTransfer) / diff
+		}
+		lastUpdateNetStats = now
+	}
+	return netInSpeed, netOutSpeed
+}
+
+func isListContainsStr(list []string, str string) bool {
+	for _, item := range list {
+		if strings.Contains(str, item) {
+			return true
+		}
+	}
+	return false
 }

app/other/apis/tools/db_columns.go

@@ -17,7 +17,7 @@ import (
 // @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

app/other/apis/tools/db_tables.go

@@ -19,7 +19,7 @@ import (
 // @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

app/other/models/tools/sys_columns.go

@@ -1,7 +1,8 @@
 package tools
 
 import (
-	"go-admin/app/admin/models"
+	common "go-admin/common/models"
+
 	"gorm.io/gorm"
 )
 
@@ -44,10 +45,10 @@ type SysColumns struct {
 	CreateBy           int          `gorm:"column:create_by;size:20;" json:"createBy"`
 	UpdateBy           int          `gorm:"column:update_By;size:20;" json:"updateBy"`
 
-	models.BaseModel
+	common.ModelTime
 }
 
-func (SysColumns) TableName() string {
+func (*SysColumns) TableName() string {
 	return "sys_columns"
 }
 
@@ -56,7 +57,7 @@ func (e *SysColumns) GetList(tx *gorm.DB, exclude bool) ([]SysColumns, error) {
 	table := tx.Table("sys_columns")
 	table = table.Where("table_id = ? ", e.TableId)
 	if exclude {
-		notIn := make([]string, 6)
+		notIn := make([]string, 0, 6)
 		notIn = append(notIn, "id")
 		notIn = append(notIn, "create_by")
 		notIn = append(notIn, "update_by")

app/other/models/tools/sys_tables.go

@@ -5,8 +5,6 @@ import (
 	"strings"
 
 	"gorm.io/gorm"
-
-	"go-admin/app/admin/models"
 )
 
 type SysTables struct {
@@ -43,11 +41,9 @@ type SysTables struct {
 	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"
 }
 

cmd/api/server.go

@@ -3,7 +3,6 @@ package api
 import (
 	"context"
 	"fmt"
-	"log"
 	"net/http"
 	"os"
 	"os/signal"
@@ -11,11 +10,12 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/go-admin-team/go-admin-core/config/source/file"
+	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"
-	"github.com/go-admin-team/go-admin-core/sdk/runtime"
+	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
 	"go-admin/app/admin/models"
@@ -73,7 +73,7 @@ func setup() {
 	go queue.Run()
 
 	usageStr := `starting api server...`
-	log.Println(usageStr)
+	log.Info(usageStr)
 }
 
 func run() error {
@@ -89,6 +89,8 @@ func run() error {
 	srv := &http.Server{
 		Addr:    fmt.Sprintf("%s:%d", config.ApplicationConfig.Host, config.ApplicationConfig.Port),
 		Handler: sdk.Runtime.GetEngine(),
+		ReadTimeout:  time.Duration(config.ApplicationConfig.ReadTimeout) * time.Second,
+		WriteTimeout: time.Duration(config.ApplicationConfig.WriterTimeout) * time.Second,
 	}
 
 	go func() {
@@ -100,30 +102,28 @@ func run() error {
 	if apiCheck {
 		var routers = sdk.Runtime.GetRouter()
 		q := sdk.Runtime.GetMemoryQueue("")
-		mp := make(map[string]interface{}, 0)
+		mp := make(map[string]interface{})
 		mp["List"] = routers
 		message, err := sdk.Runtime.GetStreamMessage("", global.ApiCheck, mp)
 		if err != nil {
-			log.Printf("GetStreamMessage error, %s \n", err.Error())
+			log.Infof("GetStreamMessage error, %s \n", err.Error())
 			//日志报错错误，不中断请求
 		} else {
 			err = q.Append(message)
 			if err != nil {
-				log.Printf("Append message error, %s \n", err.Error())
+				log.Infof("Append message error, %s \n", err.Error())
 			}
 		}
 	}
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancel()
 
 	go func() {
 		// 服务连接
 		if config.SslConfig.Enable {
-			if err := srv.ListenAndServeTLS(config.SslConfig.Pem, config.SslConfig.KeyStr); err != nil && err != http.ErrServerClosed {
+			if err := srv.ListenAndServeTLS(config.SslConfig.Pem, config.SslConfig.KeyStr); err != nil && !errors.Is(err, http.ErrServerClosed) {
 				log.Fatal("listen: ", err)
 			}
 		} else {
-			if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
+			if err := srv.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
 				log.Fatal("listen: ", err)
 			}
 		}
@@ -131,27 +131,30 @@ func run() error {
 	fmt.Println(pkg.Red(string(global.LogoContent)))
 	tip()
 	fmt.Println(pkg.Green("Server run at:"))
-	fmt.Printf("-  Local:   http://localhost:%d/ \r\n", config.ApplicationConfig.Port)
-	fmt.Printf("-  Network: http://%s:%d/ \r\n", pkg.GetLocaHonst(), config.ApplicationConfig.Port)
+	fmt.Printf("-  Local:   %s://localhost:%d/ \r\n", "http", config.ApplicationConfig.Port)
+	fmt.Printf("-  Network: %s://%s:%d/ \r\n", "http", pkg.GetLocalHost(), config.ApplicationConfig.Port)
 	fmt.Println(pkg.Green("Swagger run at:"))
-	fmt.Printf("-  Local:   http://localhost:%d/swagger/index.html \r\n", config.ApplicationConfig.Port)
-	fmt.Printf("-  Network: http://%s:%d/swagger/index.html \r\n", pkg.GetLocaHonst(), config.ApplicationConfig.Port)
+	fmt.Printf("-  Local:   http://localhost:%d/swagger/admin/index.html \r\n", config.ApplicationConfig.Port)
+	fmt.Printf("-  Network: %s://%s:%d/swagger/admin/index.html \r\n", "http", pkg.GetLocalHost(), config.ApplicationConfig.Port)
 	fmt.Printf("%s Enter Control + C Shutdown Server \r\n", pkg.GetCurrentTimeStr())
 	// 等待中断信号以优雅地关闭服务器（设置 5 秒的超时时间）
-	quit := make(chan os.Signal)
+	quit := make(chan os.Signal, 1)
 	signal.Notify(quit, os.Interrupt)
 	<-quit
-	fmt.Printf("%s Shutdown Server ... \r\n", pkg.GetCurrentTimeStr())
+
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+	log.Info("Shutdown Server ... ")
 
 	if err := srv.Shutdown(ctx); err != nil {
 		log.Fatal("Server Shutdown:", err)
 	}
-	log.Println("Server exiting")
+	log.Info("Server exiting")
 
 	return nil
 }
 
-var Router runtime.Router
+//var Router runtime.Router
 
 func tip() {
 	usageStr := `欢迎使用 ` + pkg.Green(`go-admin `+global.Version) + ` 可以使用 ` + pkg.Red(`-h`) + ` 查看命令`
@@ -170,7 +173,7 @@ func initRouter() {
 		r = h.(*gin.Engine)
 	default:
 		log.Fatal("not support other engine")
-		os.Exit(-1)
+		//os.Exit(-1)
 	}
 	if config.SslConfig.Enable {
 		r.Use(handler.TlsHandler())

cmd/app/server.go

@@ -13,10 +13,10 @@ import (
 var (
 	appName  string
 	StartCmd = &cobra.Command{
-		Use:     "createapp",
+		Use:     "app",
 		Short:   "Create a new app",
 		Long:    "Use when you need to create a new app",
-		Example: "go-admin createapp -n admin",
+		Example: "go-admin app -n admin",
 		Run: func(cmd *cobra.Command, args []string) {
 			run()
 		},
@@ -87,4 +87,4 @@ func genFile() error {
 	err = t2.Execute(&b2, nil)
 	pkg.FileCreate(b2, appPath+"/router/router.go")
 	return nil
-}
+}

cmd/cobra.go

@@ -36,7 +36,7 @@ var rootCmd = &cobra.Command{
 
 func tip() {
 	usageStr := `欢迎使用 ` + pkg.Green(`go-admin `+global.Version) + ` 可以使用 ` + pkg.Red(`-h`) + ` 查看命令`
-	usageStr1 := `也可以参考 https://doc.go-admin.dev/guide/ksks.html 里边的【启动】章节`
+	usageStr1 := `也可以参考 https://doc.go-admin.dev/guide/ksks 的相关内容`
 	fmt.Printf("%s\n", usageStr)
 	fmt.Printf("%s\n", usageStr1)
 }

cmd/migrate/migration/init.go

@@ -4,20 +4,18 @@ import (
 	"log"
 	"path/filepath"
 	"sort"
-	"strconv"
 	"sync"
 
-	"github.com/spf13/cast"
 	"gorm.io/gorm"
 )
 
 var Migrate = &Migration{
-	version: make(map[int]func(db *gorm.DB, version string) error),
+	version: make(map[string]func(db *gorm.DB, version string) error),
 }
 
 type Migration struct {
 	db      *gorm.DB
-	version map[int]func(db *gorm.DB, version string) error
+	version map[string]func(db *gorm.DB, version string) error
 	mutex   sync.Mutex
 }
 
@@ -29,24 +27,24 @@ func (e *Migration) SetDb(db *gorm.DB) {
 	e.db = db
 }
 
-func (e *Migration) SetVersion(k int, f func(db *gorm.DB, version string) error) {
+func (e *Migration) SetVersion(k string, f func(db *gorm.DB, version string) error) {
 	e.mutex.Lock()
 	defer e.mutex.Unlock()
 	e.version[k] = f
 }
 
 func (e *Migration) Migrate() {
-	versions := make([]int, 0)
+	versions := make([]string, 0)
 	for k := range e.version {
 		versions = append(versions, k)
 	}
-	if !sort.IntsAreSorted(versions) {
-		sort.Ints(versions)
+	if !sort.StringsAreSorted(versions) {
+		sort.Strings(versions)
 	}
 	var err error
 	var count int64
 	for _, v := range versions {
-		err = e.db.Debug().Table("sys_migration").Where("version = ?", v).Count(&count).Error
+		err = e.db.Table("sys_migration").Where("version = ?", v).Count(&count).Error
 		if err != nil {
 			log.Fatalln(err)
 		}
@@ -55,14 +53,14 @@ func (e *Migration) Migrate() {
 			count = 0
 			continue
 		}
-		err = (e.version[v])(e.db.Debug(), strconv.Itoa(v))
+		err = (e.version[v])(e.db.Debug(), v)
 		if err != nil {
 			log.Fatalln(err)
 		}
 	}
 }
 
-func GetFilename(s string) int {
+func GetFilename(s string) string {
 	s = filepath.Base(s)
-	return cast.ToInt(s[:13])
+	return s[:13]
 }

cmd/migrate/migration/models/casbin_rule.go

@@ -1,14 +1,15 @@
 package models
 
-//sys_casbin_rule
+// CasbinRule 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;"`
+	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 {

cmd/migrate/migration/models/initdb.go

@@ -3,18 +3,35 @@ package models
 import (
 	"fmt"
 	"go-admin/common/global"
-	"gorm.io/gorm"
 	"io/ioutil"
 	"log"
 	"strings"
+
+	"gorm.io/gorm"
 )
 
 func InitDb(db *gorm.DB) (err error) {
 	filePath := "config/db.sql"
-	err = ExecSql(db, filePath)
 	if global.Driver == "postgres" {
+		filePath := "config/db.sql"
+		if err = ExecSql(db, filePath); err != nil {
+			return err
+		}
 		filePath = "config/pg.sql"
 		err = ExecSql(db, filePath)
+	} else if global.Driver == "mysql" {
+		filePath = "config/db-begin-mysql.sql"
+		if err = ExecSql(db, filePath); err != nil {
+			return err
+		}
+		filePath = "config/db.sql"
+		if err = ExecSql(db, filePath); err != nil {
+			return err
+		}
+		filePath = "config/db-end-mysql.sql"
+		err = ExecSql(db, filePath)
+	} else {
+		err = ExecSql(db, filePath)
 	}
 	return err
 }
@@ -31,7 +48,7 @@ func ExecSql(db *gorm.DB, filePath string) error {
 			fmt.Println(sqlList[i])
 			continue
 		}
-		sql := strings.Replace(sqlList[i]+";", "\n", "", 0)
+		sql := strings.Replace(sqlList[i]+";", "\n", "", -1)
 		sql = strings.TrimSpace(sql)
 		if err = db.Exec(sql).Error; err != nil {
 			log.Printf("error sql: %s", sql)

cmd/migrate/migration/models/role_dept.go

@@ -1,6 +1,5 @@
 package models
 
-//sys_role_dept
 type SysRoleDept struct {
 	RoleId int `gorm:"size:11;primaryKey"`
 	DeptId int `gorm:"size:11;primaryKey"`

cmd/migrate/migration/models/sys_opera_log.go

@@ -10,15 +10,15 @@ type SysOperaLog struct {
 	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:请求方式"`
+	RequestMethod string    `json:"requestMethod" gorm:"type:varchar(128);comment:请求方式: GET POST PUT DELETE"`
 	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:操作状态"`
+	OperParam     string    `json:"operParam" gorm:"type:text;comment:请求参数"`
+	Status        string    `json:"status" gorm:"type:varchar(4);comment:操作状态 1:正常 2:关闭"`
 	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:备注"`

cmd/migrate/migration/models/sys_user.go

@@ -11,20 +11,20 @@ type SysUser struct {
 	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"`
+	RoleId   int    `json:"roleId" gorm:"type:bigint;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:岗位"`
+	DeptId   int    `json:"deptId" gorm:"type:bigint;comment:部门"`
+	PostId   int    `json:"postId" gorm:"type:bigint;comment:岗位"`
 	Remark   string `json:"remark" gorm:"type:varchar(255);comment:备注"`
 	Status   string `json:"status" gorm:"type:varchar(4);comment:状态"`
 	ControlBy
 	ModelTime
 }
 
-func (SysUser) TableName() string {
+func (*SysUser) TableName() string {
 	return "sys_user"
 }
 
@@ -45,4 +45,4 @@ func (e *SysUser) Encrypt() (err error) {
 
 func (e *SysUser) BeforeCreate(_ *gorm.DB) error {
 	return e.Encrypt()
-}
+}

cmd/migrate/migration/version/1599190683659_tables.go

@@ -1,13 +1,14 @@
 package version
 
 import (
+	"github.com/go-admin-team/go-admin-core/sdk/config"
 	"runtime"
 
-	"gorm.io/gorm"
-
 	"go-admin/cmd/migrate/migration"
 	"go-admin/cmd/migrate/migration/models"
 	common "go-admin/common/models"
+
+	"gorm.io/gorm"
 )
 
 func init() {
@@ -17,8 +18,10 @@ func init() {
 
 func _1599190683659Tables(db *gorm.DB, version string) error {
 	return db.Transaction(func(tx *gorm.DB) error {
-		err := tx.Debug().Migrator().AutoMigrate(
-			new(models.CasbinRule),
+		if config.DatabaseConfig.Driver == "mysql" {
+			tx = tx.Set("gorm:table_options", "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4")
+		}
+		err := tx.Migrator().AutoMigrate(
 			new(models.SysDept),
 			new(models.SysConfig),
 			new(models.SysTables),
@@ -41,10 +44,10 @@ func _1599190683659Tables(db *gorm.DB, version string) error {
 			return err
 		}
 		if err := models.InitDb(tx); err != nil {
-
+			return err
 		}
-		return db.Create(&common.Migration{
+		return tx.Create(&common.Migration{
 			Version: version,
 		}).Error
 	})
-}
+}

cmd/migrate/migration/version/1653638869132_migrate.go

@@ -0,0 +1,48 @@
+package version
+
+import (
+	"go-admin/cmd/migrate/migration/models"
+	common "go-admin/common/models"
+	"gorm.io/gorm"
+	"runtime"
+	"strconv"
+
+	"go-admin/cmd/migrate/migration"
+)
+
+func init() {
+	_, fileName, _, _ := runtime.Caller(0)
+	migration.Migrate.SetVersion(migration.GetFilename(fileName), _1653638869132Test)
+}
+
+func _1653638869132Test(db *gorm.DB, version string) error {
+	return db.Transaction(func(tx *gorm.DB) error {
+		var list []models.SysMenu
+		err := tx.Model(&models.SysMenu{}).Order("parent_id,menu_id").Find(&list).Error
+		if err != nil {
+			return err
+		}
+		for _, v := range list {
+			if v.ParentId == 0 {
+				v.Paths = "/0/" + strconv.Itoa(v.MenuId)
+			} else {
+				var e models.SysMenu
+				err = tx.Model(&models.SysMenu{}).Where("menu_id=?", v.ParentId).First(&e).Error
+				if err != nil {
+					if err == gorm.ErrRecordNotFound {
+						continue
+					}
+					return err
+				}
+				v.Paths = e.Paths + "/" + strconv.Itoa(v.MenuId)
+			}
+			err = tx.Model(&v).Update("paths", v.Paths).Error
+			if err != nil {
+				return err
+			}
+		}
+		return tx.Create(&common.Migration{
+			Version: version,
+		}).Error
+	})
+}

cmd/migrate/server.go

@@ -63,6 +63,18 @@ func migrateModel() error {
 		host = "*"
 	}
 	db := sdk.Runtime.GetDbByKey(host)
+	if db == nil {
+		if len(sdk.Runtime.GetDb()) == 1 && host == "*" {
+			for k, v := range sdk.Runtime.GetDb() {
+				db = v
+				host = k
+				break
+			}
+		}
+	}
+	if db == nil {
+		return fmt.Errorf("未找到数据库配置")
+	}
 	if config.DatabasesConfig[host].Driver == "mysql" {
 		//初始化数据库时候用
 		db.Set("gorm:table_options", "ENGINE=InnoDB CHARSET=utf8mb4")

common/actions/delete.go

@@ -46,7 +46,7 @@ func DeleteAction(control dto.Control) gin.HandlerFunc {
 		db = db.WithContext(c).Scopes(
 			Permission(object.TableName(), p),
 		).Where(req.GetId()).Delete(object)
-		if db.Error != nil {
+		if err = db.Error; err != nil {
 			log.Errorf("MsgID[%s] Delete error: %s", msgID, err)
 			response.Error(c, 500, err, "删除失败")
 			return

common/actions/update.go

@@ -44,7 +44,7 @@ func UpdateAction(control dto.Control) gin.HandlerFunc {
 		db = db.WithContext(c).Scopes(
 			Permission(object.TableName(), p),
 		).Where(req.GetId()).Updates(object)
-		if db.Error != nil {
+		if err = db.Error; err != nil {
 			log.Errorf("MsgID[%s] Update error: %s", msgID, err)
 			response.Error(c, 500, err, "更新失败")
 			return

common/apis/api.go

@@ -27,7 +27,7 @@ func (e *Api) AddError(err error) {
 		e.Errors = err
 	} else if err != nil {
 		e.Logger.Error(err)
-		e.Errors = fmt.Errorf("%v; %w", e.Error, err)
+		e.Errors = fmt.Errorf("%v; %w", e.Errors, err)
 	}
 }
 
@@ -39,7 +39,7 @@ func (e *Api) MakeContext(c *gin.Context) *Api {
 }
 
 // GetLogger 获取上下文提供的日志
-func (e Api) GetLogger() *logger.Helper {
+func (e *Api) GetLogger() *logger.Helper {
 	return api.GetRequestLogger(e.Context)
 }
 
@@ -81,7 +81,7 @@ func (e *Api) Bind(d interface{}, bindings ...binding.Binding) *Api {
 }
 
 // GetOrm 获取Orm DB
-func (e Api) GetOrm() (*gorm.DB, error) {
+func (e *Api) GetOrm() (*gorm.DB, error) {
 	db, err := pkg.GetOrm(e.Context)
 	if err != nil {
 		e.Error(500, err, "数据库连接获取失败")
@@ -115,21 +115,21 @@ func (e *Api) MakeService(c *service.Service) *Api {
 }
 
 // Error 通常错误数据处理
-func (e Api) Error(code int, err error, msg string) {
+func (e *Api) Error(code int, err error, msg string) {
 	response.Error(e.Context, code, err, msg)
 }
 
 // OK 通常成功数据处理
-func (e Api) OK(data interface{}, msg string) {
+func (e *Api) OK(data interface{}, msg string) {
 	response.OK(e.Context, data, msg)
 }
 
 // PageOK 分页数据处理
-func (e Api) PageOK(result interface{}, count int, pageIndex int, pageSize int, msg string) {
+func (e *Api) PageOK(result interface{}, count int, pageIndex int, pageSize int, msg string) {
 	response.PageOK(e.Context, result, count, pageIndex, pageSize, msg)
 }
 
 // Custom 兼容函数
-func (e Api) Custom(data gin.H) {
+func (e *Api) Custom(data gin.H) {
 	response.Custum(e.Context, data)
 }

common/database/initialize.go

@@ -58,7 +58,7 @@ func setupSimpleDatabase(host string, c *toolsConfig.Database) {
 		log.Info(pkg.Green(c.Driver + " connect success !"))
 	}
 
-	e := mycasbin.Setup(db, "sys_")
+	e := mycasbin.Setup(db, "")
 
 	sdk.Runtime.SetDb(host, db)
 	sdk.Runtime.SetCasbin(host, e)

common/database/open.go

@@ -1,14 +1,16 @@
-// +build !sqlite3
+//go:build !sqlite3
 
 package database
 
 import (
 	"gorm.io/driver/mysql"
 	"gorm.io/driver/postgres"
+	"gorm.io/driver/sqlserver"
 	"gorm.io/gorm"
 )
 
 var opens = map[string]func(string) gorm.Dialector{
-	"mysql":    mysql.Open,
-	"postgres": postgres.Open,
+	"mysql":     mysql.Open,
+	"postgres":  postgres.Open,
+	"sqlserver": sqlserver.Open,
 }

common/database/open_sqlite3.go

@@ -1,3 +1,4 @@
+//go:build sqlite3
 // +build sqlite3
 
 package database
@@ -6,11 +7,13 @@ import (
 	"gorm.io/driver/mysql"
 	"gorm.io/driver/postgres"
 	"gorm.io/driver/sqlite"
+	"gorm.io/driver/sqlserver"
 	"gorm.io/gorm"
 )
 
 var opens = map[string]func(string) gorm.Dialector{
-	"mysql":    mysql.Open,
-	"postgres": postgres.Open,
-	"sqlite3":  sqlite.Open,
+	"mysql":     mysql.Open,
+	"postgres":  postgres.Open,
+	"sqlite3":   sqlite.Open,
+	"sqlserver": sqlserver.Open,
 }

common/file_store/initialize.go

@@ -1,13 +1,45 @@
 package file_store
 
-type FileStore struct {
+import "fmt"
+
+type OXS struct {
+	// Endpoint 访问域名
+	Endpoint string
+	// AccessKeyID AK
+	AccessKeyID string
+	// AccessKeySecret AKS
+	AccessKeySecret string
+	// BucketName 桶名称
+	BucketName string
 }
 
-// Setup 配置数据库
-func (e *FileStore) Setup(driver string) {
-	//fileStoreType := driver
-	//if fileStoreType == "ALiYunOSS" {
-	//	var store = new(ALiYunOSS)
-	//	store.Setup()
-	//}
+// Setup 配置文件存储driver
+func (e *OXS) Setup(driver DriverType, options ...ClientOption) FileStoreType {
+	fileStoreType := driver
+	var fileStore FileStoreType
+	switch fileStoreType {
+	case AliYunOSS:
+		fileStore = new(ALiYunOSS)
+		err := fileStore.Setup(e.Endpoint, e.AccessKeyID, e.AccessKeySecret, e.BucketName)
+		if err != nil {
+			fmt.Println(err)
+		}
+		return fileStore
+	case HuaweiOBS:
+		fileStore = new(HuaWeiOBS)
+		err := fileStore.Setup(e.Endpoint, e.AccessKeyID, e.AccessKeySecret, e.BucketName)
+		if err != nil {
+			fmt.Println(err)
+		}
+		return fileStore
+	case QiNiuKodo:
+		fileStore = new(QiNiuKODO)
+		err := fileStore.Setup(e.Endpoint, e.AccessKeyID, e.AccessKeySecret, e.BucketName)
+		if err != nil {
+			fmt.Println(err)
+		}
+		return fileStore
+	}
+
+	return nil
 }

common/file_store/interface.go

@@ -1,6 +1,27 @@
 package file_store
 
+// DriverType 驱动类型
+type DriverType string
+
+const (
+	// HuaweiOBS 华为云OBS
+	HuaweiOBS DriverType = "HuaweiOBS"
+	// AliYunOSS 阿里云OSS
+	AliYunOSS DriverType = "AliYunOSS"
+	// QiNiuKodo 七牛云kodo
+	QiNiuKodo DriverType = "QiNiuKodo"
+)
+
+type ClientOption map[string]interface{}
+
+// TODO: FileStoreType名称待定
+
+// FileStoreType OXS
 type FileStoreType interface {
-	Setup() error
-	UpLoad(yourObjectName string, localFile string) error
+	// Setup 装载 endpoint sss
+	Setup(endpoint, accessKeyID, accessKeySecret, BucketName string, options ...ClientOption) error
+	// UpLoad 上传
+	UpLoad(yourObjectName string, localFile interface{}) error
+	// GetTempToken 获取临时Token
+	GetTempToken() (string, error)
 }

common/file_store/kodo.go

@@ -0,0 +1,111 @@
+package file_store
+
+import (
+	"context"
+	"fmt"
+	"github.com/qiniu/go-sdk/v7/auth/qbox"
+	"github.com/qiniu/go-sdk/v7/storage"
+)
+
+type Zone string
+
+const (
+	// HuaDong 华东
+	HuaDong Zone = "HuaDong"
+	// HuaBei 华北
+	HuaBei Zone = "HuaBei"
+	// HuaNan 华南
+	HuaNan Zone = "HuaNan"
+	// BeiMei 北美
+	BeiMei Zone = "BeiMei"
+	// XinJiaPo 新加坡
+	XinJiaPo Zone = "XinJiaPo"
+)
+
+type QiNiuKODO struct {
+	Client     interface{}
+	BucketName string
+	cfg        storage.Config
+	options    []ClientOption
+}
+
+func (e *QiNiuKODO) getToken() string {
+	putPolicy := storage.PutPolicy{
+		Scope: e.BucketName,
+	}
+	if len(e.options) > 0 && e.options[0]["Expires"] != nil {
+		putPolicy.Expires = e.options[0]["Expires"].(uint64)
+	}
+	upToken := putPolicy.UploadToken(e.Client.(*qbox.Mac))
+	return upToken
+}
+
+//Setup 装载
+//endpoint sss
+func (e *QiNiuKODO) Setup(endpoint, accessKeyID, accessKeySecret, BucketName string, options ...ClientOption) error {
+
+	mac := qbox.NewMac(accessKeyID, accessKeySecret)
+	// 获取存储空间。
+	cfg := storage.Config{}
+	// 空间对应的机房
+	e.setZoneORDefault(cfg, options...)
+	// 是否使用https域名
+	cfg.UseHTTPS = true
+	// 上传是否使用CDN上传加速
+	cfg.UseCdnDomains = false
+
+	e.Client = mac
+	e.BucketName = BucketName
+	e.cfg = cfg
+	e.options = options
+	return nil
+}
+
+// setZoneORDefault 设置Zone或者默认华东
+func (e *QiNiuKODO) setZoneORDefault(cfg storage.Config, options ...ClientOption) {
+	if len(options) > 0 && options[0]["Zone"] != nil {
+		if _, ok := options[0]["Zone"].(Zone); !ok {
+			cfg.Zone = &storage.ZoneHuadong
+		}
+		switch options[0]["Zone"].(Zone) {
+		case HuaDong:
+			cfg.Zone = &storage.ZoneHuadong
+		case HuaBei:
+			cfg.Zone = &storage.ZoneHuabei
+		case HuaNan:
+			cfg.Zone = &storage.ZoneHuanan
+		case BeiMei:
+			cfg.Zone = &storage.ZoneBeimei
+		case XinJiaPo:
+			cfg.Zone = &storage.ZoneXinjiapo
+		default:
+			cfg.Zone = &storage.ZoneHuadong
+		}
+	}
+}
+
+// UpLoad 文件上传
+func (e *QiNiuKODO) UpLoad(yourObjectName string, localFile interface{}) error {
+
+	// 构建表单上传的对象
+	formUploader := storage.NewFormUploader(&e.cfg)
+	ret := storage.PutRet{}
+	// 可选配置
+	putExtra := storage.PutExtra{
+		Params: map[string]string{
+			"x:name": "github logo",
+		},
+	}
+	err := formUploader.PutFile(context.Background(), &ret, e.getToken(), yourObjectName, localFile.(string), &putExtra)
+	if err != nil {
+		fmt.Println(err)
+		return err
+	}
+	fmt.Println(ret.Key, ret.Hash)
+	return nil
+}
+
+func (e *QiNiuKODO) GetTempToken() (string, error) {
+	token := e.getToken()
+	return token, nil
+}

common/file_store/kodo_test.go

@@ -0,0 +1,23 @@
+package file_store
+
+import (
+	"testing"
+)
+
+func TestKODOUpload(t *testing.T) {
+	e := OXS{"", "", "", ""}
+	var oxs = e.Setup(QiNiuKodo, map[string]interface{}{"Zone": "华东"})
+	err := oxs.UpLoad("test.png", "./test.png")
+	if err != nil {
+		t.Error(err)
+	}
+	t.Log("ok")
+}
+
+func TestKODOGetTempToken(t *testing.T) {
+	e := OXS{"", "", "", ""}
+	var oxs = e.Setup(QiNiuKodo, map[string]interface{}{"Zone": "华东"})
+	token, _ := oxs.GetTempToken()
+	t.Log(token)
+	t.Log("ok")
+}

common/file_store/obs.go

@@ -0,0 +1,52 @@
+package file_store
+
+import (
+	"fmt"
+	"github.com/huaweicloud/huaweicloud-sdk-go-obs/obs"
+	"log"
+)
+
+type HuaWeiOBS struct {
+	Client     interface{}
+	BucketName string
+}
+
+func (e *HuaWeiOBS) Setup(endpoint, accessKeyID, accessKeySecret, BucketName string, options ...ClientOption) error {
+	// 创建ObsClient结构体
+	client, err := obs.New(accessKeyID, accessKeySecret, endpoint)
+	if err != nil {
+		log.Println("Error:", err)
+		return err
+	}
+	e.Client = client
+	e.BucketName = BucketName
+	return nil
+}
+
+// UpLoad 文件上传
+// yourObjectName 文件路径名称，与objectKey是同一概念，表示断点续传上传文件到OSS时需要指定包含文件后缀在内的完整路径，例如abc/efg/123.jpg
+func (e *HuaWeiOBS) UpLoad(yourObjectName string, localFile interface{}) error {
+	// 获取存储空间。
+	input := &obs.PutFileInput{}
+	input.Bucket = e.BucketName
+	input.Key = yourObjectName
+	input.SourceFile = localFile.(string)
+	output, err := e.Client.(*obs.ObsClient).PutFile(input)
+
+	if err == nil {
+		fmt.Printf("RequestId:%s\n", output.RequestId)
+		fmt.Printf("ETag:%s, StorageClass:%s\n", output.ETag, output.StorageClass)
+	} else {
+		if obsError, ok := err.(obs.ObsError); ok {
+			fmt.Println(obsError.Code)
+			fmt.Println(obsError.Message)
+		} else {
+			fmt.Println(err)
+		}
+	}
+	return nil
+}
+
+func (e *HuaWeiOBS) GetTempToken() (string, error) {
+	return "", nil
+}

common/file_store/obs_test.go

@@ -0,0 +1,15 @@
+package file_store
+
+import (
+	"testing"
+)
+
+func TestOBSUpload(t *testing.T) {
+	e := OXS{"", "", "", ""}
+	var oxs = e.Setup(HuaweiOBS)
+	err := oxs.UpLoad("test.png", "./test.png")
+	if err != nil {
+		t.Error(err)
+	}
+	t.Log("ok")
+}

common/file_store/oss.go

@@ -6,50 +6,43 @@ import (
 )
 
 type ALiYunOSS struct {
-	Client          interface{}
-	Endpoint        string
-	AccessKeyId     string
-	AccessKeySecret string
-	BucketName      string
+	Client     interface{}
+	BucketName string
 }
 
-func (e *ALiYunOSS) Setup() error {
-	// TODO: 如果需要使用阿里云OSS请在此处填写对应信息
-	e.AccessKeyId = ""
-	e.AccessKeySecret = ""
-	e.Endpoint = ""
-	e.BucketName = ""
-
-	client, err := oss.New(e.Endpoint, e.AccessKeyId, e.AccessKeySecret)
+//Setup 装载
+//endpoint sss
+func (e *ALiYunOSS) Setup(endpoint, accessKeyID, accessKeySecret, BucketName string, options ...ClientOption) error {
+	client, err := oss.New(endpoint, accessKeyID, accessKeySecret)
 	if err != nil {
 		log.Println("Error:", err)
 		return err
 	}
 	e.Client = client
+	e.BucketName = BucketName
+
 	return nil
 }
 
 // UpLoad 文件上传
-func (e *ALiYunOSS) UpLoad(yourObjectName string, localFile string) error {
-	err := e.Setup()
-	if err != nil {
-		log.Println("Error:", err)
-		return err
-	}
+func (e *ALiYunOSS) UpLoad(yourObjectName string, localFile interface{}) error {
 	// 获取存储空间。
 	bucket, err := e.Client.(*oss.Client).Bucket(e.BucketName)
 	if err != nil {
 		log.Println("Error:", err)
 		return err
 	}
-
 	// 设置分片大小为100 KB，指定分片上传并发数为3，并开启断点续传上传。
 	// 其中<yourObjectName>与objectKey是同一概念，表示断点续传上传文件到OSS时需要指定包含文件后缀在内的完整路径，例如abc/efg/123.jpg。
 	// "LocalFile"为filePath，100*1024为partSize。
-	err = bucket.UploadFile(yourObjectName, localFile, 100*1024, oss.Routines(3), oss.Checkpoint(true, ""))
+	err = bucket.UploadFile(yourObjectName, localFile.(string), 100*1024, oss.Routines(3), oss.Checkpoint(true, ""))
 	if err != nil {
 		log.Println("Error:", err)
 		return err
 	}
 	return nil
 }
+
+func (e *ALiYunOSS) GetTempToken() (string, error) {
+	return "", nil
+}

common/file_store/oss_test.go

@@ -0,0 +1,16 @@
+package file_store
+
+import (
+	"testing"
+)
+
+func TestOSSUpload(t *testing.T) {
+	// 打括号内填写自己的测试信息即可
+	e := OXS{}
+	var oxs = e.Setup(AliYunOSS)
+	err := oxs.UpLoad("test.png", "./test.png")
+	if err != nil {
+		t.Error(err)
+	}
+	t.Log("ok")
+}

common/global/adm.go

@@ -2,11 +2,10 @@ package global
 
 const (
 	// Version go-admin version info
-	Version = "2.0.5"
+	Version = "2.3.0"
 )
 
 var (
-	Source string
+	// Driver 数据库驱动
 	Driver string
-	DBName string
 )

common/ip.go

@@ -6,22 +6,23 @@ import (
 )
 
 func GetClientIP(c *gin.Context) string {
-	ClientIP := c.ClientIP()
-	//fmt.Println("ClientIP:", ClientIP)
-	RemoteIP, _ := c.RemoteIP()
-	//fmt.Println("RemoteIP:", RemoteIP)
+	// 优先从 X-Forwarded-For 获取 IP
 	ip := c.Request.Header.Get("X-Forwarded-For")
-	if strings.Contains(ip, "127.0.0.1") || ip == "" {
+	if ip == "" || strings.Contains(ip, "127.0.0.1") {
+		// 如果为空或为本地地址，则尝试从 X-Real-IP 获取
 		ip = c.Request.Header.Get("X-real-ip")
 	}
 	if ip == "" {
+		// 如果仍为空，则使用 RemoteIP
+		ip = c.RemoteIP()
+	}
+	if ip == "" || ip == "127.0.0.1" {
+		// 如果仍为空或为本地地址，则使用 ClientIP
+		ip = c.ClientIP()
+	}
+	if ip == "" {
+		// 最后兜底为本地地址
 		ip = "127.0.0.1"
 	}
-	if RemoteIP.String() != "127.0.0.1" {
-		ip = RemoteIP.String()
-	}
-	if ClientIP != "127.0.0.1" {
-		ip = ClientIP
-	}
 	return ip
 }

common/middleware/auth.go

@@ -20,7 +20,7 @@ func AuthInit() (*jwt.GinJWTMiddleware, error) {
 	}
 	return jwt.New(&jwt.GinJWTMiddleware{
 		Realm:           "test zone",
-		Key:             []byte(config.ApplicationConfig.JwtSecret),
+		Key:             []byte(config.JwtConfig.Secret),
 		Timeout:         timeout,
 		MaxRefresh:      time.Hour,
 		PayloadFunc:     handler.PayloadFunc,
@@ -33,4 +33,4 @@ func AuthInit() (*jwt.GinJWTMiddleware, error) {
 		TimeFunc:        time.Now,
 	})
 
-}
+}

common/middleware/customerror.go

@@ -2,8 +2,8 @@ package middleware
 
 import (
 	"fmt"
-	"go-admin/common"
 	"net/http"
+	"runtime"
 	"strconv"
 	"strings"
 	"time"
@@ -34,14 +34,24 @@ func CustomError(c *gin.Context) {
 						c.Request.URL,
 						statusCode,
 						c.Request.RequestURI,
-						common.GetClientIP(c),
+						c.ClientIP(),
 						p[2],
 					)
 					c.JSON(http.StatusOK, gin.H{
 						"code": statusCode,
 						"msg":  p[2],
 					})
+				} else {
+					c.JSON(http.StatusOK, gin.H{
+						"code": 500,
+						"msg":  errStr,
+					})
 				}
+			case runtime.Error:
+				c.JSON(http.StatusOK, gin.H{
+					"code": 500,
+					"msg":  errStr.Error(),
+				})
 			default:
 				panic(err)
 			}

common/middleware/demo.go

@@ -2,25 +2,28 @@ package middleware
 
 import (
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/config"
 	"net/http"
 )
 
 func DemoEvn() gin.HandlerFunc {
 	return func(c *gin.Context) {
 		method := c.Request.Method
-		if method == "GET" ||
-			method == "OPTIONS" ||
-			c.Request.RequestURI == "/api/v1/login" ||
-			c.Request.RequestURI == "/api/v1/logout" {
-			c.Next()
-		} else {
-			c.JSON(http.StatusOK, gin.H{
-				"code": 500,
-				"msg":  "谢谢您的参与，但为了大家更好的体验，所以本次提交就算了吧！\U0001F600\U0001F600\U0001F600",
-			})
-			c.Abort()
-			return
+		if config.ApplicationConfig.Mode == "demo" {
+			if method == "GET" ||
+				method == "OPTIONS" ||
+				c.Request.RequestURI == "/api/v1/login" ||
+				c.Request.RequestURI == "/api/v1/logout" {
+				c.Next()
+			} else {
+				c.JSON(http.StatusOK, gin.H{
+					"code": 500,
+					"msg":  "谢谢您的参与，但为了大家更好的体验，所以本次提交就算了吧！\U0001F600\U0001F600\U0001F600",
+				})
+				c.Abort()
+				return
+			}
 		}
-
+		c.Next()
 	}
-}
+}

common/middleware/handler/auth.go

@@ -1,7 +1,6 @@
 package handler
 
 import (
-	"fmt"
 	"go-admin/app/admin/models"
 	"go-admin/common"
 	"net/http"
@@ -16,8 +15,6 @@ import (
 	"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/mssola/user_agent"
-	gaConfig "go-admin/config"
-
 	"go-admin/common/global"
 )
 
@@ -96,11 +93,11 @@ func Authenticator(c *gin.Context) (interface{}, error) {
 			return nil, jwt.ErrInvalidVerificationode
 		}
 	}
-	user, role, e := loginVals.GetUser(db)
+	sysUser, role, e := loginVals.GetUser(db)
 	if e == nil {
 		username = loginVals.Username
 
-		return map[string]interface{}{"user": user, "role": role}, nil
+		return map[string]interface{}{"user": sysUser, "role": role}, nil
 	} else {
 		msg = "登录失败"
 		status = "1"
@@ -119,8 +116,7 @@ func LoginLogToDB(c *gin.Context, status string, msg string, username string) {
 
 	ua := user_agent.New(c.Request.UserAgent())
 	l["ipaddr"] = common.GetClientIP(c)
-	fmt.Println("gaConfig.ExtConfig.AMap.Key", gaConfig.ExtConfig.AMap.Key)
-	l["loginLocation"] = pkg.GetLocation(common.GetClientIP(c),gaConfig.ExtConfig.AMap.Key)
+	l["loginLocation"] = "" // pkg.GetLocation(common.GetClientIP(c),gaConfig.ExtConfig.AMap.Key)
 	l["loginTime"] = pkg.GetCurrentTime()
 	l["status"] = status
 	l["remark"] = c.Request.UserAgent()

common/middleware/handler/login.go

@@ -14,7 +14,7 @@ type Login struct {
 }
 
 func (u *Login) GetUser(tx *gorm.DB) (user SysUser, role SysRole, err error) {
-	err = tx.Table("sys_user").Where("username = ?  and status = 2", u.Username).First(&user).Error
+	err = tx.Table("sys_user").Where("username = ?  and status = '2'", u.Username).First(&user).Error
 	if err != nil {
 		log.Errorf("get user error, %s", err.Error())
 		return

common/middleware/handler/user.go

@@ -28,7 +28,7 @@ type SysUser struct {
 	models.ModelTime
 }
 
-func (SysUser) TableName() string {
+func (*SysUser) TableName() string {
 	return "sys_user"
 }