取消dashboard的v-auth

* server/service/system/sys_dictionary.go: fix 获取字典单条数据时status失效的bug

* 增加关闭状态下折叠内容所在menu的高亮提示

* 修复字典变更无法打开的bug

* 增加详情页签区分功能

* 增加字典详情区分

* 修复字典功能

Co-authored-by: yancunju <yancunju@autouc.com>

.github/ISSUE_TEMPLATE.md

@@ -1,70 +0,0 @@
----
-name: issues模板
-about: 请严格按照要求进行提交issues! 如果未能按照要求,我们将会close您的issues,敬请谅解!
----
-<!-- 在提交问题之前，请先回答这些问题。谢谢! -->
-
-### 1. 您使用的是哪个版本的`Go`和系统类型/架构 ?
-
-<!-- 
-请从您的终端粘贴命令 `go version` 的输出。
-期望看到像: `go version go1.14.4 darwin/amd64` 
--->
-
-### 2. 您使用的是哪个版本的 `Nodejs` 和 `npm` 或 `cnpm` ?
-
-<!-- 
-请从您的终端粘贴命令 `node -v` 的输出。
-期望看到像: `v12.16.1` 
--->
-
-<!-- 
-请从您的终端粘贴命令 `npm -v` 的输出。
-期望看到像: `6.13.4`
--->
-
-<!-- 
-请从您的终端粘贴命令 `cnpm -v` 的输出。
-期望看到的像: `
-cnpm@6.1.1 (/usr/local/lib/node_modules/cnpm/lib/parse_argv.js)
-npm@6.14.2 (/usr/local/lib/node_modules/cnpm/node_modules/npm/lib/npm.js)
-node@12.16.1 (/usr/local/bin/node)
-npminstall@3.27.0 (/usr/local/lib/node_modules/cnpm/node_modules/npminstall/lib/index.js)
-prefix=/usr/local 
-darwin x64 19.6.0 
-registry=https://r.npm.taobao.org
-` 
--->
-
-### 3. 您使用的是哪个版本的 `gin-vue-admin` ?
-
-<!-- 
-您如果克隆的是master就写master, 
-如果是在Releases中下载的zip/tar.gz对应的tag版本,
-如:`v2.3.0` 
--->
-
-
-
-### 4. 可以在master版本中复现此问题吗 ?
-
-
-
-### 5. 您做了什么 ?
-
-<!-- 
-如果可能，请提供最短代码的副本以重现该错误。
-一个完整的可运行程序是最好的。 
--->
-
-
-
-### 6. 您期望看到什么 ?
-
-
-
-### 7. 您看到了什么 ?
-
-
-
-### 8. 错误堆栈或者SQL打印

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -0,0 +1,60 @@
+name: 🐛 Bug report
+description: Report a bug to help us improve Gin-Vue-Admin
+title: "[Bug]: "
+labels: [bug]
+assignees:
+  - piexlmax
+  - songzhibin97
+  - SliverHorn
+  - bypanghu
+body:
+  - type: input
+    id: gva
+    attributes:
+      label: gin-vue-admin 版本
+      description: 请输入您当前使用的项目版本?
+      placeholder: 2.4.5Beta
+    validations:
+      required: true
+  - type: input
+    id: node
+    attributes:
+      label: Node 版本
+      description: 请输入您当前使用的NODE版本?
+      placeholder: v14.16.0
+    validations:
+      required: true
+  - type: input
+    id: golang
+    attributes:
+      label: Golang 版本
+      description: 请输入您当前使用的GOLANG版本?
+      placeholder: go 1.16
+    validations:
+      required: true
+  - type: dropdown
+    id: reappearance
+    attributes:
+      label: 是否依旧存在
+      description: 是否可以在master分支复现此bug?
+      options:
+        - 可以
+        - 不可以
+        - 未测试
+    validations:
+      required: true
+  - type: textarea
+    id: desc
+    attributes:
+      label: bug描述
+      description: 请简要描述bug以及复现过程.
+      placeholder: |
+        1. 首先...
+        2. 然后...
+    validations:
+      required: true
+  - type: textarea
+    id: advise
+    attributes:
+      label: 修改建议
+      description: 您有好的建议或者修改方案可以提供给我们。

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Document
+    url: https://www.gin-vue-admin.com
+    about: If you have any questions about the use, you can check our official documents first

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -0,0 +1,22 @@
+name: 🚀 Feature request
+description: Suggest an idea for Gin-Vue-Admin
+title: "[Feature]: "
+labels: [feature]
+assignees:
+  - piexlmax
+body:
+  - type: textarea
+    id: desc
+    attributes:
+      label: 功能描述以及必要性描述
+      description: 您觉得此新功能会为框架带来什么便利.
+      placeholder: |
+        1. 首先...
+        2. 然后...
+    validations:
+      required: true
+  - type: textarea
+    id: advise
+    attributes:
+      label: 建议和方案
+      description: 您有好的建议或者修改方案可以提供给我们。

.github/workflows/build_test.yml

@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [12.x]
+        node-version: [14.16.0]
     steps:
       - name: Check out branch
         uses: actions/checkout@v2
@@ -40,10 +40,10 @@ jobs:
     name: Backend build
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.14
+      - name: Set up Go 1.6
         uses: actions/setup-go@v1
         with:
-          go-version: 1.14
+          go-version: 1.16
         id: go
 
       - name: Check out branch

.github/workflows/devops-test.yaml

@@ -0,0 +1,55 @@
+name: devops-test
+on:
+  push:
+    branches: [test]
+  workflow_dispatch:
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: ['16.x']
+        go-version: ['1.16']
+    steps:
+      - name: Check out branch
+        uses: actions/checkout@v2
+      - name: Sed Config
+        env:
+          PROD: ${{ secrets.PROD }}
+          TESTING: ${{ secrets.TESTING }}
+        shell: bash
+        run: |
+          git branch 
+          ls -l
+          sed -i "s/${PROD}/${TESTING}/g" web/.env.production
+          sed -i 's/${basePath}:${basePort}/${basePath}/g' web/src/view/systemTools/formCreate/index.vue
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v2.1.2
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: Build-Node
+        run: |
+          cd web/ && yarn install && yarn run build
+      - name: Use Go ${{ matrix.go-version }}
+        uses: actions/setup-go@v1
+        with:
+          go-version: ${{ matrix.go-version }}
+      - name: Build-go
+        run: |
+          cd server/ && go mod tidy && go build && mkdir ../web/ser && mv server ../web/ser/ && cd ../web/ser/ && ls -s 
+      - name: restart
+        env:
+          KEY: ${{ secrets.KEY }}
+          HOST: ${{ secrets.HOST }}
+          USER: ${{ secrets.USER }}
+          PROT: ${{ secrets.PROT }}
+          MKDIRTEST: ${{ secrets.MKDIRTEST }}
+        run: |
+          mkdir -p ~/.ssh/ && echo "$KEY" > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa
+          ssh-keyscan github.com >> ~/.ssh/known_hosts
+          scp -P ${PROT} -o StrictHostKeyChecking=no -r web/dist/* ${USER}@${HOST}:${MKDIRTEST}dist/
+          scp -P ${PROT} -o StrictHostKeyChecking=no -r web/ser/* ${USER}@${HOST}:${MKDIRTEST}
+          ssh -p ${PROT} -o StrictHostKeyChecking=no ${USER}@${HOST} "cd ${MKDIRTEST}resource/ && rm -rf ${MKDIRTEST}resource/*"
+          scp -P ${PROT} -o StrictHostKeyChecking=no -r server/resource/* ${USER}@${HOST}:${MKDIRTEST}resource/
+          ssh -p ${PROT} -o StrictHostKeyChecking=no ${USER}@${HOST} "cd ${MKDIRTEST} && bash restart.sh > /dev/null  2>&1 &"

.github/workflows/devops.yml

@@ -0,0 +1,52 @@
+name: devops
+on:
+  push:
+    tags:
+      - v*
+  workflow_dispatch:
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: ['16.x']
+        go-version: ['1.16']
+    steps:
+      - name: Check out branch
+        uses: actions/checkout@v2
+      - name: Sed Config
+        shell: bash
+        run: |
+          git branch 
+          ls -l
+          sed -i 's/${basePath}:${basePort}/${basePath}/g' web/src/view/systemTools/formCreate/index.vue
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v2.1.2
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: Build-Node
+        run: |
+          cd web/ && yarn install && yarn run build
+      - name: Use Go ${{ matrix.go-version }}
+        uses: actions/setup-go@v1
+        with:
+          go-version: ${{ matrix.go-version }}
+      - name: Build-go
+        run: |
+          cd server/ && go mod tidy && go build && mkdir ../web/ser && mv server ../web/ser/ && cd ../web/ser/ && ls -s 
+      - name: restart
+        env:
+          KEY: ${{ secrets.KEY }}
+          HOST: ${{ secrets.HOST }}
+          USER: ${{ secrets.USER }}
+          PROT: ${{ secrets.PROT }}
+          MKDIR: ${{ secrets.MKDIR }}
+        run: |
+          mkdir -p ~/.ssh/ && echo "$KEY" > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa
+          ssh-keyscan github.com >> ~/.ssh/known_hosts
+          scp -P ${PROT} -o StrictHostKeyChecking=no -r web/dist/* ${USER}@${HOST}:${MKDIR}dist/
+          scp -P ${PROT} -o StrictHostKeyChecking=no -r web/ser/* ${USER}@${HOST}:${MKDIR}
+          ssh -p ${PROT} -o StrictHostKeyChecking=no ${USER}@${HOST} "cd ${MKDIR}resource/ && rm -rf ${MKDIR}resource/*"
+          scp -P ${PROT} -o StrictHostKeyChecking=no -r server/resource/* ${USER}@${HOST}:${MKDIR}resource/
+          ssh -p ${PROT} -o StrictHostKeyChecking=no ${USER}@${HOST} "cd ${MKDIR} && bash restart.sh > /dev/null  2>&1 &"

.github/workflows/docker-cicd.yaml

@@ -0,0 +1,29 @@
+name: Docker-CICD
+on:
+  push:
+    branches: [main]
+  workflow_dispatch:
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out branch
+        uses: actions/checkout@v2
+      - name: Login to Aliyun Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ${{ secrets.ALIYUN_REGISTRY }}
+          username: ${{ secrets.ALIYUN_DOCKERHUB_USER }}
+          password: ${{ secrets.ALIYUN_DOCKERHUB_PASSWORD }}
+      - name: Sed Config
+        shell: bash
+        run: |
+          sed -i 's#./entrypoint.sh"#./entrypoint.sh","actions"#g' Dockerfile
+          sed -i "s#COPY build/ /usr/share/nginx/html/#COPY . /opt/gva#g" Dockerfile
+          sed  -i 16c"\    && cd /opt/gva/server/ && go mod tidy && cd /opt/gva/web/ && yarn" Dockerfile
+          sed -i "s#open: true#open: false#g" web/vite.config.js
+          make images TAGS_OPT="latest"
+          docker push registry.cn-hangzhou.aliyuncs.com/gva/web:latest
+          docker push registry.cn-hangzhou.aliyuncs.com/gva/server:latest
+          docker push registry.cn-hangzhou.aliyuncs.com/gva/all:latest

.github/workflows/docker_build.yaml

@@ -0,0 +1,114 @@
+name: GIN-VUE-ADMIN Docker Build
+
+on:
+  push:
+    branches: [stopstopstop]
+  #workflow_dispatch:
+  #  inputs:
+  #    webtag:
+  #      description: 'Set web tag, Default latest'
+  #      required: true
+  #      default: "latest"
+  #    servertag:
+  #      description: 'Set server tag, Default latest'
+  #      required: true
+  #      default: "latest"
+
+jobs:
+  GIN_VUE_ADMIN_WEB:
+    name: GIN VUE ADMIN WEB
+    runs-on: ubuntu-latest
+    steps:
+      - name: Private Actions Checkout
+        uses: actions/checkout@v2.3.4
+      - name: Docker Setup QEMU
+        uses: docker/setup-qemu-action@v1.2.0
+      - name: Docker Setup Buildx
+        uses: docker/setup-buildx-action@v1.6.0
+      - name: Docker Login
+        uses: docker/login-action@v1.10.0
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Docker Login in Aliyun
+        uses: docker/login-action@v1.10.0
+        with:
+          registry: ${{ secrets.DOCKERHUB_REGISTRY_ALIYUN }}
+          username: ${{ secrets.DOCKERHUB_ACCOUNT_ALIYUN }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD_ALIYUN }}
+      - name: Build and push Docker images
+        uses: docker/build-push-action@v2.7.0
+        with:
+          context: .
+          # 这里是适配 arm64 ，主要看你们的程序是否支持 arm64
+          platforms: linux/amd64,linux/arm64
+          file: web/Dockerfile
+          push: true
+          # 这里是给docker 打标签，默认不上传 latest
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/web:${{ github.event.inputs.webtag }}
+            ${{ secrets.DOCKERHUB_REGISTRY_ALIYUN }}/${{ secrets.DOCKERHUB_USERNAME_ALIYUN }}web:${{ github.event.inputs.webtag }}
+          cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/web:${{ github.event.inputs.webtag }}.cache
+          cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/web:${{ github.event.inputs.webtag }}.cache,mode=max
+      # 漏洞扫描
+      - name: Scan for vulnerabilities
+        uses: crazy-max/ghaction-container-scan@v1
+        with:
+          image: ${{ secrets.DOCKERHUB_USERNAME }}/web:${{ github.event.inputs.webtag }}
+          dockerfile: web/Dockerfile
+      # 更新 docker 描述页面
+      - name: Docker Hub Description
+        uses: peter-evans/dockerhub-description@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          repository: ${{ secrets.DOCKERHUB_USERNAME }}/web
+
+  GIN_VUE_ADMIN_SERVER:
+    name: GIN VUE ADMIN SERVER
+    runs-on: ubuntu-latest
+    steps:
+      - name: Private Actions Checkout
+        uses: actions/checkout@v2.3.4
+      - name: Docker Setup QEMU
+        uses: docker/setup-qemu-action@v1.2.0
+      - name: Docker Setup Buildx
+        uses: docker/setup-buildx-action@v1.6.0
+      - name: Docker Login
+        uses: docker/login-action@v1.10.0
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Docker Login in Aliyun
+        uses: docker/login-action@v1.10.0
+        with:
+          registry: ${{ secrets.DOCKERHUB_REGISTRY_ALIYUN }}
+          username: ${{ secrets.DOCKERHUB_ACCOUNT_ALIYUN }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD_ALIYUN }}
+      - name: Build and push Docker images
+        uses: docker/build-push-action@v2.7.0
+        with:
+          context: .
+          # 这里是适配 arm64 ，主要看你们的程序是否支持 arm64
+          platforms: linux/amd64,linux/arm64
+          file: server/Dockerfile
+          push: true
+          # 这里是给docker 打标签，默认不上传 latest
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/server:${{ github.event.inputs.servertag }}
+            ${{ secrets.DOCKERHUB_REGISTRY_ALIYUN }}/${{ secrets.DOCKERHUB_USERNAME_ALIYUN }}server:${{ github.event.inputs.servertag }}
+          cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/server:${{ github.event.inputs.servertag }}.cache
+          cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/server:${{ github.event.inputs.servertag }}.cache,mode=max
+      # 漏洞扫描
+      - name: Scan for vulnerabilities
+        uses: crazy-max/ghaction-container-scan@v1
+        with:
+          image: ${{ secrets.DOCKERHUB_USERNAME }}/server:${{ github.event.inputs.servertag }}
+          dockerfile: server/Dockerfile
+      # 更新 docker 描述页面
+      - name: Docker Hub Description
+        uses: peter-evans/dockerhub-description@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          repository: ${{ secrets.DOCKERHUB_USERNAME }}/server

.gitignore

@@ -22,7 +22,6 @@ yarn-error.log*
 *.sln
 *.sw?
 
-go.sum
 /server/log/
 /server/gva
 /server/latest_log

Dockerfile

@@ -0,0 +1,18 @@
+FROM centos:7
+WORKDIR /opt
+ENV LANG=en_US.utf8
+COPY entrypoint.sh .
+COPY build/ /usr/share/nginx/html/
+COPY server/config.yaml /usr/share/nginx/html/config.yaml
+COPY web/.docker-compose/nginx/conf.d/nginx.conf /etc/nginx/conf.d/nginx.conf
+RUN set -ex \
+    && echo "LANG=en_US.utf8" > /etc/locale.conf \
+    && echo "net.core.somaxconn = 1024" >> /etc/sysctl.conf \
+    && echo "vm.overcommit_memory = 1" >> /etc/sysctl.conf \
+    && yum -y install yum -y install *epel* \
+    && yum -y localinstall http://mirrors.ustc.edu.cn/mysql-repo/mysql57-community-release-el7.rpm \
+    && yum -y install mysql-community-server git redis nginx go npm --nogpgcheck && chmod +x ./entrypoint.sh \
+    && npm install -g yarn && go env -w GO111MODULE=on && go env -w GOPROXY=https://goproxy.cn,direct \
+    && echo "start" > /dev/null
+EXPOSE 80
+ENTRYPOINT ["./entrypoint.sh"]

Makefile

@@ -0,0 +1,61 @@
+SHELL = /bin/bash
+
+CONFIG_FILE         = config.yaml
+PROJECT_NAME        = github.com/flipped-aurora/gin-vue-admin/server
+#SCRIPT_DIR         = $(shell pwd)/etc/script
+BUILD_IMAGE_SERVER  = golang:1.16
+BUILD_IMAGE_WEB     = node:16
+IMAGE_NAME          = gva
+REPOSITORY          = registry.cn-hangzhou.aliyuncs.com/${IMAGE_NAME}
+
+ifeq ($(TAGS_OPT),)
+TAGS_OPT            = 2.5.0b
+else
+endif
+
+#容器环境前后端共同打包
+build: build-web build-server
+	docker run --name build-local --rm -v $(shell pwd):/go/src/${PROJECT_NAME} -w /go/src/${PROJECT_NAME} ${BUILD_IMAGE_SERVER} make build-local
+
+#容器环境打包前端
+build-web:
+	docker run --name build-web-local --rm -v $(shell pwd):/go/src/${PROJECT_NAME} -w /go/src/${PROJECT_NAME} ${BUILD_IMAGE_WEB} make build-web-local
+
+#容器环境打包后端
+build-server:
+	docker run --name build-server-local --rm -v $(shell pwd):/go/src/${PROJECT_NAME} -w /go/src/${PROJECT_NAME} ${BUILD_IMAGE_SERVER} make build-server-local
+
+#构建web镜像
+build-image-web:
+	@cd web/ && docker build -t ${REPOSITORY}/web:${TAGS_OPT} .
+
+#构建server镜像
+build-image-server:
+	@cd server/ && docker build -t ${REPOSITORY}/server:${TAGS_OPT} .
+
+#本地环境打包前后端
+build-local:
+	if [ -d "build" ];then rm -rf build; else echo "OK!"; fi \
+	&& if [ -f "/.dockerenv" ];then echo "OK!"; else  make build-web-local && make build-server-local; fi \
+	&& mkdir build && cp -r web/dist build/ && cp server/server build/ && cp -r server/resource build/resource 
+
+#本地环境打包前端
+build-web-local:
+	@cd web/ && if [ -d "dist" ];then rm -rf dist; else echo "OK!"; fi \
+	&& yarn config set registry http://mirrors.cloud.tencent.com/npm/ \
+	&& yarn install && yarn build
+
+#本地环境打包后端
+build-server-local:
+	@cd server/ && if [ -f "server" ];then rm -rf server; else echo "OK!"; fi \
+	&& go env -w GO111MODULE=on && go env -w GOPROXY=https://goproxy.cn,direct \
+	&& go env -w CGO_ENABLED=0 && go env  && go mod tidy \
+	&& go build -ldflags "-B 0x$(shell head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -X main.Version=${TAGS_OPT}" -v
+
+#打包前后端二合一镜像
+image: build 
+	docker build -t ${REPOSITORY}/all-one:${TAGS_OPT} .
+
+#尝鲜版
+images: build build-image-web build-image-server
+	docker build -t ${REPOSITORY}/all:${TAGS_OPT} .

README-en.md

@@ -3,11 +3,11 @@
 <img src="http://qmplusimg.henrongyi.top/gvalogo.jpg" width=300" height="300" />
 </div>
 <div align=center>
-<img src="https://img.shields.io/badge/golang-1.14-blue"/>
-<img src="https://img.shields.io/badge/gin-1.6.3-lightBlue"/>
-<img src="https://img.shields.io/badge/vue-2.6.10-brightgreen"/>
-<img src="https://img.shields.io/badge/element--ui-2.12.0-green"/>
-<img src="https://img.shields.io/badge/gorm-1.20.7-red"/>
+<img src="https://img.shields.io/badge/golang-1.16-blue"/>
+<img src="https://img.shields.io/badge/gin-1.7.0-lightBlue"/>
+<img src="https://img.shields.io/badge/vue-3.2.25-brightgreen"/>
+<img src="https://img.shields.io/badge/element--plus-2.0.1-green"/>
+<img src="https://img.shields.io/badge/gorm-1.22.5-red"/>
 </div>
 
 English | [简体中文](./README.md)
@@ -299,11 +299,19 @@ swag init
 
 #### [About Us](https://www.gin-vue-admin.com/about/)
 
-## 8. Donate
+## 8. Contributors
+
+Thank you for considering your contribution to gin-vue-admin!
+
+<a href="https://github.com/flipped-aurora/gin-vue-admin/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=flipped-aurora/gin-vue-admin" />
+</a>
+
+## 9. Donate
 
 If you find this project useful, you can buy author a glass of juice :tropical_drink: [here](https://www.gin-vue-admin.com/docs/coffee)
 
-## 9. Commercial considerations
+## 10. Commercial considerations
 
 If you use this project for commercial purposes, please comply with the Apache2.0 agreement and retain the author's technical support statement.
 

README.md

@@ -3,35 +3,58 @@
 <img src="http://qmplusimg.henrongyi.top/gvalogo.jpg" width=300" height="300" />
 </div>
 <div align=center>
-<img src="https://img.shields.io/badge/golang-1.14-blue"/>
-<img src="https://img.shields.io/badge/gin-1.6.3-lightBlue"/>
-<img src="https://img.shields.io/badge/vue-2.6.10-brightgreen"/>
-<img src="https://img.shields.io/badge/element--ui-2.12.0-green"/>
-<img src="https://img.shields.io/badge/gorm-1.20.7-red"/>
+<img src="https://img.shields.io/badge/golang-1.16-blue"/>
+<img src="https://img.shields.io/badge/gin-1.7.0-lightBlue"/>
+<img src="https://img.shields.io/badge/vue-3.2.25-brightgreen"/>
+<img src="https://img.shields.io/badge/element--plus-2.0.1-green"/>
+<img src="https://img.shields.io/badge/gorm-1.22.5-red"/>
 </div>
 
 [English](./README-en.md) | 简体中文
 
-[gitee地址](https://gitee.com/pixelmax/gin-vue-admin): https://gitee.com/pixelmax/gin-vue-admin
+## 不同版本
 
-[github地址](https://github.com/flipped-aurora/gin-vue-admin): https://github.com/flipped-aurora/gin-vue-admin
+我们会对以下四个版本持续维护，请选择适合自己的版本使用。最新技术栈为组合式api版本，已支持多语言（I18N）
 
-[vue3版本分支地址](https://github.com/flipped-aurora/gin-vue-admin/tree/vue3Develop): https://github.com/flipped-aurora/gin-vue-admin/tree/vue3Develop
-
-[审批流分支](https://github.com/flipped-aurora/gin-vue-admin/tree/gva_workflow): https://github.com/flipped-aurora/gin-vue-admin/tree/gva_workflow
+[组合式API版（主）](https://github.com/flipped-aurora/gin-vue-admin) | 
+[组合式API多语言(i18n)版](https://github.com/flipped-aurora/gin-vue-admin/tree/i18n-dev-new) | 
+[声明式API版](https://github.com/flipped-aurora/gin-vue-admin/tree/v2.4.x) | 
+[声明式API多语言(i18n)版](https://github.com/flipped-aurora/gin-vue-admin/tree/i18n-dev)
 
 # 项目文档
 [在线文档](https://www.gin-vue-admin.com) : https://www.gin-vue-admin.com
 
-[从环境到部署教学视频](https://www.bilibili.com/video/BV1fV411y7dT)
+[初始化](https://www.gin-vue-admin.com/docs/first_master)
+						       
+[从环境到部署教学视频](https://www.bilibili.com/video/BV1Rg411u7xH)
 
 [开发教学](https://www.gin-vue-admin.com/docs/help) (贡献者:  <a href="https://github.com/LLemonGreen">LLemonGreen</a> And <a href="https://github.com/fkk0509">Fann</a>)
 
+[交流社区](https://support.qq.com/products/371961)
+
+[插件市场](https://plugin.gin-vue-admin.com/)
+
+# 重要提示
+
+1.本项目从起步到开发到部署均有文档和详细视频教程
+
+2.本项目需要您有一定的golang和vue基础
+
+3.您完全可以通过我们的教程和文档完成一切操作，因此我们不再提供免费的技术服务，如需服务请进行[付费支持](https://www.gin-vue-admin.com/docs/payment)
+
+4.如果您将此项目用于商业用途，请遵守Apache2.0协议并保留作者技术支持声明。您需保留如下版权声明信息，其余信息功能不做任何限制。如需剔除请联系微信：shouzi_1994
+
+<img src="https://qmplusimg.henrongyi.top/%E6%8E%88%E6%9D%83.png" width="1000">
+
+5.如果您需要服务器的话 2核2G腾讯云服务器45元/年 在这里购买：https://cloud.tencent.com/act/new?fromSource=gwzcw.4325959.4325959.4325959&utm_medium=cps&utm_id=gwzcw.4325959.4325959.4325959&cps_key=962a7fdaa930cda1c06e36a7608e95cc
+									      
+阿里云服务器 1c2g1m 38一年 在这里购买:https://www.aliyun.com/minisite/goods?userCode=xqe01uob
+
 ## 1. 基本介绍
 
 ### 1.1 项目介绍
 
-> Gin-vue-admin是一个基于 [vue](https://vuejs.org) 和 [gin](https://gin-gonic.com) 开发的全栈前后端分离的后台管理系统，集成jwt鉴权，动态路由，动态菜单，casbin鉴权，表单生成器，代码生成器等功能，提供多种示例文件，让您把更多时间专注在业务开发上。
+> Gin-vue-admin是一个基于 [vue](https://vuejs.org) 和 [gin](https://gin-gonic.com) 开发的全栈前后端分离的开发基础平台，集成jwt鉴权，动态路由，动态菜单，casbin鉴权，表单生成器，代码生成器等功能，提供多种示例文件，让您把更多时间专注在业务开发上。
 
 [在线预览](http://demo.gin-vue-admin.com): http://demo.gin-vue-admin.com
 
@@ -42,7 +65,7 @@
 ### 1.2 贡献指南
 Hi! 首先感谢你使用 gin-vue-admin。
 
-Gin-vue-admin 是一套为后台管理平台准备的一整套前后端分离架构式的开源框架，旨在快速搭建后台管理系统。
+Gin-vue-admin 是一套为快速研发准备的一整套前后端分离架构式的开源框架，旨在快速搭建中小型项目。
 
 Gin-vue-admin 的成长离不开大家的支持，如果你愿意为 gin-vue-admin 贡献代码或提供建议，请阅读以下内容。
 
@@ -56,26 +79,17 @@ Gin-vue-admin 的成长离不开大家的支持，如果你愿意为 gin-vue-adm
 
 - commit 信息要以`[文件名]: 描述信息` 的形式填写，例如 `README.md: fix xxx bug`。
 
-- <font color=red>确保 PR 是提交到 `develop` 分支，而不是 `master` 分支。</font>
-
 - 如果是修复 bug，请在 PR 中给出描述信息。
 
 - 合并代码需要两名维护人员参与：一人进行 review 后 approve，另一人再次 review，通过后即可合并。
 
-### 1.3 版本列表
-
-- master: 2.0, 用于生产环境
-- develop: 2.0, 用于测试环境
-- [gin-vue-admin_v2_dev](https://github.com/flipped-aurora/gin-vue-admin/tree/gin-vue-admin_v2_dev) (v2.0 [GormV1版本](https://v1.gorm.io)稳定分支)
-- [gva_gormv2_dev](https://github.com/flipped-aurora/gin-vue-admin/tree/gva_gormv2_dev) (v2.0 [GormV2版本](https://v2.gorm.io)开发分支)
-
 ## 2. 使用说明
 
 ```
-- node版本 > v8.6.0
-- golang版本 >= v1.14
+- node版本 > v12.18.3
+- golang版本 >= v1.16
 - IDE推荐：Goland
-- 初始化项目： 不同版本数据库初始化不通 参见 https://www.gin-vue-admin.com/docs/first
+- 初始化项目： 不同版本数据库初始化不通 参见 https://www.gin-vue-admin.com/docs/first_master
 - 替换掉项目中的七牛云公钥，私钥，仓名和默认url地址，以免发生测试文件数据错乱
 ```
 
@@ -151,6 +165,24 @@ swag init
 
 > 执行上面的命令后，server目录下会出现docs文件夹里的 `docs.go`, `swagger.json`, `swagger.yaml` 三个文件更新，启动go服务之后, 在浏览器输入 [http://localhost:8888/swagger/index.html](http://localhost:8888/swagger/index.html) 即可查看swagger文档
 
+### 2.4 VSCode工作区
+
+#### 2.4.1 开发
+
+使用`VSCode`打开根目录下的工作区文件`gin-vue-admin.code-workspace`，在边栏可以看到三个虚拟目录：`backend`、`frontend`、`root`。
+
+#### 2.4.2 运行/调试
+
+在运行和调试中也可以看到三个task：`Backend`、`Frontend`、`Both (Backend & Frontend)`。运行`Both (Backend & Frontend)`可以同时启动前后端项目。
+
+#### 2.4.3 settings
+
+在工作区配置文件中有`go.toolsEnvVars`字段，是用于`VSCode`自身的go工具环境变量。此外在多go版本的系统中，可以通过`gopath`、`go.goroot`指定运行版本。
+
+```json
+    "go.gopath": null,
+    "go.goroot": null,
+```
 
 ## 3. 技术选型
 
@@ -200,17 +232,76 @@ swag init
             ├── timer       (定时器接口封装)                        
             └── upload      (oss接口封装)                        
     
-    └─web            （前端文件）
-        ├─public        （发布模板）
-        └─src           （源码包）
-            ├─api       （向后台发送ajax的封装层）
-            ├─assets	（静态文件）
-            ├─components（组件）
-            ├─router	（前端路由）
-            ├─store     （vuex 状态管理仓）
-            ├─style     （通用样式文件）
-            ├─utils     （前端工具库）
-            └─view      （前端页面）
+            web
+        ├── babel.config.js
+        ├── Dockerfile
+        ├── favicon.ico
+        ├── index.html                 -- 主页面
+        ├── limit.js                   -- 助手代码
+        ├── package.json               -- 包管理器代码
+        ├── src                        -- 源代码
+        │   ├── api                    -- api 组
+        │   ├── App.vue                -- 主页面
+        │   ├── assets                 -- 静态资源
+        │   ├── components             -- 全局组件
+        │   ├── core                   -- gva 组件包
+        │   │   ├── config.js          -- gva网站配置文件
+        │   │   ├── gin-vue-admin.js   -- 注册欢迎文件
+        │   │   └── global.js          -- 统一导入文件
+        │   ├── directive              -- v-auth 注册文件
+        │   ├── main.js                -- 主文件
+        │   ├── permission.js          -- 路由中间件
+        │   ├── pinia                  -- pinia 状态管理器，取代vuex
+        │   │   ├── index.js           -- 入口文件
+        │   │   └── modules            -- modules
+        │   │       ├── dictionary.js
+        │   │       ├── router.js
+        │   │       └── user.js
+        │   ├── router                 -- 路由声明文件
+        │   │   └── index.js
+        │   ├── style                  -- 全局样式
+        │   │   ├── base.scss
+        │   │   ├── basics.scss
+        │   │   ├── element_visiable.scss  -- 此处可以全局覆盖 element-plus 样式
+        │   │   ├── iconfont.css           -- 顶部几个icon的样式文件
+        │   │   ├── main.scss
+        │   │   ├── mobile.scss
+        │   │   └── newLogin.scss
+        │   ├── utils                  -- 方法包库
+        │   │   ├── asyncRouter.js     -- 动态路由相关
+        │   │   ├── btnAuth.js         -- 动态权限按钮相关
+        │   │   ├── bus.js             -- 全局mitt声明文件
+        │   │   ├── date.js            -- 日期相关
+        │   │   ├── dictionary.js      -- 获取字典方法 
+        │   │   ├── downloadImg.js     -- 下载图片方法
+        │   │   ├── format.js          -- 格式整理相关
+        │   │   ├── image.js           -- 图片相关方法
+        │   │   ├── page.js            -- 设置页面标题
+        │   │   ├── request.js         -- 请求
+        │   │   └── stringFun.js       -- 字符串文件
+        |   ├── view -- 主要view代码
+        |   |   ├── about -- 关于我们
+        |   |   ├── dashboard -- 面板
+        |   |   ├── error -- 错误
+        |   |   ├── example --上传案例
+        |   |   ├── iconList -- icon列表
+        |   |   ├── init -- 初始化数据  
+        |   |   |   ├── index -- 新版本
+        |   |   |   ├── init -- 旧版本
+        |   |   ├── layout  --  layout约束页面 
+        |   |   |   ├── aside 
+        |   |   |   ├── bottomInfo     -- bottomInfo
+        |   |   |   ├── screenfull     -- 全屏设置
+        |   |   |   ├── setting        -- 系统设置
+        |   |   |   └── index.vue      -- base 约束
+        |   |   ├── login              --登录 
+        |   |   ├── person             --个人中心 
+        |   |   ├── superAdmin         -- 超级管理员操作
+        |   |   ├── system             -- 系统检测页面
+        |   |   ├── systemTools        -- 系统配置相关页面
+        |   |   └── routerHolder.vue   -- page 入口页面 
+        ├── vite.config.js             -- vite 配置文件
+        └── yarn.lock
 
 ```
 
@@ -243,27 +334,23 @@ swag init
 
 ## 6.2 教学视频
 
-（1）环境搭建
+（1）手把手教学视频
 
-> bilibili：https://www.bilibili.com/video/BV1Fg4y187Bw/ (v1.0版本视频，v2.0操作相同目录不同)
+> https://www.bilibili.com/video/BV1Rg411u7xH/
 
-（2）模板使用
+（2）后端目录结构调整介绍以及使用方法
 
-> bilibili：https://www.bilibili.com/video/BV16K4y1r7BD/ (v1.0版本视频，v2.0操作相同目录不同)
+> https://www.bilibili.com/video/BV1x44y117TT/
 
-（3）2.0目录以及开发体验
-
-> bilibili：https://www.bilibili.com/video/BV1aV411d7Gm#reply2831798461
-
-（4）golang基础教学视频
+（3）golang基础教学视频
 
 > bilibili：https://space.bilibili.com/322210472/channel/detail?cid=108884
 
-（5）gin框架基础教学
+（4）gin框架基础教学
 
 > bilibili：https://space.bilibili.com/322210472/channel/detail?cid=126418&ctype=0
 
-（6）gin-vue-admin 版本更新介绍视频
+（5）gin-vue-admin 版本更新介绍视频
 
 > bilibili：https://space.bilibili.com/322210472/channel/detail?cid=126418&ctype=0
 
@@ -285,10 +372,24 @@ swag init
 
 ### [关于我们](https://www.gin-vue-admin.com/about/)
 
-## 8. 捐赠
+## 8. 贡献者
+
+感谢您对gin-vue-admin的贡献!
+
+<a href="https://github.com/flipped-aurora/gin-vue-admin/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=flipped-aurora/gin-vue-admin" />
+</a>
+
+## 9. 捐赠
 
 如果你觉得这个项目对你有帮助，你可以请作者喝饮料 :tropical_drink: [点我](https://www.gin-vue-admin.com/docs/coffee)
 
-## 9. 商用注意事项
+## 10. 友情链接
+
+[H5-Dooring ｜ H5页面制作神器](https://github.com/MrXujiang/h5-Dooring)	
+
+[go-zero 微服务框架｜缩短从需求到上线的距离](https://github.com/zeromicro/go-zero)
+
+## 11. 商用注意事项
 
 如果您将此项目用于商业用途，请遵守Apache2.0协议并保留作者技术支持声明。

deployment/server/gva-server-configmap.yaml

@@ -0,0 +1,148 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: config.yaml
+  annotations:
+    flipped-aurora/gin-vue-admin: backend
+    github: "https://github.com/flipped-aurora/gin-vue-admin.git"
+    app.kubernetes.io/version: 0.0.1
+  labels:
+    app: gva-server
+    version: gva-vue3
+data:
+  config.yaml: |
+    # github.com/flipped-aurora/gin-vue-admin/server Global Configuration
+
+    # jwt configuration
+    jwt:
+      signing-key: 'qmPlus'
+      expires-time: 604800
+      buffer-time: 86400
+
+    # zap logger configuration
+    zap:
+      level: 'info'
+      format: 'console'
+      prefix: '[github.com/flipped-aurora/gin-vue-admin/server]'
+      director: 'log'
+      link-name: 'latest_log'
+      show-line: true
+      encode-level: 'LowercaseColorLevelEncoder'
+      stacktrace-key: 'stacktrace'
+      log-in-console: true
+
+    # redis configuration
+    redis:
+      db: 0
+      addr: '127.0.0.1:6379'
+      password: ''
+
+    # email configuration
+    email:
+      to: 'xxx@qq.com'
+      port: 465
+      from: 'xxx@163.com'
+      host: 'smtp.163.com'
+      is-ssl: true
+      secret: 'xxx'
+      nickname: 'test'
+
+    # casbin configuration
+    casbin:
+      model-path: './resource/rbac_model.conf'
+
+    # system configuration
+    system:
+      env: 'develop'  # Change to "develop" to skip authentication for development mode
+      addr: 8888
+      db-type: 'mysql'
+      oss-type: 'local'    # 控制oss选择走本期还是 七牛等其他仓 自行增加其他oss仓可以在 server/utils/upload/upload.go 中 NewOss函数配置
+      use-multipoint: false
+
+    # captcha configuration
+    captcha:
+      key-long: 6
+      img-width: 240
+      img-height: 80
+
+    # mysql connect configuration
+    # 未初始化之前请勿手动修改数据库信息！！！如果一定要手动初始化请看（https://www.github.com/flipped-aurora/gin-vue-admin/server.com/docs/first）
+    mysql:
+      path: ''
+      config: ''
+      db-name: ''
+      username: ''
+      password: ''
+      max-idle-conns: 10
+      max-open-conns: 100
+      log-mode: false
+      log-zap: ""
+
+    # local configuration
+    local:
+      path: 'uploads/file'
+
+    # autocode configuration
+    autocode:
+      transfer-restart: true
+      root: ""
+      server: /server
+      server-api: /api/v1/autocode
+      server-initialize: /initialize
+      server-model: /model/autocode
+      server-request: /model/autocode/request/
+      server-router: /router/autocode
+      server-service: /service/autocode
+      web: /web/src
+      web-api: /api
+      web-flow: /view
+      web-form: /view
+      web-table: /view
+
+    # qiniu configuration (请自行七牛申请对应的 公钥 私钥 bucket 和 域名地址)
+    qiniu:
+      zone: 'ZoneHuaDong'
+      bucket: ''
+      img-path: ''
+      use-https: false
+      access-key: ''
+      secret-key: ''
+      use-cdn-domains: false
+
+
+    # aliyun oss configuration
+    aliyun-oss:
+      endpoint: 'yourEndpoint'
+      access-key-id: 'yourAccessKeyId'
+      access-key-secret: 'yourAccessKeySecret'
+      bucket-name: 'yourBucketName'
+      bucket-url: 'yourBucketUrl'
+      base-path: 'yourBasePath'
+
+    # tencent cos configuration
+    tencent-cos:
+      bucket: 'xxxxx-10005608'
+      region: 'ap-shanghai'
+      secret-id: 'xxxxxxxx'
+      secret-key: 'xxxxxxxx'
+      base-url: 'https://gin.vue.admin'
+      path-prefix: 'github.com/flipped-aurora/gin-vue-admin/server'
+
+    # excel configuration
+    excel:
+      dir: './resource/excel/'
+
+
+    # timer task db clear table
+    Timer:
+      start: true
+      spec: "@daily"  # 定时任务详细配置参考 https://pkg.go.dev/github.com/robfig/cron/v3
+      detail: [
+        # tableName: 需要清理的表名
+        # compareField: 需要比较时间的字段
+        # interval: 时间间隔, 具体配置详看 time.ParseDuration() 中字符串表示 且不能为负数
+        # 2160h = 24 * 30 * 3 -> 三个月
+        { tableName: "sys_operation_records" , compareField: "created_at", interval: "2160h" },
+        { tableName: "jwt_blacklists" , compareField: "created_at", interval: "168h" }
+        #{ tableName: "log2" , compareField: "created_at", interval: "2160h" }
+      ]

deployment/server/gva-server-deployment.yaml

@@ -0,0 +1,68 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: gva-server
+  annotations:
+    flipped-aurora/gin-vue-admin: backend
+    github: "https://github.com/flipped-aurora/gin-vue-admin.git"
+    app.kubernetes.io/version: 0.0.1
+  labels:
+    app: gva-server
+    version: gva-vue3
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: gva-server
+      version: gva-vue3
+  template:
+    metadata:
+      labels:
+        app: gva-server
+        version: gva-vue3
+    spec:
+      containers:
+        - name: gin-vue-admin-container
+          image: registry.cn-hangzhou.aliyuncs.com/gin-vue-admin/server:40fc3aa6
+          imagePullPolicy: IfNotPresent
+          ports:
+            - containerPort: 8888
+              name: http
+          volumeMounts:
+            - mountPath: /go/src/github.com/flipped-aurora/gin-vue-admin/server/config.yaml
+              name: config
+              subPath: config.yaml
+            - mountPath: /etc/localtime
+              name: localtime
+          resources:
+            limits:
+              cpu: 1000m
+              memory: 2000Mi
+            requests:
+              cpu: 100m
+              memory: 200Mi
+#          readinessProbe:
+#            httpGet:
+#              path: /ready
+#              port: http
+#            initialDelaySeconds: 20
+#            periodSeconds: 10
+#            successThreshold: 1
+#            failureThreshold: 3
+#          livenessProbe:
+#            httpGet:
+#              path: /health
+#              port: http
+#            initialDelaySeconds: 20
+#            periodSeconds: 10
+#            successThreshold: 1
+#            failureThreshold: 3
+      #imagePullSecrets:
+      #  - name: docker-registry
+      volumes:
+        - name: localtime
+          hostPath:
+            path: /etc/localtime
+        - name: config
+          configMap:
+            name: config.yaml

deployment/server/gva-server-service.yaml

@@ -0,0 +1,21 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: gva-server
+  annotations:
+    flipped-aurora/gin-vue-admin: backend
+    github: "https://github.com/flipped-aurora/gin-vue-admin.git"
+    app.kubernetes.io/version: 0.0.1
+  labels:
+    app: gva-server
+    version: gva-vue3
+spec:
+  selector:
+    app: gva-server
+    version: gva-vue3
+  ports:
+    - port: 8888
+      name: http
+      targetPort: 8888
+  type: ClusterIP
+#  type: NodePort

deployment/web/gva-web-configmap.yaml

@@ -0,0 +1,32 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: my.conf
+data:
+  my.conf: |
+    server {
+        listen       8080;
+        server_name localhost;
+
+        #charset koi8-r;
+        #access_log  logs/host.access.log  main;
+
+        location / {
+            root /usr/share/nginx/html;
+            add_header Cache-Control 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0';
+            try_files $uri $uri/ /index.html;
+        }
+
+        location /api {
+            proxy_set_header Host $http_host;
+            proxy_set_header  X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            rewrite ^/api/(.*)$ /$1 break;         #重写
+            proxy_pass http://gva-server:8888;     # 设置代理服务器的协议和地址
+         }
+
+        location /api/swagger/index.html {
+            proxy_pass http://gva-server:8888/swagger/index.html;
+         }
+     }

deployment/web/gva-web-deploymemt.yaml

@@ -0,0 +1,51 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: gva-web
+  annotations:
+    flipped-aurora/gin-vue-admin: ui
+    github: "https://github.com/flipped-aurora/gin-vue-admin.git"
+    app.kubernetes.io/version: 0.0.1
+  labels:
+    app: gva-web
+    version: gva-vue3
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: gva-web
+      version: gva-vue3
+  template:
+    metadata:
+      labels:
+        app: gva-web
+        version: gva-vue3
+    spec:
+      containers:
+        - name: gin-vue-admin-nginx-container
+          image: registry.cn-hangzhou.aliyuncs.com/gin-vue-admin/web:40fc3aa6
+          imagePullPolicy: IfNotPresent
+          ports:
+            - containerPort: 8080
+              name: http
+          readinessProbe:
+            tcpSocket:
+              port: 8080
+            initialDelaySeconds: 10
+            periodSeconds: 10
+            successThreshold: 1
+            failureThreshold: 3
+          resources:
+            limits:
+              cpu: 500m
+              memory: 1000Mi
+            requests:
+              cpu: 100m
+              memory: 100Mi
+          volumeMounts:
+            - mountPath: /etc/nginx/conf.d/
+              name: nginx-config
+      volumes:
+        - name: nginx-config
+          configMap:
+            name: my.conf

deployment/web/gva-web-service.yaml

@@ -0,0 +1,21 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: gva-web
+  annotations:
+    flipped-aurora/gin-vue-admin: ui
+    github: "https://github.com/flipped-aurora/gin-vue-admin.git"
+    app.kubernetes.io/version: 0.0.1
+  labels:
+    app: gva-web
+    version: gva-vue3
+spec:
+  type: NodePort
+#  type: ClusterIP
+  ports:
+    - name: http
+      port: 8080
+      targetPort: 8080
+  selector:
+    app: gva-web
+    version: gva-vue3

docker-compose-dev.yaml

@@ -0,0 +1,85 @@
+version: "3"
+
+# 声明一个名为network的networks,subnet为network的子网地址,默认网关是177.7.0.1
+networks:
+  network:
+    ipam:
+      driver: default
+      config:
+        - subnet: '177.7.0.0/16'
+        
+# 设置mysql，redis持久化保存
+volumes:
+  mysql:
+  redis:
+
+services:
+  web:
+    image: node:16
+    container_name: gva-web
+    hostname: gva-web           #可以通过容器名访问
+    restart: always
+    ports:
+      - '8080:8080'
+    depends_on:
+      - server
+    working_dir: /web       # 如果docker 设置了workdir 则此处不需要设置
+    #若网络不太好，请自行换源，如下
+    #command: bash -c "yarn config set registry https://registry.npm.taobao.org --global && yarn install && yarn serve"
+    command: bash -c "yarn install && yarn serve"
+    volumes:
+      - ./web:/web
+    networks:
+      network:
+        ipv4_address: 177.7.0.11
+
+  server:
+    image: golang:1.16
+    container_name: gva-server
+    hostname: gva-server
+    restart: always
+    ports:
+      - '8888:8888'
+    depends_on:
+      - mysql
+      - redis
+    volumes:
+      - ./server:/server
+    working_dir: /server    # 如果docker 设置了workdir 则此处不需要设置 
+    command: bash -c "go env -w GOPROXY=https://goproxy.cn,direct && go mod tidy && go run main.go"
+    links:
+      - mysql
+      - redis
+    networks:
+      network:
+        ipv4_address: 177.7.0.12
+
+  mysql:
+    image: mysql:8.0.21    # 如果您是 arm64 架构：如 MacOS 的 M1，请修改镜像为 image: mysql/mysql-server:8.0.21
+    container_name: gva-mysql
+    hostname: gva-mysql
+    command: mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci #设置utf8字符集
+    restart: always
+    ports:
+      - "13306:3306"  # host物理直接映射端口为13306
+    environment:
+      MYSQL_DATABASE: 'qmPlus' # 初始化启动时要创建的数据库的名称
+      MYSQL_ROOT_PASSWORD: 'Aa@6447985' # root管理员用户密码
+    volumes:
+      - mysql:/var/lib/mysql
+    networks:
+      network:
+        ipv4_address: 177.7.0.13
+
+  redis:
+    image: redis:6.0.6
+    container_name: gva-redis # 容器名
+    hostname: gva-redis
+    restart: always
+    ports:
+      - '16379:6379'
+    volumes:
+      - redis:/data
+    networks:
+      network:
+        ipv4_address: 177.7.0.14

docker-compose.yaml

@@ -1,12 +1,18 @@
 version: "3"
 
+# 声明一个名为network的networks,subnet为network的子网地址,默认网关是177.7.0.1
 networks:
   network:
     ipam:
       driver: default
       config:
         - subnet: '177.7.0.0/16'
-
+        
+# 设置mysql，redis持久化保存
+volumes:
+  mysql:
+  redis:
+  
 services:
   web:
     build:
@@ -42,7 +48,7 @@ services:
         ipv4_address: 177.7.0.12
 
   mysql:
-    image: mysql:8.0.21
+    image: mysql:8.0.21       # 如果您是 arm64 架构：如 MacOS 的 M1，请修改镜像为 image: mysql/mysql-server:8.0.21
     container_name: gva-mysql
     command: mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci #设置utf8字符集
     restart: always
@@ -51,6 +57,8 @@ services:
     environment:
       MYSQL_DATABASE: 'qmPlus' # 初始化启动时要创建的数据库的名称
       MYSQL_ROOT_PASSWORD: 'Aa@6447985' # root管理员用户密码
+    volumes:
+      - mysql:/var/lib/mysql
     networks:
       network:
         ipv4_address: 177.7.0.13
@@ -61,6 +69,8 @@ services:
     restart: always
     ports:
       - '16379:6379'
+    volumes:
+      - redis:/data
     networks:
       network:
-        ipv4_address: 177.7.0.14
+        ipv4_address: 177.7.0.14

entrypoint.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+if [ ! -d "/var/lib/mysql/gva" ]; then
+    mysqld --initialize-insecure --user=mysql --datadir=/var/lib/mysql
+    mysqld --daemonize --user=mysql
+    sleep 5s
+    mysql -uroot -e "create database gva default charset 'utf8' collate 'utf8_bin'; grant all on gva.* to 'root'@'127.0.0.1' identified by '123456'; flush privileges;"
+else
+    mysqld --daemonize --user=mysql
+fi
+redis-server &
+if [ "$1" = "actions" ]; then
+    cd /opt/gva/server && go run main.go &
+    cd /opt/gva/web/ && yarn serve &
+else 
+    /usr/sbin/nginx &
+    cd /usr/share/nginx/html/ && ./server &
+fi
+echo "gva ALL start!!!"
+tail -f /dev/null

gin-vue-admin.code-workspace

@@ -0,0 +1,49 @@
+{
+  "folders": [
+    {
+      "path": "server",
+      "name": "backend"
+    },
+    {
+      "path": "web",
+      "name": "frontend"
+    },
+    {
+      "path": ".",
+      "name": "root"
+    }
+  ],
+  "settings": {
+    "go.toolsEnvVars": {
+      "GOPROXY": "https://goproxy.cn,direct",
+      "GONOPROXY": "none;"
+    }
+  },
+  "launch": {
+    "version": "0.2.0",
+    "configurations": [
+      {
+        "type": "go",
+        "request": "launch",
+        "name": "Backend",
+        "cwd": "${workspaceFolder:backend}",
+        "program": "${workspaceFolder:backend}/main.go"
+      },
+      {
+        "type": "node",
+        "request": "launch",
+        "cwd": "${workspaceFolder:frontend}",
+        "name": "Frontend",
+        "runtimeExecutable": "npm",
+        "runtimeArgs": ["run-script", "serve"]
+      }
+    ],
+    "compounds": [
+      {
+        "name": "Both (Backend & Frontend)",
+        "configurations": ["Backend", "Frontend"],
+        "stopAll": true
+      }
+    ]
+  }
+}

package-lock.json

@@ -1,6 +0,0 @@
-{
-  "name": "gin-vue-admin",
-  "lockfileVersion": 2,
-  "requires": true,
-  "packages": {}
-}

package.json

@@ -1 +0,0 @@
-{}

server/Dockerfile

@@ -1,17 +1,24 @@
-FROM golang:alpine
+FROM golang:alpine as builder
 
-WORKDIR /go/src/gin-vue-admin
+WORKDIR /go/src/github.com/flipped-aurora/gin-vue-admin/server
 COPY . .
 
-RUN go generate && go env && go build -o server .
+RUN go env -w GO111MODULE=on \
+    && go env -w GOPROXY=https://goproxy.cn,direct \
+    && go env -w CGO_ENABLED=0 \
+    && go env \
+    && go mod tidy \
+    && go build -o server .
 
 FROM alpine:latest
+
 LABEL MAINTAINER="SliverHorn@sliver_horn@qq.com"
 
-WORKDIR /go/src/gin-vue-admin
+WORKDIR /go/src/github.com/flipped-aurora/gin-vue-admin/server
 
-COPY --from=0 /go/src/gin-vue-admin ./
+COPY --from=0 /go/src/github.com/flipped-aurora/gin-vue-admin/server/server ./
+COPY --from=0 /go/src/github.com/flipped-aurora/gin-vue-admin/server/resource ./resource/
+COPY --from=0 /go/src/github.com/flipped-aurora/gin-vue-admin/server/config.docker.yaml ./
 
 EXPOSE 8888
-
 ENTRYPOINT ./server -c config.docker.yaml

server/api/v1/enter.go

@@ -0,0 +1,13 @@
+package v1
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/api/v1/example"
+	"github.com/flipped-aurora/gin-vue-admin/server/api/v1/system"
+)
+
+type ApiGroup struct {
+	SystemApiGroup   system.ApiGroup
+	ExampleApiGroup  example.ApiGroup
+}
+
+var ApiGroupApp = new(ApiGroup)

server/api/v1/exa_breakpoint_continue.go

@@ -1,129 +0,0 @@
-package v1
-
-import (
-	"gin-vue-admin/global"
-	"gin-vue-admin/model/response"
-	"gin-vue-admin/service"
-	"gin-vue-admin/utils"
-	"github.com/gin-gonic/gin"
-	"go.uber.org/zap"
-	"io/ioutil"
-	"strconv"
-)
-
-// @Tags ExaFileUploadAndDownload
-// @Summary 断点续传到服务器
-// @Security ApiKeyAuth
-// @accept multipart/form-data
-// @Produce  application/json
-// @Param file formData file true "an example for breakpoint resume, 断点续传示例"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"切片创建成功"}"
-// @Router /fileUploadAndDownload/breakpointContinue [post]
-func BreakpointContinue(c *gin.Context) {
-	fileMd5 := c.Request.FormValue("fileMd5")
-	fileName := c.Request.FormValue("fileName")
-	chunkMd5 := c.Request.FormValue("chunkMd5")
-	chunkNumber, _ := strconv.Atoi(c.Request.FormValue("chunkNumber"))
-	chunkTotal, _ := strconv.Atoi(c.Request.FormValue("chunkTotal"))
-	_, FileHeader, err := c.Request.FormFile("file")
-	if err != nil {
-		global.GVA_LOG.Error("接收文件失败!", zap.Any("err", err))
-		response.FailWithMessage("接收文件失败", c)
-		return
-	}
-	f, err := FileHeader.Open()
-	if err != nil {
-		global.GVA_LOG.Error("文件读取失败!", zap.Any("err", err))
-		response.FailWithMessage("文件读取失败", c)
-		return
-	}
-	defer f.Close()
-	cen, _ := ioutil.ReadAll(f)
-	if !utils.CheckMd5(cen, chunkMd5) {
-		global.GVA_LOG.Error("检查md5失败!", zap.Any("err", err))
-		response.FailWithMessage("检查md5失败", c)
-		return
-	}
-	err, file := service.FindOrCreateFile(fileMd5, fileName, chunkTotal)
-	if err != nil {
-		global.GVA_LOG.Error("查找或创建记录失败!", zap.Any("err", err))
-		response.FailWithMessage("查找或创建记录失败", c)
-		return
-	}
-	err, pathc := utils.BreakPointContinue(cen, fileName, chunkNumber, chunkTotal, fileMd5)
-	if err != nil {
-		global.GVA_LOG.Error("断点续传失败!", zap.Any("err", err))
-		response.FailWithMessage("断点续传失败", c)
-		return
-	}
-
-	if err = service.CreateFileChunk(file.ID, pathc, chunkNumber); err != nil {
-		global.GVA_LOG.Error("创建文件记录失败!", zap.Any("err", err))
-		response.FailWithMessage("创建文件记录失败", c)
-		return
-	}
-	response.OkWithMessage("切片创建成功", c)
-}
-
-// @Tags ExaFileUploadAndDownload
-// @Summary 查找文件
-// @Security ApiKeyAuth
-// @accept multipart/form-data
-// @Produce  application/json
-// @Param file formData file true "Find the file, 查找文件"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"查找成功"}"
-// @Router /fileUploadAndDownload/findFile [post]
-func FindFile(c *gin.Context) {
-	fileMd5 := c.Query("fileMd5")
-	fileName := c.Query("fileName")
-	chunkTotal, _ := strconv.Atoi(c.Query("chunkTotal"))
-	err, file := service.FindOrCreateFile(fileMd5, fileName, chunkTotal)
-	if err != nil {
-		global.GVA_LOG.Error("查找失败!", zap.Any("err", err))
-		response.FailWithMessage("查找失败", c)
-	} else {
-		response.OkWithDetailed(response.FileResponse{File: file}, "查找成功", c)
-	}
-}
-
-// @Tags ExaFileUploadAndDownload
-// @Summary 创建文件
-// @Security ApiKeyAuth
-// @accept multipart/form-data
-// @Produce  application/json
-// @Param file formData file true "上传文件完成"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"file uploaded, 文件创建成功"}"
-// @Router /fileUploadAndDownload/findFile [post]
-func BreakpointContinueFinish(c *gin.Context) {
-	fileMd5 := c.Query("fileMd5")
-	fileName := c.Query("fileName")
-	err, filePath := utils.MakeFile(fileName, fileMd5)
-	if err != nil {
-		global.GVA_LOG.Error("文件创建失败!", zap.Any("err", err))
-		response.FailWithDetailed(response.FilePathResponse{FilePath: filePath}, "文件创建失败", c)
-	} else {
-		response.OkWithDetailed(response.FilePathResponse{FilePath: filePath}, "文件创建成功", c)
-	}
-}
-
-// @Tags ExaFileUploadAndDownload
-// @Summary 删除切片
-// @Security ApiKeyAuth
-// @accept multipart/form-data
-// @Produce  application/json
-// @Param file formData file true "删除缓存切片"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"缓存切片删除成功"}"
-// @Router /fileUploadAndDownload/removeChunk [post]
-func RemoveChunk(c *gin.Context) {
-	fileMd5 := c.Query("fileMd5")
-	fileName := c.Query("fileName")
-	filePath := c.Query("filePath")
-	err := utils.RemoveChunk(fileMd5)
-	err = service.DeleteFileChunk(fileMd5, fileName, filePath)
-	if err != nil {
-		global.GVA_LOG.Error("缓存切片删除失败!", zap.Any("err", err))
-		response.FailWithDetailed(response.FilePathResponse{FilePath: filePath}, "缓存切片删除失败", c)
-	} else {
-		response.OkWithDetailed(response.FilePathResponse{FilePath: filePath}, "缓存切片删除成功", c)
-	}
-}

server/api/v1/exa_customer.go

@@ -1,140 +0,0 @@
-package v1
-
-import (
-	"gin-vue-admin/global"
-	"gin-vue-admin/model"
-	"gin-vue-admin/model/request"
-	"gin-vue-admin/model/response"
-	"gin-vue-admin/service"
-	"gin-vue-admin/utils"
-	"github.com/gin-gonic/gin"
-	"go.uber.org/zap"
-)
-
-// @Tags ExaCustomer
-// @Summary 创建客户
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body model.ExaCustomer true "客户用户名, 客户手机号码"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"创建成功"}"
-// @Router /customer/customer [post]
-func CreateExaCustomer(c *gin.Context) {
-	var customer model.ExaCustomer
-	_ = c.ShouldBindJSON(&customer)
-	if err := utils.Verify(customer, utils.CustomerVerify); err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	customer.SysUserID = getUserID(c)
-	customer.SysUserAuthorityID = getUserAuthorityId(c)
-	if err := service.CreateExaCustomer(customer); err != nil {
-		global.GVA_LOG.Error("创建失败!", zap.Any("err", err))
-		response.FailWithMessage("创建失败", c)
-	} else {
-		response.OkWithMessage("创建成功", c)
-	}
-}
-
-// @Tags ExaCustomer
-// @Summary 删除客户
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body model.ExaCustomer true "客户ID"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
-// @Router /customer/customer [delete]
-func DeleteExaCustomer(c *gin.Context) {
-	var customer model.ExaCustomer
-	_ = c.ShouldBindJSON(&customer)
-	if err := utils.Verify(customer.GVA_MODEL, utils.IdVerify); err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	if err := service.DeleteExaCustomer(customer); err != nil {
-		global.GVA_LOG.Error("删除失败!", zap.Any("err", err))
-		response.FailWithMessage("删除失败", c)
-	} else {
-		response.OkWithMessage("删除成功", c)
-	}
-}
-
-// @Tags ExaCustomer
-// @Summary 更新客户信息
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body model.ExaCustomer true "客户ID, 客户信息"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"更新成功"}"
-// @Router /customer/customer [put]
-func UpdateExaCustomer(c *gin.Context) {
-	var customer model.ExaCustomer
-	_ = c.ShouldBindJSON(&customer)
-	if err := utils.Verify(customer.GVA_MODEL, utils.IdVerify); err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	if err := utils.Verify(customer, utils.CustomerVerify); err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	if err := service.UpdateExaCustomer(&customer); err != nil {
-		global.GVA_LOG.Error("更新失败!", zap.Any("err", err))
-		response.FailWithMessage("更新失败", c)
-	} else {
-		response.OkWithMessage("更新成功", c)
-	}
-}
-
-// @Tags ExaCustomer
-// @Summary 获取单一客户信息
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body model.ExaCustomer true "客户ID"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
-// @Router /customer/customer [get]
-func GetExaCustomer(c *gin.Context) {
-	var customer model.ExaCustomer
-	_ = c.ShouldBindQuery(&customer)
-	if err := utils.Verify(customer.GVA_MODEL, utils.IdVerify); err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	err, data := service.GetExaCustomer(customer.ID)
-	if err != nil {
-		global.GVA_LOG.Error("获取失败!", zap.Any("err", err))
-		response.FailWithMessage("获取失败", c)
-	} else {
-		response.OkWithDetailed(response.ExaCustomerResponse{Customer: data}, "获取成功", c)
-	}
-}
-
-// @Tags ExaCustomer
-// @Summary 分页获取权限客户列表
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body request.PageInfo true "页码, 每页大小"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
-// @Router /customer/customerList [get]
-func GetExaCustomerList(c *gin.Context) {
-	var pageInfo request.PageInfo
-	_ = c.ShouldBindQuery(&pageInfo)
-	if err := utils.Verify(pageInfo, utils.PageInfoVerify); err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	err, customerList, total := service.GetCustomerInfoList(getUserAuthorityId(c), pageInfo)
-	if err != nil {
-		global.GVA_LOG.Error("获取失败!", zap.Any("err", err))
-		response.FailWithMessage("获取失败"+err.Error(), c)
-	} else {
-		response.OkWithDetailed(response.PageResult{
-			List:     customerList,
-			Total:    total,
-			Page:     pageInfo.Page,
-			PageSize: pageInfo.PageSize,
-		}, "获取成功", c)
-	}
-}

server/api/v1/exa_file_upload_download.go

@@ -1,80 +0,0 @@
-package v1
-
-import (
-	"gin-vue-admin/global"
-	"gin-vue-admin/model"
-	"gin-vue-admin/model/request"
-	"gin-vue-admin/model/response"
-	"gin-vue-admin/service"
-	"github.com/gin-gonic/gin"
-	"go.uber.org/zap"
-)
-
-// @Tags ExaFileUploadAndDownload
-// @Summary 上传文件示例
-// @Security ApiKeyAuth
-// @accept multipart/form-data
-// @Produce  application/json
-// @Param file formData file true "上传文件示例"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"上传成功"}"
-// @Router /fileUploadAndDownload/upload [post]
-func UploadFile(c *gin.Context) {
-	var file model.ExaFileUploadAndDownload
-	noSave := c.DefaultQuery("noSave", "0")
-	_, header, err := c.Request.FormFile("file")
-	if err != nil {
-		global.GVA_LOG.Error("接收文件失败!", zap.Any("err", err))
-		response.FailWithMessage("接收文件失败", c)
-		return
-	}
-	err, file = service.UploadFile(header, noSave) // 文件上传后拿到文件路径
-	if err != nil {
-		global.GVA_LOG.Error("修改数据库链接失败!", zap.Any("err", err))
-		response.FailWithMessage("修改数据库链接失败", c)
-		return
-	}
-	response.OkWithDetailed(response.ExaFileResponse{File: file}, "上传成功", c)
-}
-
-// @Tags ExaFileUploadAndDownload
-// @Summary 删除文件
-// @Security ApiKeyAuth
-// @Produce  application/json
-// @Param data body model.ExaFileUploadAndDownload true "传入文件里面id即可"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
-// @Router /fileUploadAndDownload/deleteFile [post]
-func DeleteFile(c *gin.Context) {
-	var file model.ExaFileUploadAndDownload
-	_ = c.ShouldBindJSON(&file)
-	if err := service.DeleteFile(file); err != nil {
-		global.GVA_LOG.Error("删除失败!", zap.Any("err", err))
-		response.FailWithMessage("删除失败", c)
-		return
-	}
-	response.OkWithMessage("删除成功", c)
-}
-
-// @Tags ExaFileUploadAndDownload
-// @Summary 分页文件列表
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body request.PageInfo true "页码, 每页大小"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
-// @Router /fileUploadAndDownload/getFileList [post]
-func GetFileList(c *gin.Context) {
-	var pageInfo request.PageInfo
-	_ = c.ShouldBindJSON(&pageInfo)
-	err, list, total := service.GetFileRecordInfoList(pageInfo)
-	if err != nil {
-		global.GVA_LOG.Error("获取失败!", zap.Any("err", err))
-		response.FailWithMessage("获取失败", c)
-	} else {
-		response.OkWithDetailed(response.PageResult{
-			List:     list,
-			Total:    total,
-			Page:     pageInfo.Page,
-			PageSize: pageInfo.PageSize,
-		}, "获取成功", c)
-	}
-}

server/api/v1/exa_simple_uploader.go

@@ -1,93 +0,0 @@
-package v1
-
-import (
-	"gin-vue-admin/global"
-	"gin-vue-admin/model"
-	"gin-vue-admin/model/response"
-	"gin-vue-admin/service"
-	"gin-vue-admin/utils"
-	"github.com/gin-gonic/gin"
-	"go.uber.org/zap"
-)
-
-// @Tags SimpleUploader
-// @Summary 断点续传插件版示例
-// @Security ApiKeyAuth
-// @accept multipart/form-data
-// @Produce  application/json
-// @Param file formData file true "断点续传插件版示例"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"切片创建成功"}"
-// @Router /simpleUploader/upload [post]
-func SimpleUploaderUpload(c *gin.Context) {
-	var chunk model.ExaSimpleUploader
-	_, header, err := c.Request.FormFile("file")
-	chunk.Filename = c.PostForm("filename")
-	chunk.ChunkNumber = c.PostForm("chunkNumber")
-	chunk.CurrentChunkSize = c.PostForm("currentChunkSize")
-	chunk.Identifier = c.PostForm("identifier")
-	chunk.TotalSize = c.PostForm("totalSize")
-	chunk.TotalChunks = c.PostForm("totalChunks")
-	var chunkDir = "./chunk/" + chunk.Identifier + "/"
-	hasDir, _ := utils.PathExists(chunkDir)
-	if !hasDir {
-		if err := utils.CreateDir(chunkDir); err != nil {
-			global.GVA_LOG.Error("创建目录失败!", zap.Any("err", err))
-		}
-	}
-	chunkPath := chunkDir + chunk.Filename + chunk.ChunkNumber
-	err = c.SaveUploadedFile(header, chunkPath)
-	if err != nil {
-		global.GVA_LOG.Error("切片创建失败!", zap.Any("err", err))
-		response.FailWithMessage("切片创建失败", c)
-		return
-	}
-	chunk.CurrentChunkPath = chunkPath
-	err = service.SaveChunk(chunk)
-	if err != nil {
-		global.GVA_LOG.Error("切片创建失败!", zap.Any("err", err))
-		response.FailWithMessage("切片创建失败", c)
-		return
-	} else {
-		response.OkWithMessage("切片创建成功", c)
-	}
-}
-
-// @Tags SimpleUploader
-// @Summary 断点续传插件版示例
-// @Security ApiKeyAuth
-// @Produce  application/json
-// @Param md5 query string true "md5"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
-// @Router /simpleUploader/checkFileMd5 [get]
-func CheckFileMd5(c *gin.Context) {
-	md5 := c.Query("md5")
-	err, chunks, isDone := service.CheckFileMd5(md5)
-	if err != nil {
-		global.GVA_LOG.Error("md5读取失败!", zap.Any("err", err))
-		response.FailWithMessage("md5读取失败", c)
-	} else {
-		response.OkWithDetailed(gin.H{
-			"chunks": chunks,
-			"isDone": isDone,
-		}, "查询成功", c)
-	}
-}
-
-// @Tags SimpleUploader
-// @Summary 合并文件
-// @Security ApiKeyAuth
-// @Produce  application/json
-// @Param md5 query string true "md5"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"合并成功"}"
-// @Router /simpleUploader/mergeFileMd5 [get]
-func MergeFileMd5(c *gin.Context) {
-	md5 := c.Query("md5")
-	fileName := c.Query("fileName")
-	err := service.MergeFileMd5(md5, fileName)
-	if err != nil {
-		global.GVA_LOG.Error("md5读取失败!", zap.Any("err", err))
-		response.FailWithMessage("md5读取失败", c)
-	} else {
-		response.OkWithMessage("合并成功", c)
-	}
-}

server/api/v1/example/enter.go

@@ -0,0 +1,15 @@
+package example
+
+import "github.com/flipped-aurora/gin-vue-admin/server/service"
+
+type ApiGroup struct {
+	ExcelApi
+	CustomerApi
+	FileUploadAndDownloadApi
+}
+
+var (
+	excelService                 = service.ServiceGroupApp.ExampleServiceGroup.ExcelService
+	customerService              = service.ServiceGroupApp.ExampleServiceGroup.CustomerService
+	fileUploadAndDownloadService = service.ServiceGroupApp.ExampleServiceGroup.FileUploadAndDownloadService
+)

server/api/v1/example/exa_breakpoint_continue.go

@@ -0,0 +1,142 @@
+package example
+
+import (
+	"fmt"
+	"io/ioutil"
+	"mime/multipart"
+	"strconv"
+
+	"github.com/flipped-aurora/gin-vue-admin/server/model/example"
+
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
+	exampleRes "github.com/flipped-aurora/gin-vue-admin/server/model/example/response"
+	"github.com/flipped-aurora/gin-vue-admin/server/utils"
+	"github.com/gin-gonic/gin"
+	"go.uber.org/zap"
+)
+
+// @Tags ExaFileUploadAndDownload
+// @Summary 断点续传到服务器
+// @Security ApiKeyAuth
+// @accept multipart/form-data
+// @Produce  application/json
+// @Param file formData file true "an example for breakpoint resume, 断点续传示例"
+// @Success 200 {object} response.Response{msg=string} "断点续传到服务器"
+// @Router /fileUploadAndDownload/breakpointContinue [post]
+func (b *FileUploadAndDownloadApi) BreakpointContinue(c *gin.Context) {
+	fileMd5 := c.Request.FormValue("fileMd5")
+	fileName := c.Request.FormValue("fileName")
+	chunkMd5 := c.Request.FormValue("chunkMd5")
+	chunkNumber, _ := strconv.Atoi(c.Request.FormValue("chunkNumber"))
+	chunkTotal, _ := strconv.Atoi(c.Request.FormValue("chunkTotal"))
+	_, FileHeader, err := c.Request.FormFile("file")
+	if err != nil {
+		global.GVA_LOG.Error("接收文件失败!", zap.Error(err))
+		response.FailWithMessage("接收文件失败", c)
+		return
+	}
+	f, err := FileHeader.Open()
+	if err != nil {
+		global.GVA_LOG.Error("文件读取失败!", zap.Error(err))
+		response.FailWithMessage("文件读取失败", c)
+		return
+	}
+	defer func(f multipart.File) {
+		err := f.Close()
+		if err != nil {
+			fmt.Println(err)
+		}
+	}(f)
+	cen, _ := ioutil.ReadAll(f)
+	if !utils.CheckMd5(cen, chunkMd5) {
+		global.GVA_LOG.Error("检查md5失败!", zap.Error(err))
+		response.FailWithMessage("检查md5失败", c)
+		return
+	}
+	file, err := fileUploadAndDownloadService.FindOrCreateFile(fileMd5, fileName, chunkTotal)
+	if err != nil {
+		global.GVA_LOG.Error("查找或创建记录失败!", zap.Error(err))
+		response.FailWithMessage("查找或创建记录失败", c)
+		return
+	}
+	pathC, err := utils.BreakPointContinue(cen, fileName, chunkNumber, chunkTotal, fileMd5)
+	if err != nil {
+		global.GVA_LOG.Error("断点续传失败!", zap.Error(err))
+		response.FailWithMessage("断点续传失败", c)
+		return
+	}
+
+	if err = fileUploadAndDownloadService.CreateFileChunk(file.ID, pathC, chunkNumber); err != nil {
+		global.GVA_LOG.Error("创建文件记录失败!", zap.Error(err))
+		response.FailWithMessage("创建文件记录失败", c)
+		return
+	}
+	response.OkWithMessage("切片创建成功", c)
+}
+
+// @Tags ExaFileUploadAndDownload
+// @Summary 查找文件
+// @Security ApiKeyAuth
+// @accept multipart/form-data
+// @Produce  application/json
+// @Param file formData file true "Find the file, 查找文件"
+// @Success 200 {object} response.Response{data=exampleRes.FileResponse,msg=string} "查找文件,返回包括文件详情"
+// @Router /fileUploadAndDownload/findFile [post]
+func (b *FileUploadAndDownloadApi) FindFile(c *gin.Context) {
+	fileMd5 := c.Query("fileMd5")
+	fileName := c.Query("fileName")
+	chunkTotal, _ := strconv.Atoi(c.Query("chunkTotal"))
+	file, err := fileUploadAndDownloadService.FindOrCreateFile(fileMd5, fileName, chunkTotal)
+	if err != nil {
+		global.GVA_LOG.Error("查找失败!", zap.Error(err))
+		response.FailWithMessage("查找失败", c)
+	} else {
+		response.OkWithDetailed(exampleRes.FileResponse{File: file}, "查找成功", c)
+	}
+}
+
+// @Tags ExaFileUploadAndDownload
+// @Summary 创建文件
+// @Security ApiKeyAuth
+// @accept multipart/form-data
+// @Produce  application/json
+// @Param file formData file true "上传文件完成"
+// @Success 200 {object} response.Response{data=exampleRes.FilePathResponse,msg=string} "创建文件,返回包括文件路径"
+// @Router /fileUploadAndDownload/findFile [post]
+func (b *FileUploadAndDownloadApi) BreakpointContinueFinish(c *gin.Context) {
+	fileMd5 := c.Query("fileMd5")
+	fileName := c.Query("fileName")
+	filePath, err := utils.MakeFile(fileName, fileMd5)
+	if err != nil {
+		global.GVA_LOG.Error("文件创建失败!", zap.Error(err))
+		response.FailWithDetailed(exampleRes.FilePathResponse{FilePath: filePath}, "文件创建失败", c)
+	} else {
+		response.OkWithDetailed(exampleRes.FilePathResponse{FilePath: filePath}, "文件创建成功", c)
+	}
+}
+
+// @Tags ExaFileUploadAndDownload
+// @Summary 删除切片
+// @Security ApiKeyAuth
+// @accept multipart/form-data
+// @Produce  application/json
+// @Param file formData file true "删除缓存切片"
+// @Success 200 {object} response.Response{msg=string} "删除切片"
+// @Router /fileUploadAndDownload/removeChunk [post]
+func (b *FileUploadAndDownloadApi) RemoveChunk(c *gin.Context) {
+	var file example.ExaFile
+	_ = c.ShouldBindJSON(&file)
+	err := utils.RemoveChunk(file.FileMd5)
+	if err != nil {
+		global.GVA_LOG.Error("缓存切片删除失败!", zap.Error(err))
+		return
+	}
+	err = fileUploadAndDownloadService.DeleteFileChunk(file.FileMd5, file.FilePath)
+	if err != nil {
+		global.GVA_LOG.Error(err.Error(), zap.Error(err))
+		response.FailWithMessage(err.Error(), c)
+	} else {
+		response.OkWithMessage("缓存切片删除成功", c)
+	}
+}

server/api/v1/example/exa_customer.go

@@ -0,0 +1,142 @@
+package example
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/example"
+	exampleRes "github.com/flipped-aurora/gin-vue-admin/server/model/example/response"
+	"github.com/flipped-aurora/gin-vue-admin/server/utils"
+	"github.com/gin-gonic/gin"
+	"go.uber.org/zap"
+)
+
+type CustomerApi struct{}
+
+// @Tags ExaCustomer
+// @Summary 创建客户
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body example.ExaCustomer true "客户用户名, 客户手机号码"
+// @Success 200 {object} response.Response{msg=string} "创建客户"
+// @Router /customer/customer [post]
+func (e *CustomerApi) CreateExaCustomer(c *gin.Context) {
+	var customer example.ExaCustomer
+	_ = c.ShouldBindJSON(&customer)
+	if err := utils.Verify(customer, utils.CustomerVerify); err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	customer.SysUserID = utils.GetUserID(c)
+	customer.SysUserAuthorityID = utils.GetUserAuthorityId(c)
+	if err := customerService.CreateExaCustomer(customer); err != nil {
+		global.GVA_LOG.Error("创建失败!", zap.Error(err))
+		response.FailWithMessage("创建失败", c)
+	} else {
+		response.OkWithMessage("创建成功", c)
+	}
+}
+
+// @Tags ExaCustomer
+// @Summary 删除客户
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body example.ExaCustomer true "客户ID"
+// @Success 200 {object} response.Response{msg=string} "删除客户"
+// @Router /customer/customer [delete]
+func (e *CustomerApi) DeleteExaCustomer(c *gin.Context) {
+	var customer example.ExaCustomer
+	_ = c.ShouldBindJSON(&customer)
+	if err := utils.Verify(customer.GVA_MODEL, utils.IdVerify); err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	if err := customerService.DeleteExaCustomer(customer); err != nil {
+		global.GVA_LOG.Error("删除失败!", zap.Error(err))
+		response.FailWithMessage("删除失败", c)
+	} else {
+		response.OkWithMessage("删除成功", c)
+	}
+}
+
+// @Tags ExaCustomer
+// @Summary 更新客户信息
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body example.ExaCustomer true "客户ID, 客户信息"
+// @Success 200 {object} response.Response{msg=string} "更新客户信息"
+// @Router /customer/customer [put]
+func (e *CustomerApi) UpdateExaCustomer(c *gin.Context) {
+	var customer example.ExaCustomer
+	_ = c.ShouldBindJSON(&customer)
+	if err := utils.Verify(customer.GVA_MODEL, utils.IdVerify); err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	if err := utils.Verify(customer, utils.CustomerVerify); err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	if err := customerService.UpdateExaCustomer(&customer); err != nil {
+		global.GVA_LOG.Error("更新失败!", zap.Error(err))
+		response.FailWithMessage("更新失败", c)
+	} else {
+		response.OkWithMessage("更新成功", c)
+	}
+}
+
+// @Tags ExaCustomer
+// @Summary 获取单一客户信息
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data query example.ExaCustomer true "客户ID"
+// @Success 200 {object} response.Response{data=exampleRes.ExaCustomerResponse,msg=string} "获取单一客户信息,返回包括客户详情"
+// @Router /customer/customer [get]
+func (e *CustomerApi) GetExaCustomer(c *gin.Context) {
+	var customer example.ExaCustomer
+	_ = c.ShouldBindQuery(&customer)
+	if err := utils.Verify(customer.GVA_MODEL, utils.IdVerify); err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	data, err := customerService.GetExaCustomer(customer.ID)
+	if err != nil {
+		global.GVA_LOG.Error("获取失败!", zap.Error(err))
+		response.FailWithMessage("获取失败", c)
+	} else {
+		response.OkWithDetailed(exampleRes.ExaCustomerResponse{Customer: data}, "获取成功", c)
+	}
+}
+
+// @Tags ExaCustomer
+// @Summary 分页获取权限客户列表
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data query request.PageInfo true "页码, 每页大小"
+// @Success 200 {object} response.Response{data=response.PageResult,msg=string} "分页获取权限客户列表,返回包括列表,总数,页码,每页数量"
+// @Router /customer/customerList [get]
+func (e *CustomerApi) GetExaCustomerList(c *gin.Context) {
+	var pageInfo request.PageInfo
+	_ = c.ShouldBindQuery(&pageInfo)
+	if err := utils.Verify(pageInfo, utils.PageInfoVerify); err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	customerList, total, err := customerService.GetCustomerInfoList(utils.GetUserAuthorityId(c), pageInfo)
+	if err != nil {
+		global.GVA_LOG.Error("获取失败!", zap.Error(err))
+		response.FailWithMessage("获取失败"+err.Error(), c)
+	} else {
+		response.OkWithDetailed(response.PageResult{
+			List:     customerList,
+			Total:    total,
+			Page:     pageInfo.Page,
+			PageSize: pageInfo.PageSize,
+		}, "获取成功", c)
+	}
+}

server/api/v1/example/exa_excel.go

@@ -1,15 +1,17 @@
-package v1
+package example
 
 import (
-	"gin-vue-admin/global"
-	"gin-vue-admin/model"
-	"gin-vue-admin/model/response"
-	"gin-vue-admin/service"
-	"gin-vue-admin/utils"
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/example"
 	"github.com/gin-gonic/gin"
 	"go.uber.org/zap"
+	"os"
+	"strings"
 )
 
+type ExcelApi struct{}
+
 // /excel/importExcel 接口，与upload接口作用类似，只是把文件存到resource/excel目录下，用于导入Excel时存放Excel文件(ExcelImport.xlsx)
 // /excel/loadExcel接口，用于读取resource/excel目录下的文件((ExcelImport.xlsx)并加载为[]model.SysBaseMenu类型的示例数据
 // /excel/exportExcel 接口，用于读取前端传来的tableData，生成Excel文件并返回
@@ -20,16 +22,20 @@ import (
 // @Security ApiKeyAuth
 // @accept application/json
 // @Produce  application/octet-stream
-// @Param data body model.ExcelInfo true "导出Excel文件信息"
+// @Param data body example.ExcelInfo true "导出Excel文件信息"
 // @Success 200
 // @Router /excel/exportExcel [post]
-func ExportExcel(c *gin.Context) {
-	var excelInfo model.ExcelInfo
+func (e *ExcelApi) ExportExcel(c *gin.Context) {
+	var excelInfo example.ExcelInfo
 	_ = c.ShouldBindJSON(&excelInfo)
+	if strings.Index(excelInfo.FileName, "..") > -1 {
+		response.FailWithMessage("包含非法字符", c)
+		return
+	}
 	filePath := global.GVA_CONFIG.Excel.Dir + excelInfo.FileName
-	err := service.ParseInfoList2Excel(excelInfo.InfoList, filePath)
+	err := excelService.ParseInfoList2Excel(excelInfo.InfoList, filePath)
 	if err != nil {
-		global.GVA_LOG.Error("转换Excel失败!", zap.Any("err", err))
+		global.GVA_LOG.Error("转换Excel失败!", zap.Error(err))
 		response.FailWithMessage("转换Excel失败", c)
 		return
 	}
@@ -43,12 +49,12 @@ func ExportExcel(c *gin.Context) {
 // @accept multipart/form-data
 // @Produce  application/json
 // @Param file formData file true "导入Excel文件"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"导入成功"}"
+// @Success 200 {object} response.Response{msg=string} "导入Excel文件"
 // @Router /excel/importExcel [post]
-func ImportExcel(c *gin.Context) {
+func (e *ExcelApi) ImportExcel(c *gin.Context) {
 	_, header, err := c.Request.FormFile("file")
 	if err != nil {
-		global.GVA_LOG.Error("接收文件失败!", zap.Any("err", err))
+		global.GVA_LOG.Error("接收文件失败!", zap.Error(err))
 		response.FailWithMessage("接收文件失败", c)
 		return
 	}
@@ -60,12 +66,12 @@ func ImportExcel(c *gin.Context) {
 // @Summary 加载Excel数据
 // @Security ApiKeyAuth
 // @Produce  application/json
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"加载数据成功"}"
+// @Success 200 {object} response.Response{data=response.PageResult,msg=string} "加载Excel数据,返回包括列表,总数,页码,每页数量"
 // @Router /excel/loadExcel [get]
-func LoadExcel(c *gin.Context) {
-	menus, err := service.ParseExcel2InfoList()
+func (e *ExcelApi) LoadExcel(c *gin.Context) {
+	menus, err := excelService.ParseExcel2InfoList()
 	if err != nil {
-		global.GVA_LOG.Error("加载数据失败!", zap.Any("err", err))
+		global.GVA_LOG.Error("加载数据失败!", zap.Error(err))
 		response.FailWithMessage("加载数据失败", c)
 		return
 	}
@@ -85,15 +91,21 @@ func LoadExcel(c *gin.Context) {
 // @Param fileName query string true "模板名称"
 // @Success 200
 // @Router /excel/downloadTemplate [get]
-func DownloadTemplate(c *gin.Context) {
+func (e *ExcelApi) DownloadTemplate(c *gin.Context) {
 	fileName := c.Query("fileName")
 	filePath := global.GVA_CONFIG.Excel.Dir + fileName
-	ok, err := utils.PathExists(filePath)
-	if !ok || err != nil {
-		global.GVA_LOG.Error("文件不存在!", zap.Any("err", err))
+
+	fi, err := os.Stat(filePath)
+	if err != nil {
+		global.GVA_LOG.Error("文件不存在!", zap.Error(err))
 		response.FailWithMessage("文件不存在", c)
 		return
 	}
+	if fi.IsDir() {
+		global.GVA_LOG.Error("不支持下载文件夹!", zap.Error(err))
+		response.FailWithMessage("不支持下载文件夹", c)
+		return
+	}
 	c.Writer.Header().Add("success", "true")
 	c.File(filePath)
 }

server/api/v1/example/exa_file_upload_download.go

@@ -0,0 +1,94 @@
+package example
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/example"
+	exampleRes "github.com/flipped-aurora/gin-vue-admin/server/model/example/response"
+	"github.com/gin-gonic/gin"
+	"go.uber.org/zap"
+)
+
+type FileUploadAndDownloadApi struct{}
+
+// @Tags ExaFileUploadAndDownload
+// @Summary 上传文件示例
+// @Security ApiKeyAuth
+// @accept multipart/form-data
+// @Produce  application/json
+// @Param file formData file true "上传文件示例"
+// @Success 200 {object} response.Response{data=exampleRes.ExaFileResponse,msg=string} "上传文件示例,返回包括文件详情"
+// @Router /fileUploadAndDownload/upload [post]
+func (b *FileUploadAndDownloadApi) UploadFile(c *gin.Context) {
+	var file example.ExaFileUploadAndDownload
+	noSave := c.DefaultQuery("noSave", "0")
+	_, header, err := c.Request.FormFile("file")
+	if err != nil {
+		global.GVA_LOG.Error("接收文件失败!", zap.Error(err))
+		response.FailWithMessage("接收文件失败", c)
+		return
+	}
+	file, err = fileUploadAndDownloadService.UploadFile(header, noSave) // 文件上传后拿到文件路径
+	if err != nil {
+		global.GVA_LOG.Error("修改数据库链接失败!", zap.Error(err))
+		response.FailWithMessage("修改数据库链接失败", c)
+		return
+	}
+	response.OkWithDetailed(exampleRes.ExaFileResponse{File: file}, "上传成功", c)
+}
+
+// EditFileName 编辑文件名或者备注
+func (b *FileUploadAndDownloadApi) EditFileName(c *gin.Context) {
+	var file example.ExaFileUploadAndDownload
+	_ = c.ShouldBindJSON(&file)
+	if err := fileUploadAndDownloadService.EditFileName(file); err != nil {
+		global.GVA_LOG.Error("编辑失败!", zap.Error(err))
+		response.FailWithMessage("编辑失败", c)
+		return
+	}
+	response.OkWithMessage("编辑成功", c)
+}
+
+// @Tags ExaFileUploadAndDownload
+// @Summary 删除文件
+// @Security ApiKeyAuth
+// @Produce  application/json
+// @Param data body example.ExaFileUploadAndDownload true "传入文件里面id即可"
+// @Success 200 {object} response.Response{msg=string} "删除文件"
+// @Router /fileUploadAndDownload/deleteFile [post]
+func (b *FileUploadAndDownloadApi) DeleteFile(c *gin.Context) {
+	var file example.ExaFileUploadAndDownload
+	_ = c.ShouldBindJSON(&file)
+	if err := fileUploadAndDownloadService.DeleteFile(file); err != nil {
+		global.GVA_LOG.Error("删除失败!", zap.Error(err))
+		response.FailWithMessage("删除失败", c)
+		return
+	}
+	response.OkWithMessage("删除成功", c)
+}
+
+// @Tags ExaFileUploadAndDownload
+// @Summary 分页文件列表
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body request.PageInfo true "页码, 每页大小"
+// @Success 200 {object} response.Response{data=response.PageResult,msg=string} "分页文件列表,返回包括列表,总数,页码,每页数量"
+// @Router /fileUploadAndDownload/getFileList [post]
+func (b *FileUploadAndDownloadApi) GetFileList(c *gin.Context) {
+	var pageInfo request.PageInfo
+	_ = c.ShouldBindJSON(&pageInfo)
+	list, total, err := fileUploadAndDownloadService.GetFileRecordInfoList(pageInfo)
+	if err != nil {
+		global.GVA_LOG.Error("获取失败!", zap.Error(err))
+		response.FailWithMessage("获取失败", c)
+	} else {
+		response.OkWithDetailed(response.PageResult{
+			List:     list,
+			Total:    total,
+			Page:     pageInfo.Page,
+			PageSize: pageInfo.PageSize,
+		}, "获取成功", c)
+	}
+}

server/api/v1/sys_api.go

@@ -1,169 +0,0 @@
-package v1
-
-import (
-	"gin-vue-admin/global"
-	"gin-vue-admin/model"
-	"gin-vue-admin/model/request"
-	"gin-vue-admin/model/response"
-	"gin-vue-admin/service"
-	"gin-vue-admin/utils"
-
-	"github.com/gin-gonic/gin"
-	"go.uber.org/zap"
-)
-
-// @Tags SysApi
-// @Summary 创建基础api
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body model.SysApi true "api路径, api中文描述, api组, 方法"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"创建成功"}"
-// @Router /api/createApi [post]
-func CreateApi(c *gin.Context) {
-	var api model.SysApi
-	_ = c.ShouldBindJSON(&api)
-	if err := utils.Verify(api, utils.ApiVerify); err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	if err := service.CreateApi(api); err != nil {
-		global.GVA_LOG.Error("创建失败!", zap.Any("err", err))
-		response.FailWithMessage("创建失败", c)
-	} else {
-		response.OkWithMessage("创建成功", c)
-	}
-}
-
-// @Tags SysApi
-// @Summary 删除api
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body model.SysApi true "ID"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
-// @Router /api/deleteApi [post]
-func DeleteApi(c *gin.Context) {
-	var api model.SysApi
-	_ = c.ShouldBindJSON(&api)
-	if err := utils.Verify(api.GVA_MODEL, utils.IdVerify); err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	if err := service.DeleteApi(api); err != nil {
-		global.GVA_LOG.Error("删除失败!", zap.Any("err", err))
-		response.FailWithMessage("删除失败", c)
-	} else {
-		response.OkWithMessage("删除成功", c)
-	}
-}
-
-// @Tags SysApi
-// @Summary 分页获取API列表
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body request.SearchApiParams true "分页获取API列表"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
-// @Router /api/getApiList [post]
-func GetApiList(c *gin.Context) {
-	var pageInfo request.SearchApiParams
-	_ = c.ShouldBindJSON(&pageInfo)
-	if err := utils.Verify(pageInfo.PageInfo, utils.PageInfoVerify); err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	if err, list, total := service.GetAPIInfoList(pageInfo.SysApi, pageInfo.PageInfo, pageInfo.OrderKey, pageInfo.Desc); err != nil {
-		global.GVA_LOG.Error("获取失败!", zap.Any("err", err))
-		response.FailWithMessage("获取失败", c)
-	} else {
-		response.OkWithDetailed(response.PageResult{
-			List:     list,
-			Total:    total,
-			Page:     pageInfo.Page,
-			PageSize: pageInfo.PageSize,
-		}, "获取成功", c)
-	}
-}
-
-// @Tags SysApi
-// @Summary 根据id获取api
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body request.GetById true "根据id获取api"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
-// @Router /api/getApiById [post]
-func GetApiById(c *gin.Context) {
-	var idInfo request.GetById
-	_ = c.ShouldBindJSON(&idInfo)
-	if err := utils.Verify(idInfo, utils.IdVerify); err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	err, api := service.GetApiById(idInfo.ID)
-	if err != nil {
-		global.GVA_LOG.Error("获取失败!", zap.Any("err", err))
-		response.FailWithMessage("获取失败", c)
-	} else {
-		response.OkWithData(response.SysAPIResponse{Api: api}, c)
-	}
-}
-
-// @Tags SysApi
-// @Summary 创建基础api
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body model.SysApi true "api路径, api中文描述, api组, 方法"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"修改成功"}"
-// @Router /api/updateApi [post]
-func UpdateApi(c *gin.Context) {
-	var api model.SysApi
-	_ = c.ShouldBindJSON(&api)
-	if err := utils.Verify(api, utils.ApiVerify); err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	if err := service.UpdateApi(api); err != nil {
-		global.GVA_LOG.Error("修改失败!", zap.Any("err", err))
-		response.FailWithMessage("修改失败", c)
-	} else {
-		response.OkWithMessage("修改成功", c)
-	}
-}
-
-// @Tags SysApi
-// @Summary 获取所有的Api 不分页
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
-// @Router /api/getAllApis [post]
-func GetAllApis(c *gin.Context) {
-	if err, apis := service.GetAllApis(); err != nil {
-		global.GVA_LOG.Error("获取失败!", zap.Any("err", err))
-		response.FailWithMessage("获取失败", c)
-	} else {
-		response.OkWithDetailed(response.SysAPIListResponse{Apis: apis}, "获取成功", c)
-	}
-}
-
-// @Tags SysApi
-// @Summary 删除选中Api
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body request.IdsReq true "ID"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
-// @Router /api/deleteApisByIds [delete]
-func DeleteApisByIds(c *gin.Context) {
-	var ids request.IdsReq
-	_ = c.ShouldBindJSON(&ids)
-	if err := service.DeleteApisByIds(ids); err != nil {
-		global.GVA_LOG.Error("删除失败!", zap.Any("err", err))
-		response.FailWithMessage("删除失败", c)
-	} else {
-		response.OkWithMessage("删除成功", c)
-	}
-}

server/api/v1/sys_authority.go

@@ -1,161 +0,0 @@
-package v1
-
-import (
-	"gin-vue-admin/global"
-	"gin-vue-admin/model"
-	"gin-vue-admin/model/request"
-	"gin-vue-admin/model/response"
-	"gin-vue-admin/service"
-	"gin-vue-admin/utils"
-
-	"github.com/gin-gonic/gin"
-	"go.uber.org/zap"
-)
-
-// @Tags Authority
-// @Summary 创建角色
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body model.SysAuthority true "权限id, 权限名, 父角色id"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"创建成功"}"
-// @Router /authority/createAuthority [post]
-func CreateAuthority(c *gin.Context) {
-	var authority model.SysAuthority
-	_ = c.ShouldBindJSON(&authority)
-	if err := utils.Verify(authority, utils.AuthorityVerify); err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	if err, authBack := service.CreateAuthority(authority); err != nil {
-		global.GVA_LOG.Error("创建失败!", zap.Any("err", err))
-		response.FailWithMessage("创建失败"+err.Error(), c)
-	} else {
-		_ = service.UpdateCasbin(authority.AuthorityId, request.DefaultCasbin())
-		response.OkWithDetailed(response.SysAuthorityResponse{Authority: authBack}, "创建成功", c)
-	}
-}
-
-// @Tags Authority
-// @Summary 拷贝角色
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body response.SysAuthorityCopyResponse true "旧角色id, 新权限id, 新权限名, 新父角色id"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"拷贝成功"}"
-// @Router /authority/copyAuthority [post]
-func CopyAuthority(c *gin.Context) {
-	var copyInfo response.SysAuthorityCopyResponse
-	_ = c.ShouldBindJSON(&copyInfo)
-	if err := utils.Verify(copyInfo, utils.OldAuthorityVerify); err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	if err := utils.Verify(copyInfo.Authority, utils.AuthorityVerify); err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	if err, authBack := service.CopyAuthority(copyInfo); err != nil {
-		global.GVA_LOG.Error("拷贝失败!", zap.Any("err", err))
-		response.FailWithMessage("拷贝失败"+err.Error(), c)
-	} else {
-		response.OkWithDetailed(response.SysAuthorityResponse{Authority: authBack}, "拷贝成功", c)
-	}
-}
-
-// @Tags Authority
-// @Summary 删除角色
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body model.SysAuthority true "删除角色"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
-// @Router /authority/deleteAuthority [post]
-func DeleteAuthority(c *gin.Context) {
-	var authority model.SysAuthority
-	_ = c.ShouldBindJSON(&authority)
-	if err := utils.Verify(authority, utils.AuthorityIdVerify); err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	if err := service.DeleteAuthority(&authority); err != nil { // 删除角色之前需要判断是否有用户正在使用此角色
-		global.GVA_LOG.Error("删除失败!", zap.Any("err", err))
-		response.FailWithMessage("删除失败"+err.Error(), c)
-	} else {
-		response.OkWithMessage("删除成功", c)
-	}
-}
-
-// @Tags Authority
-// @Summary 更新角色信息
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body model.SysAuthority true "权限id, 权限名, 父角色id"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"更新成功"}"
-// @Router /authority/updateAuthority [post]
-func UpdateAuthority(c *gin.Context) {
-	var auth model.SysAuthority
-	_ = c.ShouldBindJSON(&auth)
-	if err := utils.Verify(auth, utils.AuthorityVerify); err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	if err, authority := service.UpdateAuthority(auth); err != nil {
-		global.GVA_LOG.Error("更新失败!", zap.Any("err", err))
-		response.FailWithMessage("更新失败"+err.Error(), c)
-	} else {
-		response.OkWithDetailed(response.SysAuthorityResponse{Authority: authority}, "更新成功", c)
-	}
-}
-
-// @Tags Authority
-// @Summary 分页获取角色列表
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body request.PageInfo true "页码, 每页大小"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
-// @Router /authority/getAuthorityList [post]
-func GetAuthorityList(c *gin.Context) {
-	var pageInfo request.PageInfo
-	_ = c.ShouldBindJSON(&pageInfo)
-	if err := utils.Verify(pageInfo, utils.PageInfoVerify); err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	if err, list, total := service.GetAuthorityInfoList(pageInfo); err != nil {
-		global.GVA_LOG.Error("获取失败!", zap.Any("err", err))
-		response.FailWithMessage("获取失败"+err.Error(), c)
-	} else {
-		response.OkWithDetailed(response.PageResult{
-			List:     list,
-			Total:    total,
-			Page:     pageInfo.Page,
-			PageSize: pageInfo.PageSize,
-		}, "获取成功", c)
-	}
-}
-
-// @Tags Authority
-// @Summary 设置角色资源权限
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body model.SysAuthority true "设置角色资源权限"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"设置成功"}"
-// @Router /authority/setDataAuthority [post]
-func SetDataAuthority(c *gin.Context) {
-	var auth model.SysAuthority
-	_ = c.ShouldBindJSON(&auth)
-	if err := utils.Verify(auth, utils.AuthorityIdVerify); err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	if err := service.SetDataAuthority(auth); err != nil {
-		global.GVA_LOG.Error("设置失败!", zap.Any("err", err))
-		response.FailWithMessage("设置失败"+err.Error(), c)
-	} else {
-		response.OkWithMessage("设置成功", c)
-	}
-}

server/api/v1/sys_auto_code.go

@@ -1,135 +0,0 @@
-package v1
-
-import (
-	"errors"
-	"fmt"
-	"gin-vue-admin/global"
-	"gin-vue-admin/model"
-	"gin-vue-admin/model/response"
-	"gin-vue-admin/service"
-	"gin-vue-admin/utils"
-	"net/url"
-	"os"
-
-	"github.com/gin-gonic/gin"
-	"go.uber.org/zap"
-)
-
-// @Tags AutoCode
-// @Summary 预览创建后的代码
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body model.AutoCodeStruct true "预览创建代码"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"创建成功"}"
-// @Router /autoCode/preview [post]
-func PreviewTemp(c *gin.Context) {
-	var a model.AutoCodeStruct
-	_ = c.ShouldBindJSON(&a)
-	if err := utils.Verify(a, utils.AutoCodeVerify); err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	autoCode, err := service.PreviewTemp(a)
-	if err != nil {
-		global.GVA_LOG.Error("预览失败!", zap.Any("err", err))
-		response.FailWithMessage("预览失败", c)
-	} else {
-		response.OkWithDetailed(gin.H{"autoCode": autoCode}, "预览成功", c)
-	}
-}
-
-// @Tags AutoCode
-// @Summary 自动代码模板
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body model.AutoCodeStruct true "创建自动代码"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"创建成功"}"
-// @Router /autoCode/createTemp [post]
-func CreateTemp(c *gin.Context) {
-	var a model.AutoCodeStruct
-	_ = c.ShouldBindJSON(&a)
-	if err := utils.Verify(a, utils.AutoCodeVerify); err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	if a.AutoCreateApiToSql {
-		if err := service.AutoCreateApi(&a); err != nil {
-			global.GVA_LOG.Error("自动化创建失败!请自行清空垃圾数据!", zap.Any("err", err))
-			c.Writer.Header().Add("success", "false")
-			c.Writer.Header().Add("msg", url.QueryEscape("自动化创建失败!请自行清空垃圾数据!"))
-			return
-		}
-	}
-	err := service.CreateTemp(a)
-	if err != nil {
-		if errors.Is(err, model.AutoMoveErr) {
-			c.Writer.Header().Add("success", "false")
-			c.Writer.Header().Add("msgtype", "success")
-			c.Writer.Header().Add("msg", url.QueryEscape(err.Error()))
-		} else {
-			c.Writer.Header().Add("success", "false")
-			c.Writer.Header().Add("msg", url.QueryEscape(err.Error()))
-			_ = os.Remove("./ginvueadmin.zip")
-		}
-	} else {
-		c.Writer.Header().Add("Content-Disposition", fmt.Sprintf("attachment; filename=%s", "ginvueadmin.zip")) // fmt.Sprintf("attachment; filename=%s", filename)对下载的文件重命名
-		c.Writer.Header().Add("Content-Type", "application/json")
-		c.Writer.Header().Add("success", "true")
-		c.File("./ginvueadmin.zip")
-		_ = os.Remove("./ginvueadmin.zip")
-	}
-}
-
-// @Tags AutoCode
-// @Summary 获取当前数据库所有表
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
-// @Router /autoCode/getTables [get]
-func GetTables(c *gin.Context) {
-	dbName := c.DefaultQuery("dbName", global.GVA_CONFIG.Mysql.Dbname)
-	err, tables := service.GetTables(dbName)
-	if err != nil {
-		global.GVA_LOG.Error("查询table失败!", zap.Any("err", err))
-		response.FailWithMessage("查询table失败", c)
-	} else {
-		response.OkWithDetailed(gin.H{"tables": tables}, "获取成功", c)
-	}
-}
-
-// @Tags AutoCode
-// @Summary 获取当前所有数据库
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
-// @Router /autoCode/getDatabase [get]
-func GetDB(c *gin.Context) {
-	if err, dbs := service.GetDB(); err != nil {
-		global.GVA_LOG.Error("获取失败!", zap.Any("err", err))
-		response.FailWithMessage("获取失败", c)
-	} else {
-		response.OkWithDetailed(gin.H{"dbs": dbs}, "获取成功", c)
-	}
-}
-
-// @Tags AutoCode
-// @Summary 获取当前表所有字段
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
-// @Router /autoCode/getColumn [get]
-func GetColumn(c *gin.Context) {
-	dbName := c.DefaultQuery("dbName", global.GVA_CONFIG.Mysql.Dbname)
-	tableName := c.Query("tableName")
-	if err, columns := service.GetColumn(tableName, dbName); err != nil {
-		global.GVA_LOG.Error("获取失败!", zap.Any("err", err))
-		response.FailWithMessage("获取失败", c)
-	} else {
-		response.OkWithDetailed(gin.H{"columns": columns}, "获取成功", c)
-	}
-}

server/api/v1/sys_captcha.go

@@ -1,34 +0,0 @@
-package v1
-
-import (
-	"gin-vue-admin/global"
-	"gin-vue-admin/model/response"
-	"github.com/gin-gonic/gin"
-	"github.com/mojocn/base64Captcha"
-	"go.uber.org/zap"
-)
-
-var store = base64Captcha.DefaultMemStore
-
-// @Tags Base
-// @Summary 生成验证码
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"验证码获取成功"}"
-// @Router /base/captcha [post]
-func Captcha(c *gin.Context) {
-	// 字符,公式,验证码配置
-	// 生成默认数字的driver
-	driver := base64Captcha.NewDriverDigit(global.GVA_CONFIG.Captcha.ImgHeight, global.GVA_CONFIG.Captcha.ImgWidth, global.GVA_CONFIG.Captcha.KeyLong, 0.7, 80)
-	cp := base64Captcha.NewCaptcha(driver, store)
-	if id, b64s, err := cp.Generate(); err != nil {
-		global.GVA_LOG.Error("验证码获取失败!", zap.Any("err", err))
-		response.FailWithMessage("验证码获取失败", c)
-	} else {
-		response.OkWithDetailed(response.SysCaptchaResponse{
-			CaptchaId: id,
-			PicPath:   b64s,
-		}, "验证码获取成功", c)
-	}
-}

server/api/v1/sys_dictionary.go

@@ -1,116 +0,0 @@
-package v1
-
-import (
-	"gin-vue-admin/global"
-	"gin-vue-admin/model"
-	"gin-vue-admin/model/request"
-	"gin-vue-admin/model/response"
-	"gin-vue-admin/service"
-	"gin-vue-admin/utils"
-	"github.com/gin-gonic/gin"
-	"go.uber.org/zap"
-)
-
-// @Tags SysDictionary
-// @Summary 创建SysDictionary
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body model.SysDictionary true "SysDictionary模型"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"创建成功"}"
-// @Router /sysDictionary/createSysDictionary [post]
-func CreateSysDictionary(c *gin.Context) {
-	var dictionary model.SysDictionary
-	_ = c.ShouldBindJSON(&dictionary)
-	if err := service.CreateSysDictionary(dictionary); err != nil {
-		global.GVA_LOG.Error("创建失败!", zap.Any("err", err))
-		response.FailWithMessage("创建失败", c)
-	} else {
-		response.OkWithMessage("创建成功", c)
-	}
-}
-
-// @Tags SysDictionary
-// @Summary 删除SysDictionary
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body model.SysDictionary true "SysDictionary模型"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
-// @Router /sysDictionary/deleteSysDictionary [delete]
-func DeleteSysDictionary(c *gin.Context) {
-	var dictionary model.SysDictionary
-	_ = c.ShouldBindJSON(&dictionary)
-	if err := service.DeleteSysDictionary(dictionary); err != nil {
-		global.GVA_LOG.Error("删除失败!", zap.Any("err", err))
-		response.FailWithMessage("删除失败", c)
-	} else {
-		response.OkWithMessage("删除成功", c)
-	}
-}
-
-// @Tags SysDictionary
-// @Summary 更新SysDictionary
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body model.SysDictionary true "SysDictionary模型"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"更新成功"}"
-// @Router /sysDictionary/updateSysDictionary [put]
-func UpdateSysDictionary(c *gin.Context) {
-	var dictionary model.SysDictionary
-	_ = c.ShouldBindJSON(&dictionary)
-	if err := service.UpdateSysDictionary(&dictionary); err != nil {
-		global.GVA_LOG.Error("更新失败!", zap.Any("err", err))
-		response.FailWithMessage("更新失败", c)
-	} else {
-		response.OkWithMessage("更新成功", c)
-	}
-}
-
-// @Tags SysDictionary
-// @Summary 用id查询SysDictionary
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body model.SysDictionary true "ID或字典英名"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
-// @Router /sysDictionary/findSysDictionary [get]
-func FindSysDictionary(c *gin.Context) {
-	var dictionary model.SysDictionary
-	_ = c.ShouldBindQuery(&dictionary)
-	if err, sysDictionary := service.GetSysDictionary(dictionary.Type, dictionary.ID); err != nil {
-		global.GVA_LOG.Error("查询失败!", zap.Any("err", err))
-		response.FailWithMessage("查询失败", c)
-	} else {
-		response.OkWithDetailed(gin.H{"resysDictionary": sysDictionary}, "查询成功", c)
-	}
-}
-
-// @Tags SysDictionary
-// @Summary 分页获取SysDictionary列表
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body request.SysDictionarySearch true "页码, 每页大小, 搜索条件"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
-// @Router /sysDictionary/getSysDictionaryList [get]
-func GetSysDictionaryList(c *gin.Context) {
-	var pageInfo request.SysDictionarySearch
-	_ = c.ShouldBindQuery(&pageInfo)
-	if err := utils.Verify(pageInfo.PageInfo, utils.PageInfoVerify); err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	if err, list, total := service.GetSysDictionaryInfoList(pageInfo); err != nil {
-		global.GVA_LOG.Error("获取失败!", zap.Any("err", err))
-		response.FailWithMessage("获取失败", c)
-	} else {
-		response.OkWithDetailed(response.PageResult{
-			List:     list,
-			Total:    total,
-			Page:     pageInfo.Page,
-			PageSize: pageInfo.PageSize,
-		}, "获取成功", c)
-	}
-}

server/api/v1/sys_dictionary_detail.go

@@ -1,116 +0,0 @@
-package v1
-
-import (
-	"gin-vue-admin/global"
-	"gin-vue-admin/model"
-	"gin-vue-admin/model/request"
-	"gin-vue-admin/model/response"
-	"gin-vue-admin/service"
-	"gin-vue-admin/utils"
-	"github.com/gin-gonic/gin"
-	"go.uber.org/zap"
-)
-
-// @Tags SysDictionaryDetail
-// @Summary 创建SysDictionaryDetail
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body model.SysDictionaryDetail true "SysDictionaryDetail模型"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"创建成功"}"
-// @Router /sysDictionaryDetail/createSysDictionaryDetail [post]
-func CreateSysDictionaryDetail(c *gin.Context) {
-	var detail model.SysDictionaryDetail
-	_ = c.ShouldBindJSON(&detail)
-	if err := service.CreateSysDictionaryDetail(detail); err != nil {
-		global.GVA_LOG.Error("创建失败!", zap.Any("err", err))
-		response.FailWithMessage("创建失败", c)
-	} else {
-		response.OkWithMessage("创建成功", c)
-	}
-}
-
-// @Tags SysDictionaryDetail
-// @Summary 删除SysDictionaryDetail
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body model.SysDictionaryDetail true "SysDictionaryDetail模型"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
-// @Router /sysDictionaryDetail/deleteSysDictionaryDetail [delete]
-func DeleteSysDictionaryDetail(c *gin.Context) {
-	var detail model.SysDictionaryDetail
-	_ = c.ShouldBindJSON(&detail)
-	if err := service.DeleteSysDictionaryDetail(detail); err != nil {
-		global.GVA_LOG.Error("删除失败!", zap.Any("err", err))
-		response.FailWithMessage("删除失败", c)
-	} else {
-		response.OkWithMessage("删除成功", c)
-	}
-}
-
-// @Tags SysDictionaryDetail
-// @Summary 更新SysDictionaryDetail
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body model.SysDictionaryDetail true "更新SysDictionaryDetail"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"更新成功"}"
-// @Router /sysDictionaryDetail/updateSysDictionaryDetail [put]
-func UpdateSysDictionaryDetail(c *gin.Context) {
-	var detail model.SysDictionaryDetail
-	_ = c.ShouldBindJSON(&detail)
-	if err := service.UpdateSysDictionaryDetail(&detail); err != nil {
-		global.GVA_LOG.Error("更新失败!", zap.Any("err", err))
-		response.FailWithMessage("更新失败", c)
-	} else {
-		response.OkWithMessage("更新成功", c)
-	}
-}
-
-// @Tags SysDictionaryDetail
-// @Summary 用id查询SysDictionaryDetail
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body model.SysDictionaryDetail true "用id查询SysDictionaryDetail"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
-// @Router /sysDictionaryDetail/findSysDictionaryDetail [get]
-func FindSysDictionaryDetail(c *gin.Context) {
-	var detail model.SysDictionaryDetail
-	_ = c.ShouldBindQuery(&detail)
-	if err := utils.Verify(detail, utils.IdVerify); err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	if err, resysDictionaryDetail := service.GetSysDictionaryDetail(detail.ID); err != nil {
-		global.GVA_LOG.Error("查询失败!", zap.Any("err", err))
-		response.FailWithMessage("查询失败", c)
-	} else {
-		response.OkWithDetailed(gin.H{"resysDictionaryDetail": resysDictionaryDetail}, "查询成功", c)
-	}
-}
-
-// @Tags SysDictionaryDetail
-// @Summary 分页获取SysDictionaryDetail列表
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body request.SysDictionaryDetailSearch true "页码, 每页大小, 搜索条件"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
-// @Router /sysDictionaryDetail/getSysDictionaryDetailList [get]
-func GetSysDictionaryDetailList(c *gin.Context) {
-	var pageInfo request.SysDictionaryDetailSearch
-	_ = c.ShouldBindQuery(&pageInfo)
-	if err, list, total := service.GetSysDictionaryDetailInfoList(pageInfo); err != nil {
-		global.GVA_LOG.Error("获取失败!", zap.Any("err", err))
-		response.FailWithMessage("获取失败", c)
-	} else {
-		response.OkWithDetailed(response.PageResult{
-			List:     list,
-			Total:    total,
-			Page:     pageInfo.Page,
-			PageSize: pageInfo.PageSize,
-		}, "获取成功", c)
-	}
-}

server/api/v1/sys_email.go

@@ -1,24 +0,0 @@
-package v1
-
-import (
-	"gin-vue-admin/global"
-	"gin-vue-admin/model/response"
-	"gin-vue-admin/service"
-	"github.com/gin-gonic/gin"
-	"go.uber.org/zap"
-)
-
-// @Tags System
-// @Summary 发送测试邮件
-// @Security ApiKeyAuth
-// @Produce  application/json
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"发送成功"}"
-// @Router /email/emailTest [post]
-func EmailTest(c *gin.Context) {
-	if err := service.EmailTest(); err != nil {
-		global.GVA_LOG.Error("发送失败!", zap.Any("err", err))
-		response.FailWithMessage("发送失败", c)
-	} else {
-		response.OkWithData("发送成功", c)
-	}
-}

server/api/v1/sys_initdb.go

@@ -1,55 +0,0 @@
-package v1
-
-import (
-	"gin-vue-admin/global"
-	"gin-vue-admin/model/request"
-	"gin-vue-admin/model/response"
-	"gin-vue-admin/service"
-
-	"go.uber.org/zap"
-
-	"github.com/gin-gonic/gin"
-)
-
-// @Tags InitDB
-// @Summary 初始化用户数据库
-// @Produce  application/json
-// @Param data body request.InitDB true "初始化数据库参数"
-// @Success 200 {string} string "{"code":0,"data":{},"msg":"自动创建数据库成功"}"
-// @Router /init/initdb [post]
-func InitDB(c *gin.Context) {
-	if global.GVA_DB != nil {
-		global.GVA_LOG.Error("已存在数据库配置!")
-		response.FailWithMessage("已存在数据库配置", c)
-		return
-	}
-	var dbInfo request.InitDB
-	if err := c.ShouldBindJSON(&dbInfo); err != nil {
-		global.GVA_LOG.Error("参数校验不通过!", zap.Any("err", err))
-		response.FailWithMessage("参数校验不通过", c)
-		return
-	}
-	if err := service.InitDB(dbInfo); err != nil {
-		global.GVA_LOG.Error("自动创建数据库失败!", zap.Any("err", err))
-		response.FailWithMessage("自动创建数据库失败，请查看后台日志，检查后在进行初始化", c)
-		return
-	}
-	response.OkWithData("自动创建数据库成功", c)
-}
-
-// @Tags CheckDB
-// @Summary 初始化用户数据库
-// @Produce  application/json
-// @Success 200 {string} string "{"code":0,"data":{},"msg":"探测完成"}"
-// @Router /init/checkdb [post]
-func CheckDB(c *gin.Context) {
-	if global.GVA_DB != nil {
-		global.GVA_LOG.Info("数据库无需初始化")
-		response.OkWithDetailed(gin.H{"needInit": false}, "数据库无需初始化", c)
-		return
-	} else {
-		global.GVA_LOG.Info("前往初始化数据库")
-		response.OkWithDetailed(gin.H{"needInit": true}, "前往初始化数据库", c)
-		return
-	}
-}

server/api/v1/sys_jwt_blacklist.go

@@ -1,28 +0,0 @@
-package v1
-
-import (
-	"gin-vue-admin/global"
-	"gin-vue-admin/model"
-	"gin-vue-admin/model/response"
-	"gin-vue-admin/service"
-	"github.com/gin-gonic/gin"
-	"go.uber.org/zap"
-)
-
-// @Tags Jwt
-// @Summary jwt加入黑名单
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"拉黑成功"}"
-// @Router /jwt/jsonInBlacklist [post]
-func JsonInBlacklist(c *gin.Context) {
-	token := c.Request.Header.Get("x-token")
-	jwt := model.JwtBlacklist{Jwt: token}
-	if err := service.JsonInBlacklist(jwt); err != nil {
-		global.GVA_LOG.Error("jwt作废失败!", zap.Any("err", err))
-		response.FailWithMessage("jwt作废失败", c)
-	} else {
-		response.OkWithMessage("jwt作废成功", c)
-	}
-}

server/api/v1/sys_operation_record.go

@@ -1,116 +0,0 @@
-package v1
-
-import (
-	"gin-vue-admin/global"
-	"gin-vue-admin/model"
-	"gin-vue-admin/model/request"
-	"gin-vue-admin/model/response"
-	"gin-vue-admin/service"
-	"gin-vue-admin/utils"
-	"github.com/gin-gonic/gin"
-	"go.uber.org/zap"
-)
-
-// @Tags SysOperationRecord
-// @Summary 创建SysOperationRecord
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body model.SysOperationRecord true "创建SysOperationRecord"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
-// @Router /sysOperationRecord/createSysOperationRecord [post]
-func CreateSysOperationRecord(c *gin.Context) {
-	var sysOperationRecord model.SysOperationRecord
-	_ = c.ShouldBindJSON(&sysOperationRecord)
-	if err := service.CreateSysOperationRecord(sysOperationRecord); err != nil {
-		global.GVA_LOG.Error("创建失败!", zap.Any("err", err))
-		response.FailWithMessage("创建失败", c)
-	} else {
-		response.OkWithMessage("创建成功", c)
-	}
-}
-
-// @Tags SysOperationRecord
-// @Summary 删除SysOperationRecord
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body model.SysOperationRecord true "SysOperationRecord模型"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
-// @Router /sysOperationRecord/deleteSysOperationRecord [delete]
-func DeleteSysOperationRecord(c *gin.Context) {
-	var sysOperationRecord model.SysOperationRecord
-	_ = c.ShouldBindJSON(&sysOperationRecord)
-	if err := service.DeleteSysOperationRecord(sysOperationRecord); err != nil {
-		global.GVA_LOG.Error("删除失败!", zap.Any("err", err))
-		response.FailWithMessage("删除失败", c)
-	} else {
-		response.OkWithMessage("删除成功", c)
-	}
-}
-
-// @Tags SysOperationRecord
-// @Summary 批量删除SysOperationRecord
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body request.IdsReq true "批量删除SysOperationRecord"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"批量删除成功"}"
-// @Router /sysOperationRecord/deleteSysOperationRecordByIds [delete]
-func DeleteSysOperationRecordByIds(c *gin.Context) {
-	var IDS request.IdsReq
-	_ = c.ShouldBindJSON(&IDS)
-	if err := service.DeleteSysOperationRecordByIds(IDS); err != nil {
-		global.GVA_LOG.Error("批量删除失败!", zap.Any("err", err))
-		response.FailWithMessage("批量删除失败", c)
-	} else {
-		response.OkWithMessage("批量删除成功", c)
-	}
-}
-
-// @Tags SysOperationRecord
-// @Summary 用id查询SysOperationRecord
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body model.SysOperationRecord true "Id"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
-// @Router /sysOperationRecord/findSysOperationRecord [get]
-func FindSysOperationRecord(c *gin.Context) {
-	var sysOperationRecord model.SysOperationRecord
-	_ = c.ShouldBindQuery(&sysOperationRecord)
-	if err := utils.Verify(sysOperationRecord, utils.IdVerify); err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	if err, resysOperationRecord := service.GetSysOperationRecord(sysOperationRecord.ID); err != nil {
-		global.GVA_LOG.Error("查询失败!", zap.Any("err", err))
-		response.FailWithMessage("查询失败", c)
-	} else {
-		response.OkWithDetailed(gin.H{"resysOperationRecord": resysOperationRecord}, "查询成功", c)
-	}
-}
-
-// @Tags SysOperationRecord
-// @Summary 分页获取SysOperationRecord列表
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body request.SysOperationRecordSearch true "页码, 每页大小, 搜索条件"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
-// @Router /sysOperationRecord/getSysOperationRecordList [get]
-func GetSysOperationRecordList(c *gin.Context) {
-	var pageInfo request.SysOperationRecordSearch
-	_ = c.ShouldBindQuery(&pageInfo)
-	if err, list, total := service.GetSysOperationRecordInfoList(pageInfo); err != nil {
-		global.GVA_LOG.Error("获取失败!", zap.Any("err", err))
-		response.FailWithMessage("获取失败", c)
-	} else {
-		response.OkWithDetailed(response.PageResult{
-			List:     list,
-			Total:    total,
-			Page:     pageInfo.Page,
-			PageSize: pageInfo.PageSize,
-		}, "获取成功", c)
-	}
-}

server/api/v1/sys_system.go

@@ -1,76 +0,0 @@
-package v1
-
-import (
-	"gin-vue-admin/global"
-	"gin-vue-admin/model"
-	"gin-vue-admin/model/response"
-	"gin-vue-admin/service"
-	"gin-vue-admin/utils"
-
-	"github.com/gin-gonic/gin"
-	"go.uber.org/zap"
-)
-
-// @Tags System
-// @Summary 获取配置文件内容
-// @Security ApiKeyAuth
-// @Produce  application/json
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
-// @Router /system/getSystemConfig [post]
-func GetSystemConfig(c *gin.Context) {
-	if err, config := service.GetSystemConfig(); err != nil {
-		global.GVA_LOG.Error("获取失败!", zap.Any("err", err))
-		response.FailWithMessage("获取失败", c)
-	} else {
-		response.OkWithDetailed(response.SysConfigResponse{Config: config}, "获取成功", c)
-	}
-}
-
-// @Tags System
-// @Summary 设置配置文件内容
-// @Security ApiKeyAuth
-// @Produce  application/json
-// @Param data body model.System true "设置配置文件内容"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"设置成功"}"
-// @Router /system/setSystemConfig [post]
-func SetSystemConfig(c *gin.Context) {
-	var sys model.System
-	_ = c.ShouldBindJSON(&sys)
-	if err := service.SetSystemConfig(sys); err != nil {
-		global.GVA_LOG.Error("设置失败!", zap.Any("err", err))
-		response.FailWithMessage("设置失败", c)
-	} else {
-		response.OkWithData("设置成功", c)
-	}
-}
-
-// @Tags System
-// @Summary 重启系统
-// @Security ApiKeyAuth
-// @Produce  application/json
-// @Success 200 {string} string "{"code":0,"data":{},"msg":"重启系统成功"}"
-// @Router /system/reloadSystem [post]
-func ReloadSystem(c *gin.Context) {
-	err := utils.Reload()
-	if err != nil {
-		global.GVA_LOG.Error("重启系统失败!", zap.Any("err", err))
-		response.FailWithMessage("重启系统失败", c)
-	} else {
-		response.OkWithMessage("重启系统成功", c)
-	}
-}
-
-// @Tags System
-// @Summary 获取服务器信息
-// @Security ApiKeyAuth
-// @Produce  application/json
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
-// @Router /system/getServerInfo [post]
-func GetServerInfo(c *gin.Context) {
-	if server, err := service.GetServerInfo(); err != nil {
-		global.GVA_LOG.Error("获取失败!", zap.Any("err", err))
-		response.FailWithMessage("获取失败", c)
-	} else {
-		response.OkWithDetailed(gin.H{"server": server}, "获取成功", c)
-	}
-}

server/api/v1/sys_user.go

@@ -1,287 +0,0 @@
-package v1
-
-import (
-	"gin-vue-admin/global"
-	"gin-vue-admin/middleware"
-	"gin-vue-admin/model"
-	"gin-vue-admin/model/request"
-	"gin-vue-admin/model/response"
-	"gin-vue-admin/service"
-	"gin-vue-admin/utils"
-	"time"
-
-	"github.com/dgrijalva/jwt-go"
-	"github.com/gin-gonic/gin"
-	"github.com/go-redis/redis"
-	"go.uber.org/zap"
-)
-
-// @Tags Base
-// @Summary 用户登录
-// @Produce  application/json
-// @Param data body request.Login true "用户名, 密码, 验证码"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"登陆成功"}"
-// @Router /base/login [post]
-func Login(c *gin.Context) {
-	var l request.Login
-	_ = c.ShouldBindJSON(&l)
-	if err := utils.Verify(l, utils.LoginVerify); err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	if store.Verify(l.CaptchaId, l.Captcha, true) {
-		u := &model.SysUser{Username: l.Username, Password: l.Password}
-		if err, user := service.Login(u); err != nil {
-			global.GVA_LOG.Error("登陆失败! 用户名不存在或者密码错误!", zap.Any("err", err))
-			response.FailWithMessage("用户名不存在或者密码错误", c)
-		} else {
-			tokenNext(c, *user)
-		}
-	} else {
-		response.FailWithMessage("验证码错误", c)
-	}
-}
-
-// 登录以后签发jwt
-func tokenNext(c *gin.Context, user model.SysUser) {
-	j := &middleware.JWT{SigningKey: []byte(global.GVA_CONFIG.JWT.SigningKey)} // 唯一签名
-	claims := request.CustomClaims{
-		UUID:        user.UUID,
-		ID:          user.ID,
-		NickName:    user.NickName,
-		Username:    user.Username,
-		AuthorityId: user.AuthorityId,
-		BufferTime:  global.GVA_CONFIG.JWT.BufferTime, // 缓冲时间1天 缓冲时间内会获得新的token刷新令牌 此时一个用户会存在两个有效令牌 但是前端只留一个 另一个会丢失
-		StandardClaims: jwt.StandardClaims{
-			NotBefore: time.Now().Unix() - 1000,                              // 签名生效时间
-			ExpiresAt: time.Now().Unix() + global.GVA_CONFIG.JWT.ExpiresTime, // 过期时间 7天  配置文件
-			Issuer:    "qmPlus",                                              // 签名的发行者
-		},
-	}
-	token, err := j.CreateToken(claims)
-	if err != nil {
-		global.GVA_LOG.Error("获取token失败!", zap.Any("err", err))
-		response.FailWithMessage("获取token失败", c)
-		return
-	}
-	if !global.GVA_CONFIG.System.UseMultipoint {
-		response.OkWithDetailed(response.LoginResponse{
-			User:      user,
-			Token:     token,
-			ExpiresAt: claims.StandardClaims.ExpiresAt * 1000,
-		}, "登录成功", c)
-		return
-	}
-	if err, jwtStr := service.GetRedisJWT(user.Username); err == redis.Nil {
-		if err := service.SetRedisJWT(token, user.Username); err != nil {
-			global.GVA_LOG.Error("设置登录状态失败!", zap.Any("err", err))
-			response.FailWithMessage("设置登录状态失败", c)
-			return
-		}
-		response.OkWithDetailed(response.LoginResponse{
-			User:      user,
-			Token:     token,
-			ExpiresAt: claims.StandardClaims.ExpiresAt * 1000,
-		}, "登录成功", c)
-	} else if err != nil {
-		global.GVA_LOG.Error("设置登录状态失败!", zap.Any("err", err))
-		response.FailWithMessage("设置登录状态失败", c)
-	} else {
-		var blackJWT model.JwtBlacklist
-		blackJWT.Jwt = jwtStr
-		if err := service.JsonInBlacklist(blackJWT); err != nil {
-			response.FailWithMessage("jwt作废失败", c)
-			return
-		}
-		if err := service.SetRedisJWT(token, user.Username); err != nil {
-			response.FailWithMessage("设置登录状态失败", c)
-			return
-		}
-		response.OkWithDetailed(response.LoginResponse{
-			User:      user,
-			Token:     token,
-			ExpiresAt: claims.StandardClaims.ExpiresAt * 1000,
-		}, "登录成功", c)
-	}
-}
-
-// @Tags SysUser
-// @Summary 用户注册账号
-// @Produce  application/json
-// @Param data body model.SysUser true "用户名, 昵称, 密码, 角色ID"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"注册成功"}"
-// @Router /user/register [post]
-func Register(c *gin.Context) {
-	var r request.Register
-	_ = c.ShouldBindJSON(&r)
-	if err := utils.Verify(r, utils.RegisterVerify); err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	user := &model.SysUser{Username: r.Username, NickName: r.NickName, Password: r.Password, HeaderImg: r.HeaderImg, AuthorityId: r.AuthorityId}
-	err, userReturn := service.Register(*user)
-	if err != nil {
-		global.GVA_LOG.Error("注册失败!", zap.Any("err", err))
-		response.FailWithDetailed(response.SysUserResponse{User: userReturn}, "注册失败", c)
-	} else {
-		response.OkWithDetailed(response.SysUserResponse{User: userReturn}, "注册成功", c)
-	}
-}
-
-// @Tags SysUser
-// @Summary 用户修改密码
-// @Security ApiKeyAuth
-// @Produce  application/json
-// @Param data body request.ChangePasswordStruct true "用户名, 原密码, 新密码"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"修改成功"}"
-// @Router /user/changePassword [put]
-func ChangePassword(c *gin.Context) {
-	var user request.ChangePasswordStruct
-	_ = c.ShouldBindJSON(&user)
-	if err := utils.Verify(user, utils.ChangePasswordVerify); err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	u := &model.SysUser{Username: user.Username, Password: user.Password}
-	if err, _ := service.ChangePassword(u, user.NewPassword); err != nil {
-		global.GVA_LOG.Error("修改失败!", zap.Any("err", err))
-		response.FailWithMessage("修改失败，原密码与当前账户不符", c)
-	} else {
-		response.OkWithMessage("修改成功", c)
-	}
-}
-
-// @Tags SysUser
-// @Summary 分页获取用户列表
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body request.PageInfo true "页码, 每页大小"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
-// @Router /user/getUserList [post]
-func GetUserList(c *gin.Context) {
-	var pageInfo request.PageInfo
-	_ = c.ShouldBindJSON(&pageInfo)
-	if err := utils.Verify(pageInfo, utils.PageInfoVerify); err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	if err, list, total := service.GetUserInfoList(pageInfo); err != nil {
-		global.GVA_LOG.Error("获取失败!", zap.Any("err", err))
-		response.FailWithMessage("获取失败", c)
-	} else {
-		response.OkWithDetailed(response.PageResult{
-			List:     list,
-			Total:    total,
-			Page:     pageInfo.Page,
-			PageSize: pageInfo.PageSize,
-		}, "获取成功", c)
-	}
-}
-
-// @Tags SysUser
-// @Summary 设置用户权限
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body request.SetUserAuth true "用户UUID, 角色ID"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"修改成功"}"
-// @Router /user/setUserAuthority [post]
-func SetUserAuthority(c *gin.Context) {
-	var sua request.SetUserAuth
-	_ = c.ShouldBindJSON(&sua)
-	if UserVerifyErr := utils.Verify(sua, utils.SetUserAuthorityVerify); UserVerifyErr != nil {
-		response.FailWithMessage(UserVerifyErr.Error(), c)
-		return
-	}
-	if err := service.SetUserAuthority(sua.UUID, sua.AuthorityId); err != nil {
-		global.GVA_LOG.Error("修改失败!", zap.Any("err", err))
-		response.FailWithMessage("修改失败", c)
-	} else {
-		response.OkWithMessage("修改成功", c)
-	}
-}
-
-// @Tags SysUser
-// @Summary 删除用户
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body request.GetById true "用户ID"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
-// @Router /user/deleteUser [delete]
-func DeleteUser(c *gin.Context) {
-	var reqId request.GetById
-	_ = c.ShouldBindJSON(&reqId)
-	if err := utils.Verify(reqId, utils.IdVerify); err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	jwtId := getUserID(c)
-	if jwtId == uint(reqId.ID) {
-		response.FailWithMessage("删除失败, 自杀失败", c)
-		return
-	}
-	if err := service.DeleteUser(reqId.ID); err != nil {
-		global.GVA_LOG.Error("删除失败!", zap.Any("err", err))
-		response.FailWithMessage("删除失败", c)
-	} else {
-		response.OkWithMessage("删除成功", c)
-	}
-}
-
-// @Tags SysUser
-// @Summary 设置用户信息
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body model.SysUser true "ID, 用户名, 昵称, 头像链接"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"设置成功"}"
-// @Router /user/setUserInfo [put]
-func SetUserInfo(c *gin.Context) {
-	var user model.SysUser
-	_ = c.ShouldBindJSON(&user)
-	if err := utils.Verify(user, utils.IdVerify); err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	if err, ReqUser := service.SetUserInfo(user); err != nil {
-		global.GVA_LOG.Error("设置失败!", zap.Any("err", err))
-		response.FailWithMessage("设置失败", c)
-	} else {
-		response.OkWithDetailed(gin.H{"userInfo": ReqUser}, "设置成功", c)
-	}
-}
-
-// 从Gin的Context中获取从jwt解析出来的用户ID
-func getUserID(c *gin.Context) uint {
-	if claims, exists := c.Get("claims"); !exists {
-		global.GVA_LOG.Error("从Gin的Context中获取从jwt解析出来的用户ID失败, 请检查路由是否使用jwt中间件!")
-		return 0
-	} else {
-		waitUse := claims.(*request.CustomClaims)
-		return waitUse.ID
-	}
-}
-
-// 从Gin的Context中获取从jwt解析出来的用户UUID
-func getUserUuid(c *gin.Context) string {
-	if claims, exists := c.Get("claims"); !exists {
-		global.GVA_LOG.Error("从Gin的Context中获取从jwt解析出来的用户UUID失败, 请检查路由是否使用jwt中间件!")
-		return ""
-	} else {
-		waitUse := claims.(*request.CustomClaims)
-		return waitUse.UUID.String()
-	}
-}
-
-// 从Gin的Context中获取从jwt解析出来的用户角色id
-func getUserAuthorityId(c *gin.Context) string {
-	if claims, exists := c.Get("claims"); !exists {
-		global.GVA_LOG.Error("从Gin的Context中获取从jwt解析出来的用户UUID失败, 请检查路由是否使用jwt中间件!")
-		return ""
-	} else {
-		waitUse := claims.(*request.CustomClaims)
-		return waitUse.AuthorityId
-	}
-}

server/api/v1/system/enter.go

@@ -0,0 +1,38 @@
+package system
+
+import "github.com/flipped-aurora/gin-vue-admin/server/service"
+
+type ApiGroup struct {
+	DBApi
+	JwtApi
+	BaseApi
+	SystemApi
+	CasbinApi
+	AutoCodeApi
+	SystemApiApi
+	AuthorityApi
+	DictionaryApi
+	AuthorityMenuApi
+	OperationRecordApi
+	AutoCodeHistoryApi
+	DictionaryDetailApi
+	AuthorityBtnApi
+}
+
+var (
+	apiService              = service.ServiceGroupApp.SystemServiceGroup.ApiService
+	jwtService              = service.ServiceGroupApp.SystemServiceGroup.JwtService
+	menuService             = service.ServiceGroupApp.SystemServiceGroup.MenuService
+	userService             = service.ServiceGroupApp.SystemServiceGroup.UserService
+	initDBService           = service.ServiceGroupApp.SystemServiceGroup.InitDBService
+	casbinService           = service.ServiceGroupApp.SystemServiceGroup.CasbinService
+	autoCodeService         = service.ServiceGroupApp.SystemServiceGroup.AutoCodeService
+	baseMenuService         = service.ServiceGroupApp.SystemServiceGroup.BaseMenuService
+	authorityService        = service.ServiceGroupApp.SystemServiceGroup.AuthorityService
+	dictionaryService       = service.ServiceGroupApp.SystemServiceGroup.DictionaryService
+	systemConfigService     = service.ServiceGroupApp.SystemServiceGroup.SystemConfigService
+	operationRecordService  = service.ServiceGroupApp.SystemServiceGroup.OperationRecordService
+	autoCodeHistoryService  = service.ServiceGroupApp.SystemServiceGroup.AutoCodeHistoryService
+	dictionaryDetailService = service.ServiceGroupApp.SystemServiceGroup.DictionaryDetailService
+	authorityBtnService     = service.ServiceGroupApp.SystemServiceGroup.AuthorityBtnService
+)

server/api/v1/system/sys_api.go

@@ -0,0 +1,172 @@
+package system
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/system"
+	systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
+	systemRes "github.com/flipped-aurora/gin-vue-admin/server/model/system/response"
+	"github.com/flipped-aurora/gin-vue-admin/server/utils"
+
+	"github.com/gin-gonic/gin"
+	"go.uber.org/zap"
+)
+
+type SystemApiApi struct{}
+
+// @Tags SysApi
+// @Summary 创建基础api
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body system.SysApi true "api路径, api中文描述, api组, 方法"
+// @Success 200 {object} response.Response{msg=string} "创建基础api"
+// @Router /api/createApi [post]
+func (s *SystemApiApi) CreateApi(c *gin.Context) {
+	var api system.SysApi
+	_ = c.ShouldBindJSON(&api)
+	if err := utils.Verify(api, utils.ApiVerify); err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	if err := apiService.CreateApi(api); err != nil {
+		global.GVA_LOG.Error("创建失败!", zap.Error(err))
+		response.FailWithMessage("创建失败", c)
+	} else {
+		response.OkWithMessage("创建成功", c)
+	}
+}
+
+// @Tags SysApi
+// @Summary 删除api
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body system.SysApi true "ID"
+// @Success 200 {object} response.Response{msg=string} "删除api"
+// @Router /api/deleteApi [post]
+func (s *SystemApiApi) DeleteApi(c *gin.Context) {
+	var api system.SysApi
+	_ = c.ShouldBindJSON(&api)
+	if err := utils.Verify(api.GVA_MODEL, utils.IdVerify); err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	if err := apiService.DeleteApi(api); err != nil {
+		global.GVA_LOG.Error("删除失败!", zap.Error(err))
+		response.FailWithMessage("删除失败", c)
+	} else {
+		response.OkWithMessage("删除成功", c)
+	}
+}
+
+// @Tags SysApi
+// @Summary 分页获取API列表
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body systemReq.SearchApiParams true "分页获取API列表"
+// @Success 200 {object} response.Response{data=response.PageResult,msg=string} "分页获取API列表,返回包括列表,总数,页码,每页数量"
+// @Router /api/getApiList [post]
+func (s *SystemApiApi) GetApiList(c *gin.Context) {
+	var pageInfo systemReq.SearchApiParams
+	_ = c.ShouldBindJSON(&pageInfo)
+	if err := utils.Verify(pageInfo.PageInfo, utils.PageInfoVerify); err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	if list, total, err := apiService.GetAPIInfoList(pageInfo.SysApi, pageInfo.PageInfo, pageInfo.OrderKey, pageInfo.Desc); err != nil {
+		global.GVA_LOG.Error("获取失败!", zap.Error(err))
+		response.FailWithMessage("获取失败", c)
+	} else {
+		response.OkWithDetailed(response.PageResult{
+			List:     list,
+			Total:    total,
+			Page:     pageInfo.Page,
+			PageSize: pageInfo.PageSize,
+		}, "获取成功", c)
+	}
+}
+
+// @Tags SysApi
+// @Summary 根据id获取api
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body request.GetById true "根据id获取api"
+// @Success 200 {object} response.Response{data=systemRes.SysAPIResponse} "根据id获取api,返回包括api详情"
+// @Router /api/getApiById [post]
+func (s *SystemApiApi) GetApiById(c *gin.Context) {
+	var idInfo request.GetById
+	_ = c.ShouldBindJSON(&idInfo)
+	if err := utils.Verify(idInfo, utils.IdVerify); err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	api, err := apiService.GetApiById(idInfo.ID)
+	if err != nil {
+		global.GVA_LOG.Error("获取失败!", zap.Error(err))
+		response.FailWithMessage("获取失败", c)
+	} else {
+		response.OkWithDetailed(systemRes.SysAPIResponse{Api: api}, "获取成功", c)
+	}
+}
+
+// @Tags SysApi
+// @Summary 修改基础api
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body system.SysApi true "api路径, api中文描述, api组, 方法"
+// @Success 200 {object} response.Response{msg=string} "修改基础api"
+// @Router /api/updateApi [post]
+func (s *SystemApiApi) UpdateApi(c *gin.Context) {
+	var api system.SysApi
+	_ = c.ShouldBindJSON(&api)
+	if err := utils.Verify(api, utils.ApiVerify); err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	if err := apiService.UpdateApi(api); err != nil {
+		global.GVA_LOG.Error("修改失败!", zap.Error(err))
+		response.FailWithMessage("修改失败", c)
+	} else {
+		response.OkWithMessage("修改成功", c)
+	}
+}
+
+// @Tags SysApi
+// @Summary 获取所有的Api 不分页
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Success 200 {object} response.Response{data=systemRes.SysAPIListResponse,msg=string} "获取所有的Api 不分页,返回包括api列表"
+// @Router /api/getAllApis [post]
+func (s *SystemApiApi) GetAllApis(c *gin.Context) {
+	if apis, err := apiService.GetAllApis(); err != nil {
+		global.GVA_LOG.Error("获取失败!", zap.Error(err))
+		response.FailWithMessage("获取失败", c)
+	} else {
+		response.OkWithDetailed(systemRes.SysAPIListResponse{Apis: apis}, "获取成功", c)
+	}
+}
+
+// @Tags SysApi
+// @Summary 删除选中Api
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body request.IdsReq true "ID"
+// @Success 200 {object} response.Response{msg=string} "删除选中Api"
+// @Router /api/deleteApisByIds [delete]
+func (s *SystemApiApi) DeleteApisByIds(c *gin.Context) {
+	var ids request.IdsReq
+	_ = c.ShouldBindJSON(&ids)
+	if err := apiService.DeleteApisByIds(ids); err != nil {
+		global.GVA_LOG.Error("删除失败!", zap.Error(err))
+		response.FailWithMessage("删除失败", c)
+	} else {
+		response.OkWithMessage("删除成功", c)
+	}
+}

server/api/v1/system/sys_authority.go

@@ -0,0 +1,165 @@
+package system
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/system"
+	systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
+	systemRes "github.com/flipped-aurora/gin-vue-admin/server/model/system/response"
+	"github.com/flipped-aurora/gin-vue-admin/server/utils"
+
+	"github.com/gin-gonic/gin"
+	"go.uber.org/zap"
+)
+
+type AuthorityApi struct{}
+
+// @Tags Authority
+// @Summary 创建角色
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body system.SysAuthority true "权限id, 权限名, 父角色id"
+// @Success 200 {object} response.Response{data=systemRes.SysAuthorityResponse,msg=string} "创建角色,返回包括系统角色详情"
+// @Router /authority/createAuthority [post]
+func (a *AuthorityApi) CreateAuthority(c *gin.Context) {
+	var authority system.SysAuthority
+	_ = c.ShouldBindJSON(&authority)
+	if err := utils.Verify(authority, utils.AuthorityVerify); err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	if authBack, err := authorityService.CreateAuthority(authority); err != nil {
+		global.GVA_LOG.Error("创建失败!", zap.Error(err))
+		response.FailWithMessage("创建失败"+err.Error(), c)
+	} else {
+		_ = menuService.AddMenuAuthority(systemReq.DefaultMenu(), authority.AuthorityId)
+		_ = casbinService.UpdateCasbin(authority.AuthorityId, systemReq.DefaultCasbin())
+		response.OkWithDetailed(systemRes.SysAuthorityResponse{Authority: authBack}, "创建成功", c)
+	}
+}
+
+// @Tags Authority
+// @Summary 拷贝角色
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body response.SysAuthorityCopyResponse true "旧角色id, 新权限id, 新权限名, 新父角色id"
+// @Success 200 {object} response.Response{data=systemRes.SysAuthorityResponse,msg=string} "拷贝角色,返回包括系统角色详情"
+// @Router /authority/copyAuthority [post]
+func (a *AuthorityApi) CopyAuthority(c *gin.Context) {
+	var copyInfo systemRes.SysAuthorityCopyResponse
+	_ = c.ShouldBindJSON(&copyInfo)
+	if err := utils.Verify(copyInfo, utils.OldAuthorityVerify); err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	if err := utils.Verify(copyInfo.Authority, utils.AuthorityVerify); err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	if authBack, err := authorityService.CopyAuthority(copyInfo); err != nil {
+		global.GVA_LOG.Error("拷贝失败!", zap.Error(err))
+		response.FailWithMessage("拷贝失败"+err.Error(), c)
+	} else {
+		response.OkWithDetailed(systemRes.SysAuthorityResponse{Authority: authBack}, "拷贝成功", c)
+	}
+}
+
+// @Tags Authority
+// @Summary 删除角色
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body system.SysAuthority true "删除角色"
+// @Success 200 {object} response.Response{msg=string} "删除角色"
+// @Router /authority/deleteAuthority [post]
+func (a *AuthorityApi) DeleteAuthority(c *gin.Context) {
+	var authority system.SysAuthority
+	_ = c.ShouldBindJSON(&authority)
+	if err := utils.Verify(authority, utils.AuthorityIdVerify); err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	if err := authorityService.DeleteAuthority(&authority); err != nil { // 删除角色之前需要判断是否有用户正在使用此角色
+		global.GVA_LOG.Error("删除失败!", zap.Error(err))
+		response.FailWithMessage("删除失败"+err.Error(), c)
+	} else {
+		response.OkWithMessage("删除成功", c)
+	}
+}
+
+// @Tags Authority
+// @Summary 更新角色信息
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body system.SysAuthority true "权限id, 权限名, 父角色id"
+// @Success 200 {object} response.Response{data=systemRes.SysAuthorityResponse,msg=string} "更新角色信息,返回包括系统角色详情"
+// @Router /authority/updateAuthority [post]
+func (a *AuthorityApi) UpdateAuthority(c *gin.Context) {
+	var auth system.SysAuthority
+	_ = c.ShouldBindJSON(&auth)
+	if err := utils.Verify(auth, utils.AuthorityVerify); err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	if authority, err := authorityService.UpdateAuthority(auth); err != nil {
+		global.GVA_LOG.Error("更新失败!", zap.Error(err))
+		response.FailWithMessage("更新失败"+err.Error(), c)
+	} else {
+		response.OkWithDetailed(systemRes.SysAuthorityResponse{Authority: authority}, "更新成功", c)
+	}
+}
+
+// @Tags Authority
+// @Summary 分页获取角色列表
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body request.PageInfo true "页码, 每页大小"
+// @Success 200 {object} response.Response{data=response.PageResult,msg=string} "分页获取角色列表,返回包括列表,总数,页码,每页数量"
+// @Router /authority/getAuthorityList [post]
+func (a *AuthorityApi) GetAuthorityList(c *gin.Context) {
+	var pageInfo request.PageInfo
+	_ = c.ShouldBindJSON(&pageInfo)
+	if err := utils.Verify(pageInfo, utils.PageInfoVerify); err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	if list, total, err := authorityService.GetAuthorityInfoList(pageInfo); err != nil {
+		global.GVA_LOG.Error("获取失败!", zap.Error(err))
+		response.FailWithMessage("获取失败"+err.Error(), c)
+	} else {
+		response.OkWithDetailed(response.PageResult{
+			List:     list,
+			Total:    total,
+			Page:     pageInfo.Page,
+			PageSize: pageInfo.PageSize,
+		}, "获取成功", c)
+	}
+}
+
+// @Tags Authority
+// @Summary 设置角色资源权限
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body system.SysAuthority true "设置角色资源权限"
+// @Success 200 {object} response.Response{msg=string} "设置角色资源权限"
+// @Router /authority/setDataAuthority [post]
+func (a *AuthorityApi) SetDataAuthority(c *gin.Context) {
+	var auth system.SysAuthority
+	_ = c.ShouldBindJSON(&auth)
+	if err := utils.Verify(auth, utils.AuthorityIdVerify); err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	if err := authorityService.SetDataAuthority(auth); err != nil {
+		global.GVA_LOG.Error("设置失败!", zap.Error(err))
+		response.FailWithMessage("设置失败"+err.Error(), c)
+	} else {
+		response.OkWithMessage("设置成功", c)
+	}
+}

server/api/v1/system/sys_authority_btn.go

@@ -0,0 +1,66 @@
+package system
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
+	"github.com/gin-gonic/gin"
+	"go.uber.org/zap"
+)
+
+type AuthorityBtnApi struct{}
+
+// @Tags AuthorityBtn
+// @Summary 获取权限按钮
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body request.SysAuthorityBtnReq true "菜单id, 角色id, 选中的按钮id"
+// @Success 200 {object} response.Response{data=response.SysAuthorityBtnRes,msg=string} "返回列表成功"
+// @Router /authorityBtn/getAuthorityBtn [post]
+func (a *AuthorityBtnApi) GetAuthorityBtn(c *gin.Context) {
+	var req request.SysAuthorityBtnReq
+	_ = c.ShouldBindJSON(&req)
+	if res, err := authorityBtnService.GetAuthorityBtn(req); err != nil {
+		global.GVA_LOG.Error("查询失败!", zap.Error(err))
+		response.FailWithMessage("查询失败", c)
+	} else {
+		response.OkWithDetailed(res, "查询成功", c)
+	}
+}
+
+// @Tags AuthorityBtn
+// @Summary 设置权限按钮
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body request.SysAuthorityBtnReq true "菜单id, 角色id, 选中的按钮id"
+// @Success 200 {object} response.Response{msg=string} "返回列表成功"
+// @Router /authorityBtn/setAuthorityBtn [post]
+func (a *AuthorityBtnApi) SetAuthorityBtn(c *gin.Context) {
+	var req request.SysAuthorityBtnReq
+	_ = c.ShouldBindJSON(&req)
+	if err := authorityBtnService.SetAuthorityBtn(req); err != nil {
+		global.GVA_LOG.Error("分配失败!", zap.Error(err))
+		response.FailWithMessage("分配失败", c)
+	} else {
+		response.OkWithMessage("分配成功", c)
+	}
+}
+
+// @Tags AuthorityBtn
+// @Summary 设置权限按钮
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Success 200 {object} response.Response{msg=string} "删除成功"
+// @Router /authorityBtn/canRemoveAuthorityBtn [post]
+func (a *AuthorityBtnApi) CanRemoveAuthorityBtn(c *gin.Context) {
+	id := c.Query("id")
+	if err := authorityBtnService.CanRemoveAuthorityBtn(id); err != nil {
+		global.GVA_LOG.Error("删除失败!", zap.Error(err))
+		response.FailWithMessage(err.Error(), c)
+	} else {
+		response.OkWithMessage("删除成功", c)
+	}
+}

server/api/v1/system/sys_auto_code.go

@@ -0,0 +1,242 @@
+package system
+
+import (
+	"errors"
+	"fmt"
+	"golang.org/x/text/cases"
+	"golang.org/x/text/language"
+	"net/url"
+	"os"
+	"strings"
+
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/system"
+	"github.com/flipped-aurora/gin-vue-admin/server/utils"
+
+	"github.com/gin-gonic/gin"
+	"go.uber.org/zap"
+)
+
+type AutoCodeApi struct{}
+
+var caser = cases.Title(language.English)
+
+// PreviewTemp
+// @Tags AutoCode
+// @Summary 预览创建后的代码
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body system.AutoCodeStruct true "预览创建代码"
+// @Success 200 {object} response.Response{data=map[string]interface{},msg=string} "预览创建后的代码"
+// @Router /autoCode/preview [post]
+func (autoApi *AutoCodeApi) PreviewTemp(c *gin.Context) {
+	var a system.AutoCodeStruct
+	_ = c.ShouldBindJSON(&a)
+	if err := utils.Verify(a, utils.AutoCodeVerify); err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	a.KeyWord() // 处理go关键字
+	a.PackageT = caser.String(a.Package)
+	autoCode, err := autoCodeService.PreviewTemp(a)
+	if err != nil {
+		global.GVA_LOG.Error("预览失败!", zap.Error(err))
+		response.FailWithMessage("预览失败", c)
+	} else {
+		response.OkWithDetailed(gin.H{"autoCode": autoCode}, "预览成功", c)
+	}
+}
+
+// CreateTemp
+// @Tags AutoCode
+// @Summary 自动代码模板
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body system.AutoCodeStruct true "创建自动代码"
+// @Success 200 {string} string "{"success":true,"data":{},"msg":"创建成功"}"
+// @Router /autoCode/createTemp [post]
+func (autoApi *AutoCodeApi) CreateTemp(c *gin.Context) {
+	var a system.AutoCodeStruct
+	_ = c.ShouldBindJSON(&a)
+	if err := utils.Verify(a, utils.AutoCodeVerify); err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	a.KeyWord() // 处理go关键字
+	var apiIds []uint
+	if a.AutoCreateApiToSql {
+		if ids, err := autoCodeService.AutoCreateApi(&a); err != nil {
+			global.GVA_LOG.Error("自动化创建失败!请自行清空垃圾数据!", zap.Error(err))
+			c.Writer.Header().Add("success", "false")
+			c.Writer.Header().Add("msg", url.QueryEscape("自动化创建失败!请自行清空垃圾数据!"))
+			return
+		} else {
+			apiIds = ids
+		}
+	}
+	a.PackageT = caser.String(a.Package)
+	err := autoCodeService.CreateTemp(a, apiIds...)
+	if err != nil {
+		if errors.Is(err, system.AutoMoveErr) {
+			c.Writer.Header().Add("success", "true")
+			c.Writer.Header().Add("msg", url.QueryEscape(err.Error()))
+		} else {
+			c.Writer.Header().Add("success", "false")
+			c.Writer.Header().Add("msg", url.QueryEscape(err.Error()))
+			_ = os.Remove("./ginvueadmin.zip")
+		}
+	} else {
+		c.Writer.Header().Add("Content-Disposition", fmt.Sprintf("attachment; filename=%s", "ginvueadmin.zip")) // fmt.Sprintf("attachment; filename=%s", filename)对下载的文件重命名
+		c.Writer.Header().Add("Content-Type", "application/json")
+		c.Writer.Header().Add("success", "true")
+		c.File("./ginvueadmin.zip")
+		_ = os.Remove("./ginvueadmin.zip")
+	}
+}
+
+// GetDB
+// @Tags AutoCode
+// @Summary 获取当前所有数据库
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Success 200 {object} response.Response{data=map[string]interface{},msg=string} "获取当前所有数据库"
+// @Router /autoCode/getDatabase [get]
+func (autoApi *AutoCodeApi) GetDB(c *gin.Context) {
+	dbs, err := autoCodeService.Database().GetDB()
+	if err != nil {
+		global.GVA_LOG.Error("获取失败!", zap.Error(err))
+		response.FailWithMessage("获取失败", c)
+	} else {
+		response.OkWithDetailed(gin.H{"dbs": dbs}, "获取成功", c)
+	}
+}
+
+// GetTables
+// @Tags AutoCode
+// @Summary 获取当前数据库所有表
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Success 200 {object} response.Response{data=map[string]interface{},msg=string} "获取当前数据库所有表"
+// @Router /autoCode/getTables [get]
+func (autoApi *AutoCodeApi) GetTables(c *gin.Context) {
+	dbName := c.DefaultQuery("dbName", global.GVA_CONFIG.Mysql.Dbname)
+	tables, err := autoCodeService.Database().GetTables(dbName)
+	if err != nil {
+		global.GVA_LOG.Error("查询table失败!", zap.Error(err))
+		response.FailWithMessage("查询table失败", c)
+	} else {
+		response.OkWithDetailed(gin.H{"tables": tables}, "获取成功", c)
+	}
+}
+
+// GetColumn
+// @Tags AutoCode
+// @Summary 获取当前表所有字段
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Success 200 {object} response.Response{data=map[string]interface{},msg=string} "获取当前表所有字段"
+// @Router /autoCode/getColumn [get]
+func (autoApi *AutoCodeApi) GetColumn(c *gin.Context) {
+	dbName := c.DefaultQuery("dbName", global.GVA_CONFIG.Mysql.Dbname)
+	tableName := c.Query("tableName")
+	columns, err := autoCodeService.Database().GetColumn(tableName, dbName)
+	if err != nil {
+		global.GVA_LOG.Error("获取失败!", zap.Error(err))
+		response.FailWithMessage("获取失败", c)
+	} else {
+		response.OkWithDetailed(gin.H{"columns": columns}, "获取成功", c)
+	}
+}
+
+// CreatePackage
+// @Tags AutoCode
+// @Summary 创建package
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body system.SysAutoCode true "创建package"
+// @Success 200 {object} response.Response{data=map[string]interface{},msg=string} "创建package成功"
+// @Router /autoCode/createPackage [post]
+func (autoApi *AutoCodeApi) CreatePackage(c *gin.Context) {
+	var a system.SysAutoCode
+	_ = c.ShouldBindJSON(&a)
+	if err := utils.Verify(a, utils.AutoPackageVerify); err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	err := autoCodeService.CreateAutoCode(&a)
+	if err != nil {
+		global.GVA_LOG.Error("创建成功!", zap.Error(err))
+		response.FailWithMessage("创建失败", c)
+	} else {
+		response.OkWithMessage("创建成功", c)
+	}
+}
+
+// GetPackage
+// @Tags AutoCode
+// @Summary 获取package
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Success 200 {object} response.Response{data=map[string]interface{},msg=string} "创建package成功"
+// @Router /autoCode/getPackage [post]
+func (autoApi *AutoCodeApi) GetPackage(c *gin.Context) {
+	pkgs, err := autoCodeService.GetPackage()
+	if err != nil {
+		global.GVA_LOG.Error("获取失败!", zap.Error(err))
+		response.FailWithMessage("获取失败", c)
+	} else {
+		response.OkWithDetailed(gin.H{"pkgs": pkgs}, "获取成功", c)
+	}
+}
+
+// DelPackage
+// @Tags AutoCode
+// @Summary 删除package
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body system.SysAutoCode true "创建package"
+// @Success 200 {object} response.Response{data=map[string]interface{},msg=string} "删除package成功"
+// @Router /autoCode/delPackage [post]
+func (autoApi *AutoCodeApi) DelPackage(c *gin.Context) {
+	var a system.SysAutoCode
+	_ = c.ShouldBindJSON(&a)
+	err := autoCodeService.DelPackage(a)
+	if err != nil {
+		global.GVA_LOG.Error("删除失败!", zap.Error(err))
+		response.FailWithMessage("删除失败", c)
+	} else {
+		response.OkWithMessage("删除成功", c)
+	}
+}
+
+// AutoPlug
+// @Tags AutoCode
+// @Summary 创建插件模板
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body system.SysAutoCode true "创建插件模板"
+// @Success 200 {object} response.Response{data=map[string]interface{},msg=string} "创建插件模板成功"
+// @Router /autoCode/createPlug [post]
+func (autoApi *AutoCodeApi) AutoPlug(c *gin.Context) {
+	var a system.AutoPlugReq
+	_ = c.ShouldBindJSON(&a)
+	a.Snake = strings.ToLower(a.PlugName)
+	a.NeedModel = a.HasRequest || a.HasResponse
+	err := autoCodeService.CreatePlug(a)
+	if err != nil {
+		global.GVA_LOG.Error("预览失败!", zap.Error(err))
+		response.FailWithMessage("预览失败", c)
+	} else {
+		response.Ok(c)
+	}
+}

server/api/v1/system/sys_auto_code_history.go

@@ -0,0 +1,98 @@
+package system
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
+	systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
+	"github.com/gin-gonic/gin"
+	"go.uber.org/zap"
+)
+
+type AutoCodeHistoryApi struct{}
+
+// First
+// @Tags AutoCode
+// @Summary 获取meta信息
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body request.GetById true "请求参数"
+// @Success 200 {object} response.Response{data=map[string]interface{},msg=string} "获取meta信息"
+// @Router /autoCode/getMeta [post]
+func (a *AutoCodeHistoryApi) First(c *gin.Context) {
+	var info request.GetById
+	_ = c.ShouldBindJSON(&info)
+	data, err := autoCodeHistoryService.First(&info)
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	response.OkWithDetailed(gin.H{"meta": data}, "获取成功", c)
+}
+
+// Delete
+// @Tags AutoCode
+// @Summary 删除回滚记录
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body request.GetById true "请求参数"
+// @Success 200 {object} response.Response{msg=string} "删除回滚记录"
+// @Router /autoCode/delSysHistory [post]
+func (a *AutoCodeHistoryApi) Delete(c *gin.Context) {
+	var info request.GetById
+	_ = c.ShouldBindJSON(&info)
+	err := autoCodeHistoryService.Delete(&info)
+	if err != nil {
+		global.GVA_LOG.Error("删除失败!", zap.Error(err))
+		response.FailWithMessage("删除失败", c)
+		return
+	}
+	response.OkWithMessage("删除成功", c)
+}
+
+// RollBack
+// @Tags AutoCode
+// @Summary 回滚自动生成代码
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body systemReq.RollBack true "请求参数"
+// @Success 200 {object} response.Response{msg=string} "回滚自动生成代码"
+// @Router /autoCode/rollback [post]
+func (a *AutoCodeHistoryApi) RollBack(c *gin.Context) {
+	var info systemReq.RollBack
+	_ = c.ShouldBindJSON(&info)
+	if err := autoCodeHistoryService.RollBack(&info); err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	response.OkWithMessage("回滚成功", c)
+}
+
+// GetList
+// @Tags AutoCode
+// @Summary 查询回滚记录
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body systemReq.SysAutoHistory true "请求参数"
+// @Success 200 {object} response.Response{data=response.PageResult,msg=string} "查询回滚记录,返回包括列表,总数,页码,每页数量"
+// @Router /autoCode/getSysHistory [post]
+func (a *AutoCodeHistoryApi) GetList(c *gin.Context) {
+	var search systemReq.SysAutoHistory
+	_ = c.ShouldBindJSON(&search)
+	list, total, err := autoCodeHistoryService.GetList(search.PageInfo)
+	if err != nil {
+		global.GVA_LOG.Error("获取失败!", zap.Error(err))
+		response.FailWithMessage("获取失败", c)
+		return
+	}
+	response.OkWithDetailed(response.PageResult{
+		List:     list,
+		Total:    total,
+		Page:     search.Page,
+		PageSize: search.PageSize,
+	}, "获取成功", c)
+}

server/api/v1/system/sys_captcha.go

@@ -0,0 +1,42 @@
+package system
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
+	systemRes "github.com/flipped-aurora/gin-vue-admin/server/model/system/response"
+	"github.com/gin-gonic/gin"
+	"github.com/mojocn/base64Captcha"
+	"go.uber.org/zap"
+)
+
+// 当开启多服务器部署时，替换下面的配置，使用redis共享存储验证码
+// var store = captcha.NewDefaultRedisStore()
+var store = base64Captcha.DefaultMemStore
+
+type BaseApi struct{}
+
+// Captcha
+// @Tags Base
+// @Summary 生成验证码
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Success 200 {object} response.Response{data=systemRes.SysCaptchaResponse,msg=string} "生成验证码,返回包括随机数id,base64,验证码长度"
+// @Router /base/captcha [post]
+func (b *BaseApi) Captcha(c *gin.Context) {
+	// 字符,公式,验证码配置
+	// 生成默认数字的driver
+	driver := base64Captcha.NewDriverDigit(global.GVA_CONFIG.Captcha.ImgHeight, global.GVA_CONFIG.Captcha.ImgWidth, global.GVA_CONFIG.Captcha.KeyLong, 0.7, 80)
+	// cp := base64Captcha.NewCaptcha(driver, store.UseWithCtx(c))   // v8下使用redis
+	cp := base64Captcha.NewCaptcha(driver, store)
+	if id, b64s, err := cp.Generate(); err != nil {
+		global.GVA_LOG.Error("验证码获取失败!", zap.Error(err))
+		response.FailWithMessage("验证码获取失败", c)
+	} else {
+		response.OkWithDetailed(systemRes.SysCaptchaResponse{
+			CaptchaId:     id,
+			PicPath:       b64s,
+			CaptchaLength: global.GVA_CONFIG.Captcha.KeyLong,
+		}, "验证码获取成功", c)
+	}
+}

server/api/v1/system/sys_casbin.go

@@ -1,32 +1,34 @@
-package v1
+package system
 
 import (
-	"gin-vue-admin/global"
-	"gin-vue-admin/model/request"
-	"gin-vue-admin/model/response"
-	"gin-vue-admin/service"
-	"gin-vue-admin/utils"
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
+	systemRes "github.com/flipped-aurora/gin-vue-admin/server/model/system/response"
+	"github.com/flipped-aurora/gin-vue-admin/server/utils"
 	"github.com/gin-gonic/gin"
 	"go.uber.org/zap"
 )
 
+type CasbinApi struct{}
+
 // @Tags Casbin
 // @Summary 更新角色api权限
 // @Security ApiKeyAuth
 // @accept application/json
 // @Produce application/json
 // @Param data body request.CasbinInReceive true "权限id, 权限模型列表"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"更新成功"}"
+// @Success 200 {object} response.Response{msg=string} "更新角色api权限"
 // @Router /casbin/UpdateCasbin [post]
-func UpdateCasbin(c *gin.Context) {
+func (cas *CasbinApi) UpdateCasbin(c *gin.Context) {
 	var cmr request.CasbinInReceive
 	_ = c.ShouldBindJSON(&cmr)
 	if err := utils.Verify(cmr, utils.AuthorityIdVerify); err != nil {
 		response.FailWithMessage(err.Error(), c)
 		return
 	}
-	if err := service.UpdateCasbin(cmr.AuthorityId, cmr.CasbinInfos); err != nil {
-		global.GVA_LOG.Error("更新失败!", zap.Any("err", err))
+	if err := casbinService.UpdateCasbin(cmr.AuthorityId, cmr.CasbinInfos); err != nil {
+		global.GVA_LOG.Error("更新失败!", zap.Error(err))
 		response.FailWithMessage("更新失败", c)
 	} else {
 		response.OkWithMessage("更新成功", c)
@@ -39,15 +41,15 @@ func UpdateCasbin(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body request.CasbinInReceive true "权限id, 权限模型列表"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
+// @Success 200 {object} response.Response{data=systemRes.PolicyPathResponse,msg=string} "获取权限列表,返回包括casbin详情列表"
 // @Router /casbin/getPolicyPathByAuthorityId [post]
-func GetPolicyPathByAuthorityId(c *gin.Context) {
+func (cas *CasbinApi) GetPolicyPathByAuthorityId(c *gin.Context) {
 	var casbin request.CasbinInReceive
 	_ = c.ShouldBindJSON(&casbin)
 	if err := utils.Verify(casbin, utils.AuthorityIdVerify); err != nil {
 		response.FailWithMessage(err.Error(), c)
 		return
 	}
-	paths := service.GetPolicyPathByAuthorityId(casbin.AuthorityId)
-	response.OkWithDetailed(response.PolicyPathResponse{Paths: paths}, "获取成功", c)
+	paths := casbinService.GetPolicyPathByAuthorityId(casbin.AuthorityId)
+	response.OkWithDetailed(systemRes.PolicyPathResponse{Paths: paths}, "获取成功", c)
 }

server/api/v1/system/sys_dictionary.go

@@ -0,0 +1,117 @@
+package system
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/system"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
+	"github.com/flipped-aurora/gin-vue-admin/server/utils"
+	"github.com/gin-gonic/gin"
+	"go.uber.org/zap"
+)
+
+type DictionaryApi struct{}
+
+// @Tags SysDictionary
+// @Summary 创建SysDictionary
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body system.SysDictionary true "SysDictionary模型"
+// @Success 200 {object} response.Response{msg=string} "创建SysDictionary"
+// @Router /sysDictionary/createSysDictionary [post]
+func (s *DictionaryApi) CreateSysDictionary(c *gin.Context) {
+	var dictionary system.SysDictionary
+	_ = c.ShouldBindJSON(&dictionary)
+	if err := dictionaryService.CreateSysDictionary(dictionary); err != nil {
+		global.GVA_LOG.Error("创建失败!", zap.Error(err))
+		response.FailWithMessage("创建失败", c)
+	} else {
+		response.OkWithMessage("创建成功", c)
+	}
+}
+
+// @Tags SysDictionary
+// @Summary 删除SysDictionary
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body system.SysDictionary true "SysDictionary模型"
+// @Success 200 {object} response.Response{msg=string} "删除SysDictionary"
+// @Router /sysDictionary/deleteSysDictionary [delete]
+func (s *DictionaryApi) DeleteSysDictionary(c *gin.Context) {
+	var dictionary system.SysDictionary
+	_ = c.ShouldBindJSON(&dictionary)
+	if err := dictionaryService.DeleteSysDictionary(dictionary); err != nil {
+		global.GVA_LOG.Error("删除失败!", zap.Error(err))
+		response.FailWithMessage("删除失败", c)
+	} else {
+		response.OkWithMessage("删除成功", c)
+	}
+}
+
+// @Tags SysDictionary
+// @Summary 更新SysDictionary
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body system.SysDictionary true "SysDictionary模型"
+// @Success 200 {object} response.Response{msg=string} "更新SysDictionary"
+// @Router /sysDictionary/updateSysDictionary [put]
+func (s *DictionaryApi) UpdateSysDictionary(c *gin.Context) {
+	var dictionary system.SysDictionary
+	_ = c.ShouldBindJSON(&dictionary)
+	if err := dictionaryService.UpdateSysDictionary(&dictionary); err != nil {
+		global.GVA_LOG.Error("更新失败!", zap.Error(err))
+		response.FailWithMessage("更新失败", c)
+	} else {
+		response.OkWithMessage("更新成功", c)
+	}
+}
+
+// @Tags SysDictionary
+// @Summary 用id查询SysDictionary
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data query system.SysDictionary true "ID或字典英名"
+// @Success 200 {object} response.Response{data=map[string]interface{},msg=string} "用id查询SysDictionary"
+// @Router /sysDictionary/findSysDictionary [get]
+func (s *DictionaryApi) FindSysDictionary(c *gin.Context) {
+	var dictionary system.SysDictionary
+	_ = c.ShouldBindQuery(&dictionary)
+	if sysDictionary, err := dictionaryService.GetSysDictionary(dictionary.Type, dictionary.ID, dictionary.Status); err != nil {
+		global.GVA_LOG.Error("字典未创建或未开启!", zap.Error(err))
+		response.FailWithMessage("字典未创建或未开启", c)
+	} else {
+		response.OkWithDetailed(gin.H{"resysDictionary": sysDictionary}, "查询成功", c)
+	}
+}
+
+// @Tags SysDictionary
+// @Summary 分页获取SysDictionary列表
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data query request.SysDictionarySearch true "页码, 每页大小, 搜索条件"
+// @Success 200 {object} response.Response{data=response.PageResult,msg=string} "分页获取SysDictionary列表,返回包括列表,总数,页码,每页数量"
+// @Router /sysDictionary/getSysDictionaryList [get]
+func (s *DictionaryApi) GetSysDictionaryList(c *gin.Context) {
+	var pageInfo request.SysDictionarySearch
+	_ = c.ShouldBindQuery(&pageInfo)
+	if err := utils.Verify(pageInfo.PageInfo, utils.PageInfoVerify); err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	if list, total, err := dictionaryService.GetSysDictionaryInfoList(pageInfo); err != nil {
+		global.GVA_LOG.Error("获取失败!", zap.Error(err))
+		response.FailWithMessage("获取失败", c)
+	} else {
+		response.OkWithDetailed(response.PageResult{
+			List:     list,
+			Total:    total,
+			Page:     pageInfo.Page,
+			PageSize: pageInfo.PageSize,
+		}, "获取成功", c)
+	}
+}

server/api/v1/system/sys_dictionary_detail.go

@@ -0,0 +1,117 @@
+package system
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/system"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
+	"github.com/flipped-aurora/gin-vue-admin/server/utils"
+	"github.com/gin-gonic/gin"
+	"go.uber.org/zap"
+)
+
+type DictionaryDetailApi struct{}
+
+// @Tags SysDictionaryDetail
+// @Summary 创建SysDictionaryDetail
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body system.SysDictionaryDetail true "SysDictionaryDetail模型"
+// @Success 200 {object} response.Response{msg=string} "创建SysDictionaryDetail"
+// @Router /sysDictionaryDetail/createSysDictionaryDetail [post]
+func (s *DictionaryDetailApi) CreateSysDictionaryDetail(c *gin.Context) {
+	var detail system.SysDictionaryDetail
+	_ = c.ShouldBindJSON(&detail)
+	if err := dictionaryDetailService.CreateSysDictionaryDetail(detail); err != nil {
+		global.GVA_LOG.Error("创建失败!", zap.Error(err))
+		response.FailWithMessage("创建失败", c)
+	} else {
+		response.OkWithMessage("创建成功", c)
+	}
+}
+
+// @Tags SysDictionaryDetail
+// @Summary 删除SysDictionaryDetail
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body system.SysDictionaryDetail true "SysDictionaryDetail模型"
+// @Success 200 {object} response.Response{msg=string} "删除SysDictionaryDetail"
+// @Router /sysDictionaryDetail/deleteSysDictionaryDetail [delete]
+func (s *DictionaryDetailApi) DeleteSysDictionaryDetail(c *gin.Context) {
+	var detail system.SysDictionaryDetail
+	_ = c.ShouldBindJSON(&detail)
+	if err := dictionaryDetailService.DeleteSysDictionaryDetail(detail); err != nil {
+		global.GVA_LOG.Error("删除失败!", zap.Error(err))
+		response.FailWithMessage("删除失败", c)
+	} else {
+		response.OkWithMessage("删除成功", c)
+	}
+}
+
+// @Tags SysDictionaryDetail
+// @Summary 更新SysDictionaryDetail
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body system.SysDictionaryDetail true "更新SysDictionaryDetail"
+// @Success 200 {object} response.Response{msg=string} "更新SysDictionaryDetail"
+// @Router /sysDictionaryDetail/updateSysDictionaryDetail [put]
+func (s *DictionaryDetailApi) UpdateSysDictionaryDetail(c *gin.Context) {
+	var detail system.SysDictionaryDetail
+	_ = c.ShouldBindJSON(&detail)
+	if err := dictionaryDetailService.UpdateSysDictionaryDetail(&detail); err != nil {
+		global.GVA_LOG.Error("更新失败!", zap.Error(err))
+		response.FailWithMessage("更新失败", c)
+	} else {
+		response.OkWithMessage("更新成功", c)
+	}
+}
+
+// @Tags SysDictionaryDetail
+// @Summary 用id查询SysDictionaryDetail
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data query system.SysDictionaryDetail true "用id查询SysDictionaryDetail"
+// @Success 200 {object} response.Response{data=map[string]interface{},msg=string} "用id查询SysDictionaryDetail"
+// @Router /sysDictionaryDetail/findSysDictionaryDetail [get]
+func (s *DictionaryDetailApi) FindSysDictionaryDetail(c *gin.Context) {
+	var detail system.SysDictionaryDetail
+	_ = c.ShouldBindQuery(&detail)
+	if err := utils.Verify(detail, utils.IdVerify); err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	if reSysDictionaryDetail, err := dictionaryDetailService.GetSysDictionaryDetail(detail.ID); err != nil {
+		global.GVA_LOG.Error("查询失败!", zap.Error(err))
+		response.FailWithMessage("查询失败", c)
+	} else {
+		response.OkWithDetailed(gin.H{"reSysDictionaryDetail": reSysDictionaryDetail}, "查询成功", c)
+	}
+}
+
+// @Tags SysDictionaryDetail
+// @Summary 分页获取SysDictionaryDetail列表
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data query request.SysDictionaryDetailSearch true "页码, 每页大小, 搜索条件"
+// @Success 200 {object} response.Response{data=response.PageResult,msg=string} "分页获取SysDictionaryDetail列表,返回包括列表,总数,页码,每页数量"
+// @Router /sysDictionaryDetail/getSysDictionaryDetailList [get]
+func (s *DictionaryDetailApi) GetSysDictionaryDetailList(c *gin.Context) {
+	var pageInfo request.SysDictionaryDetailSearch
+	_ = c.ShouldBindQuery(&pageInfo)
+	if list, total, err := dictionaryDetailService.GetSysDictionaryDetailInfoList(pageInfo); err != nil {
+		global.GVA_LOG.Error("获取失败!", zap.Error(err))
+		response.FailWithMessage("获取失败", c)
+	} else {
+		response.OkWithDetailed(response.PageResult{
+			List:     list,
+			Total:    total,
+			Page:     pageInfo.Page,
+			PageSize: pageInfo.PageSize,
+		}, "获取成功", c)
+	}
+}

server/api/v1/system/sys_initdb.go

@@ -0,0 +1,60 @@
+package system
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
+	"go.uber.org/zap"
+
+	"github.com/gin-gonic/gin"
+)
+
+type DBApi struct{}
+
+// InitDB
+// @Tags InitDB
+// @Summary 初始化用户数据库
+// @Produce  application/json
+// @Param data body request.InitDB true "初始化数据库参数"
+// @Success 200 {object} response.Response{data=string} "初始化用户数据库"
+// @Router /init/initdb [post]
+func (i *DBApi) InitDB(c *gin.Context) {
+	if global.GVA_DB != nil {
+		global.GVA_LOG.Error("已存在数据库配置!")
+		response.FailWithMessage("已存在数据库配置", c)
+		return
+	}
+	var dbInfo request.InitDB
+	if err := c.ShouldBindJSON(&dbInfo); err != nil {
+		global.GVA_LOG.Error("参数校验不通过!", zap.Error(err))
+		response.FailWithMessage("参数校验不通过", c)
+		return
+	}
+	if err := initDBService.InitDB(dbInfo); err != nil {
+		global.GVA_LOG.Error("自动创建数据库失败!", zap.Error(err))
+		response.FailWithMessage("自动创建数据库失败，请查看后台日志，检查后在进行初始化", c)
+		return
+	}
+	response.OkWithMessage("自动创建数据库成功", c)
+}
+
+// CheckDB
+// @Tags CheckDB
+// @Summary 初始化用户数据库
+// @Produce  application/json
+// @Success 200 {object} response.Response{data=map[string]interface{},msg=string} "初始化用户数据库"
+// @Router /init/checkdb [post]
+func (i *DBApi) CheckDB(c *gin.Context) {
+	var (
+		message  = "前往初始化数据库"
+		needInit = true
+	)
+
+	if global.GVA_DB != nil {
+		message = "数据库无需初始化"
+		needInit = false
+	}
+	global.GVA_LOG.Info(message)
+	response.OkWithDetailed(gin.H{"needInit": needInit}, message, c)
+	return
+}

server/api/v1/system/sys_jwt_blacklist.go

@@ -0,0 +1,29 @@
+package system
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/system"
+	"github.com/gin-gonic/gin"
+	"go.uber.org/zap"
+)
+
+type JwtApi struct{}
+
+// @Tags Jwt
+// @Summary jwt加入黑名单
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Success 200 {object} response.Response{msg=string} "jwt加入黑名单"
+// @Router /jwt/jsonInBlacklist [post]
+func (j *JwtApi) JsonInBlacklist(c *gin.Context) {
+	token := c.Request.Header.Get("x-token")
+	jwt := system.JwtBlacklist{Jwt: token}
+	if err := jwtService.JsonInBlacklist(jwt); err != nil {
+		global.GVA_LOG.Error("jwt作废失败!", zap.Error(err))
+		response.FailWithMessage("jwt作废失败", c)
+	} else {
+		response.OkWithMessage("jwt作废成功", c)
+	}
+}

server/api/v1/system/sys_menu.go

@@ -1,33 +1,36 @@
-package v1
+package system
 
 import (
-	"gin-vue-admin/global"
-	"gin-vue-admin/model"
-	"gin-vue-admin/model/request"
-	"gin-vue-admin/model/response"
-	"gin-vue-admin/service"
-	"gin-vue-admin/utils"
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/system"
+	systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
+	systemRes "github.com/flipped-aurora/gin-vue-admin/server/model/system/response"
+	"github.com/flipped-aurora/gin-vue-admin/server/utils"
 
 	"github.com/gin-gonic/gin"
 	"go.uber.org/zap"
 )
 
+type AuthorityMenuApi struct{}
+
 // @Tags AuthorityMenu
 // @Summary 获取用户动态路由
 // @Security ApiKeyAuth
 // @Produce  application/json
 // @Param data body request.Empty true "空"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
+// @Success 200 {object} response.Response{data=systemRes.SysMenusResponse,msg=string} "获取用户动态路由,返回包括系统菜单详情列表"
 // @Router /menu/getMenu [post]
-func GetMenu(c *gin.Context) {
-	if err, menus := service.GetMenuTree(getUserAuthorityId(c)); err != nil {
-		global.GVA_LOG.Error("获取失败!", zap.Any("err", err))
+func (a *AuthorityMenuApi) GetMenu(c *gin.Context) {
+	if menus, err := menuService.GetMenuTree(utils.GetUserAuthorityId(c)); err != nil {
+		global.GVA_LOG.Error("获取失败!", zap.Error(err))
 		response.FailWithMessage("获取失败", c)
 	} else {
 		if menus == nil {
-			menus = []model.SysMenu{}
+			menus = []system.SysMenu{}
 		}
-		response.OkWithDetailed(response.SysMenusResponse{Menus: menus}, "获取成功", c)
+		response.OkWithDetailed(systemRes.SysMenusResponse{Menus: menus}, "获取成功", c)
 	}
 }
 
@@ -36,14 +39,14 @@ func GetMenu(c *gin.Context) {
 // @Security ApiKeyAuth
 // @Produce  application/json
 // @Param data body request.Empty true "空"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
+// @Success 200 {object} response.Response{data=systemRes.SysBaseMenusResponse,msg=string} "获取用户动态路由,返回包括系统菜单列表"
 // @Router /menu/getBaseMenuTree [post]
-func GetBaseMenuTree(c *gin.Context) {
-	if err, menus := service.GetBaseMenuTree(); err != nil {
-		global.GVA_LOG.Error("获取失败!", zap.Any("err", err))
+func (a *AuthorityMenuApi) GetBaseMenuTree(c *gin.Context) {
+	if menus, err := menuService.GetBaseMenuTree(); err != nil {
+		global.GVA_LOG.Error("获取失败!", zap.Error(err))
 		response.FailWithMessage("获取失败", c)
 	} else {
-		response.OkWithDetailed(response.SysBaseMenusResponse{Menus: menus}, "获取成功", c)
+		response.OkWithDetailed(systemRes.SysBaseMenusResponse{Menus: menus}, "获取成功", c)
 	}
 }
 
@@ -52,18 +55,18 @@ func GetBaseMenuTree(c *gin.Context) {
 // @Security ApiKeyAuth
 // @accept application/json
 // @Produce application/json
-// @Param data body request.AddMenuAuthorityInfo true "角色ID"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"添加成功"}"
+// @Param data body systemReq.AddMenuAuthorityInfo true "角色ID"
+// @Success 200 {object} response.Response{msg=string} "增加menu和角色关联关系"
 // @Router /menu/addMenuAuthority [post]
-func AddMenuAuthority(c *gin.Context) {
-	var authorityMenu request.AddMenuAuthorityInfo
+func (a *AuthorityMenuApi) AddMenuAuthority(c *gin.Context) {
+	var authorityMenu systemReq.AddMenuAuthorityInfo
 	_ = c.ShouldBindJSON(&authorityMenu)
 	if err := utils.Verify(authorityMenu, utils.AuthorityIdVerify); err != nil {
 		response.FailWithMessage(err.Error(), c)
 		return
 	}
-	if err := service.AddMenuAuthority(authorityMenu.Menus, authorityMenu.AuthorityId); err != nil {
-		global.GVA_LOG.Error("添加失败!", zap.Any("err", err))
+	if err := menuService.AddMenuAuthority(authorityMenu.Menus, authorityMenu.AuthorityId); err != nil {
+		global.GVA_LOG.Error("添加失败!", zap.Error(err))
 		response.FailWithMessage("添加失败", c)
 	} else {
 		response.OkWithMessage("添加成功", c)
@@ -76,18 +79,18 @@ func AddMenuAuthority(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body request.GetAuthorityId true "角色ID"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
-// @Router /menu/GetMenuAuthority [post]
-func GetMenuAuthority(c *gin.Context) {
+// @Success 200 {object} response.Response{data=map[string]interface{},msg=string} "获取指定角色menu"
+// @Router /menu/getMenuAuthority [post]
+func (a *AuthorityMenuApi) GetMenuAuthority(c *gin.Context) {
 	var param request.GetAuthorityId
 	_ = c.ShouldBindJSON(&param)
 	if err := utils.Verify(param, utils.AuthorityIdVerify); err != nil {
 		response.FailWithMessage(err.Error(), c)
 		return
 	}
-	if err, menus := service.GetMenuAuthority(&param); err != nil {
-		global.GVA_LOG.Error("获取失败!", zap.Any("err", err))
-		response.FailWithDetailed(response.SysMenusResponse{Menus: menus}, "获取失败", c)
+	if menus, err := menuService.GetMenuAuthority(&param); err != nil {
+		global.GVA_LOG.Error("获取失败!", zap.Error(err))
+		response.FailWithDetailed(systemRes.SysMenusResponse{Menus: menus}, "获取失败", c)
 	} else {
 		response.OkWithDetailed(gin.H{"menus": menus}, "获取成功", c)
 	}
@@ -98,11 +101,11 @@ func GetMenuAuthority(c *gin.Context) {
 // @Security ApiKeyAuth
 // @accept application/json
 // @Produce application/json
-// @Param data body model.SysBaseMenu true "路由path, 父菜单ID, 路由name, 对应前端文件路径, 排序标记"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"添加成功"}"
+// @Param data body system.SysBaseMenu true "路由path, 父菜单ID, 路由name, 对应前端文件路径, 排序标记"
+// @Success 200 {object} response.Response{msg=string} "新增菜单"
 // @Router /menu/addBaseMenu [post]
-func AddBaseMenu(c *gin.Context) {
-	var menu model.SysBaseMenu
+func (a *AuthorityMenuApi) AddBaseMenu(c *gin.Context) {
+	var menu system.SysBaseMenu
 	_ = c.ShouldBindJSON(&menu)
 	if err := utils.Verify(menu, utils.MenuVerify); err != nil {
 		response.FailWithMessage(err.Error(), c)
@@ -112,8 +115,8 @@ func AddBaseMenu(c *gin.Context) {
 		response.FailWithMessage(err.Error(), c)
 		return
 	}
-	if err := service.AddBaseMenu(menu); err != nil {
-		global.GVA_LOG.Error("添加失败!", zap.Any("err", err))
+	if err := menuService.AddBaseMenu(menu); err != nil {
+		global.GVA_LOG.Error("添加失败!", zap.Error(err))
 
 		response.FailWithMessage("添加失败", c)
 	} else {
@@ -127,17 +130,17 @@ func AddBaseMenu(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body request.GetById true "菜单id"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
+// @Success 200 {object} response.Response{msg=string} "删除菜单"
 // @Router /menu/deleteBaseMenu [post]
-func DeleteBaseMenu(c *gin.Context) {
+func (a *AuthorityMenuApi) DeleteBaseMenu(c *gin.Context) {
 	var menu request.GetById
 	_ = c.ShouldBindJSON(&menu)
 	if err := utils.Verify(menu, utils.IdVerify); err != nil {
 		response.FailWithMessage(err.Error(), c)
 		return
 	}
-	if err := service.DeleteBaseMenu(menu.ID); err != nil {
-		global.GVA_LOG.Error("删除失败!", zap.Any("err", err))
+	if err := baseMenuService.DeleteBaseMenu(menu.ID); err != nil {
+		global.GVA_LOG.Error("删除失败!", zap.Error(err))
 		response.FailWithMessage("删除失败", c)
 	} else {
 		response.OkWithMessage("删除成功", c)
@@ -149,11 +152,11 @@ func DeleteBaseMenu(c *gin.Context) {
 // @Security ApiKeyAuth
 // @accept application/json
 // @Produce application/json
-// @Param data body model.SysBaseMenu true "路由path, 父菜单ID, 路由name, 对应前端文件路径, 排序标记"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"更新成功"}"
+// @Param data body system.SysBaseMenu true "路由path, 父菜单ID, 路由name, 对应前端文件路径, 排序标记"
+// @Success 200 {object} response.Response{msg=string} "更新菜单"
 // @Router /menu/updateBaseMenu [post]
-func UpdateBaseMenu(c *gin.Context) {
-	var menu model.SysBaseMenu
+func (a *AuthorityMenuApi) UpdateBaseMenu(c *gin.Context) {
+	var menu system.SysBaseMenu
 	_ = c.ShouldBindJSON(&menu)
 	if err := utils.Verify(menu, utils.MenuVerify); err != nil {
 		response.FailWithMessage(err.Error(), c)
@@ -163,8 +166,8 @@ func UpdateBaseMenu(c *gin.Context) {
 		response.FailWithMessage(err.Error(), c)
 		return
 	}
-	if err := service.UpdateBaseMenu(menu); err != nil {
-		global.GVA_LOG.Error("更新失败!", zap.Any("err", err))
+	if err := baseMenuService.UpdateBaseMenu(menu); err != nil {
+		global.GVA_LOG.Error("更新失败!", zap.Error(err))
 		response.FailWithMessage("更新失败", c)
 	} else {
 		response.OkWithMessage("更新成功", c)
@@ -177,20 +180,20 @@ func UpdateBaseMenu(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body request.GetById true "菜单id"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
+// @Success 200 {object} response.Response{data=systemRes.SysBaseMenuResponse,msg=string} "根据id获取菜单,返回包括系统菜单列表"
 // @Router /menu/getBaseMenuById [post]
-func GetBaseMenuById(c *gin.Context) {
+func (a *AuthorityMenuApi) GetBaseMenuById(c *gin.Context) {
 	var idInfo request.GetById
 	_ = c.ShouldBindJSON(&idInfo)
 	if err := utils.Verify(idInfo, utils.IdVerify); err != nil {
 		response.FailWithMessage(err.Error(), c)
 		return
 	}
-	if err, menu := service.GetBaseMenuById(idInfo.ID); err != nil {
-		global.GVA_LOG.Error("获取失败!", zap.Any("err", err))
+	if menu, err := baseMenuService.GetBaseMenuById(idInfo.ID); err != nil {
+		global.GVA_LOG.Error("获取失败!", zap.Error(err))
 		response.FailWithMessage("获取失败", c)
 	} else {
-		response.OkWithDetailed(response.SysBaseMenuResponse{Menu: menu}, "获取成功", c)
+		response.OkWithDetailed(systemRes.SysBaseMenuResponse{Menu: menu}, "获取成功", c)
 	}
 }
 
@@ -200,17 +203,17 @@ func GetBaseMenuById(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body request.PageInfo true "页码, 每页大小"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
+// @Success 200 {object} response.Response{data=response.PageResult,msg=string} "分页获取基础menu列表,返回包括列表,总数,页码,每页数量"
 // @Router /menu/getMenuList [post]
-func GetMenuList(c *gin.Context) {
+func (a *AuthorityMenuApi) GetMenuList(c *gin.Context) {
 	var pageInfo request.PageInfo
 	_ = c.ShouldBindJSON(&pageInfo)
 	if err := utils.Verify(pageInfo, utils.PageInfoVerify); err != nil {
 		response.FailWithMessage(err.Error(), c)
 		return
 	}
-	if err, menuList, total := service.GetInfoList(); err != nil {
-		global.GVA_LOG.Error("获取失败!", zap.Any("err", err))
+	if menuList, total, err := menuService.GetInfoList(); err != nil {
+		global.GVA_LOG.Error("获取失败!", zap.Error(err))
 		response.FailWithMessage("获取失败", c)
 	} else {
 		response.OkWithDetailed(response.PageResult{

server/api/v1/system/sys_operation_record.go

@@ -0,0 +1,118 @@
+package system
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/system"
+	systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
+	"github.com/flipped-aurora/gin-vue-admin/server/utils"
+	"github.com/gin-gonic/gin"
+	"go.uber.org/zap"
+)
+
+type OperationRecordApi struct{}
+
+// @Tags SysOperationRecord
+// @Summary 创建SysOperationRecord
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body system.SysOperationRecord true "创建SysOperationRecord"
+// @Success 200 {object} response.Response{msg=string} "创建SysOperationRecord"
+// @Router /sysOperationRecord/createSysOperationRecord [post]
+func (s *OperationRecordApi) CreateSysOperationRecord(c *gin.Context) {
+	var sysOperationRecord system.SysOperationRecord
+	_ = c.ShouldBindJSON(&sysOperationRecord)
+	if err := operationRecordService.CreateSysOperationRecord(sysOperationRecord); err != nil {
+		global.GVA_LOG.Error("创建失败!", zap.Error(err))
+		response.FailWithMessage("创建失败", c)
+	} else {
+		response.OkWithMessage("创建成功", c)
+	}
+}
+
+// @Tags SysOperationRecord
+// @Summary 删除SysOperationRecord
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body system.SysOperationRecord true "SysOperationRecord模型"
+// @Success 200 {object} response.Response{msg=string} "删除SysOperationRecord"
+// @Router /sysOperationRecord/deleteSysOperationRecord [delete]
+func (s *OperationRecordApi) DeleteSysOperationRecord(c *gin.Context) {
+	var sysOperationRecord system.SysOperationRecord
+	_ = c.ShouldBindJSON(&sysOperationRecord)
+	if err := operationRecordService.DeleteSysOperationRecord(sysOperationRecord); err != nil {
+		global.GVA_LOG.Error("删除失败!", zap.Error(err))
+		response.FailWithMessage("删除失败", c)
+	} else {
+		response.OkWithMessage("删除成功", c)
+	}
+}
+
+// @Tags SysOperationRecord
+// @Summary 批量删除SysOperationRecord
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body request.IdsReq true "批量删除SysOperationRecord"
+// @Success 200 {object} response.Response{msg=string} "批量删除SysOperationRecord"
+// @Router /sysOperationRecord/deleteSysOperationRecordByIds [delete]
+func (s *OperationRecordApi) DeleteSysOperationRecordByIds(c *gin.Context) {
+	var IDS request.IdsReq
+	_ = c.ShouldBindJSON(&IDS)
+	if err := operationRecordService.DeleteSysOperationRecordByIds(IDS); err != nil {
+		global.GVA_LOG.Error("批量删除失败!", zap.Error(err))
+		response.FailWithMessage("批量删除失败", c)
+	} else {
+		response.OkWithMessage("批量删除成功", c)
+	}
+}
+
+// @Tags SysOperationRecord
+// @Summary 用id查询SysOperationRecord
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data query system.SysOperationRecord true "Id"
+// @Success 200 {object} response.Response{data=map[string]interface{},msg=string} "用id查询SysOperationRecord"
+// @Router /sysOperationRecord/findSysOperationRecord [get]
+func (s *OperationRecordApi) FindSysOperationRecord(c *gin.Context) {
+	var sysOperationRecord system.SysOperationRecord
+	_ = c.ShouldBindQuery(&sysOperationRecord)
+	if err := utils.Verify(sysOperationRecord, utils.IdVerify); err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	if reSysOperationRecord, err := operationRecordService.GetSysOperationRecord(sysOperationRecord.ID); err != nil {
+		global.GVA_LOG.Error("查询失败!", zap.Error(err))
+		response.FailWithMessage("查询失败", c)
+	} else {
+		response.OkWithDetailed(gin.H{"reSysOperationRecord": reSysOperationRecord}, "查询成功", c)
+	}
+}
+
+// @Tags SysOperationRecord
+// @Summary 分页获取SysOperationRecord列表
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data query request.SysOperationRecordSearch true "页码, 每页大小, 搜索条件"
+// @Success 200 {object} response.Response{data=response.PageResult,msg=string} "分页获取SysOperationRecord列表,返回包括列表,总数,页码,每页数量"
+// @Router /sysOperationRecord/getSysOperationRecordList [get]
+func (s *OperationRecordApi) GetSysOperationRecordList(c *gin.Context) {
+	var pageInfo systemReq.SysOperationRecordSearch
+	_ = c.ShouldBindQuery(&pageInfo)
+	if list, total, err := operationRecordService.GetSysOperationRecordInfoList(pageInfo); err != nil {
+		global.GVA_LOG.Error("获取失败!", zap.Error(err))
+		response.FailWithMessage("获取失败", c)
+	} else {
+		response.OkWithDetailed(response.PageResult{
+			List:     list,
+			Total:    total,
+			Page:     pageInfo.Page,
+			PageSize: pageInfo.PageSize,
+		}, "获取成功", c)
+	}
+}

server/api/v1/system/sys_system.go

@@ -0,0 +1,78 @@
+package system
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/system"
+	systemRes "github.com/flipped-aurora/gin-vue-admin/server/model/system/response"
+	"github.com/flipped-aurora/gin-vue-admin/server/utils"
+
+	"github.com/gin-gonic/gin"
+	"go.uber.org/zap"
+)
+
+type SystemApi struct{}
+
+// @Tags System
+// @Summary 获取配置文件内容
+// @Security ApiKeyAuth
+// @Produce  application/json
+// @Success 200 {object} response.Response{data=systemRes.SysConfigResponse,msg=string} "获取配置文件内容,返回包括系统配置"
+// @Router /system/getSystemConfig [post]
+func (s *SystemApi) GetSystemConfig(c *gin.Context) {
+	if config, err := systemConfigService.GetSystemConfig(); err != nil {
+		global.GVA_LOG.Error("获取失败!", zap.Error(err))
+		response.FailWithMessage("获取失败", c)
+	} else {
+		response.OkWithDetailed(systemRes.SysConfigResponse{Config: config}, "获取成功", c)
+	}
+}
+
+// @Tags System
+// @Summary 设置配置文件内容
+// @Security ApiKeyAuth
+// @Produce  application/json
+// @Param data body system.System true "设置配置文件内容"
+// @Success 200 {object} response.Response{data=string} "设置配置文件内容"
+// @Router /system/setSystemConfig [post]
+func (s *SystemApi) SetSystemConfig(c *gin.Context) {
+	var sys system.System
+	_ = c.ShouldBindJSON(&sys)
+	if err := systemConfigService.SetSystemConfig(sys); err != nil {
+		global.GVA_LOG.Error("设置失败!", zap.Error(err))
+		response.FailWithMessage("设置失败", c)
+	} else {
+		response.OkWithMessage("设置成功", c)
+	}
+}
+
+// @Tags System
+// @Summary 重启系统
+// @Security ApiKeyAuth
+// @Produce  application/json
+// @Success 200 {object} response.Response{msg=string} "重启系统"
+// @Router /system/reloadSystem [post]
+func (s *SystemApi) ReloadSystem(c *gin.Context) {
+	err := utils.Reload()
+	if err != nil {
+		global.GVA_LOG.Error("重启系统失败!", zap.Error(err))
+		response.FailWithMessage("重启系统失败", c)
+	} else {
+		response.OkWithMessage("重启系统成功", c)
+	}
+}
+
+// @Tags System
+// @Summary 获取服务器信息
+// @Security ApiKeyAuth
+// @Produce  application/json
+// @Success 200 {object} response.Response{data=map[string]interface{},msg=string} "获取服务器信息"
+// @Router /system/getServerInfo [post]
+func (s *SystemApi) GetServerInfo(c *gin.Context) {
+	if server, err := systemConfigService.GetServerInfo(); err != nil {
+		global.GVA_LOG.Error("获取失败!", zap.Error(err))
+		response.FailWithMessage("获取失败", c)
+	} else {
+		response.OkWithDetailed(gin.H{"server": server}, "获取成功", c)
+	}
+}

server/api/v1/system/sys_user.go

@@ -0,0 +1,369 @@
+package system
+
+import (
+	"strconv"
+
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/system"
+	systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
+	systemRes "github.com/flipped-aurora/gin-vue-admin/server/model/system/response"
+	"github.com/flipped-aurora/gin-vue-admin/server/utils"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-redis/redis/v8"
+	"go.uber.org/zap"
+)
+
+// @Tags Base
+// @Summary 用户登录
+// @Produce  application/json
+// @Param data body systemReq.Login true "用户名, 密码, 验证码"
+// @Success 200 {object} response.Response{data=systemRes.LoginResponse,msg=string} "返回包括用户信息,token,过期时间"
+// @Router /base/login [post]
+func (b *BaseApi) Login(c *gin.Context) {
+	var l systemReq.Login
+	_ = c.ShouldBindJSON(&l)
+	if err := utils.Verify(l, utils.LoginVerify); err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	if store.Verify(l.CaptchaId, l.Captcha, true) {
+		u := &system.SysUser{Username: l.Username, Password: l.Password}
+		if user, err := userService.Login(u); err != nil {
+			global.GVA_LOG.Error("登陆失败! 用户名不存在或者密码错误!", zap.Error(err))
+			response.FailWithMessage("用户名不存在或者密码错误", c)
+		} else {
+			b.TokenNext(c, *user)
+		}
+	} else {
+		response.FailWithMessage("验证码错误", c)
+	}
+}
+
+// 登录以后签发jwt
+func (b *BaseApi) TokenNext(c *gin.Context, user system.SysUser) {
+	j := &utils.JWT{SigningKey: []byte(global.GVA_CONFIG.JWT.SigningKey)} // 唯一签名
+	claims := j.CreateClaims(systemReq.BaseClaims{
+		UUID:        user.UUID,
+		ID:          user.ID,
+		NickName:    user.NickName,
+		Username:    user.Username,
+		AuthorityId: user.AuthorityId,
+	})
+	token, err := j.CreateToken(claims)
+	if err != nil {
+		global.GVA_LOG.Error("获取token失败!", zap.Error(err))
+		response.FailWithMessage("获取token失败", c)
+		return
+	}
+	if !global.GVA_CONFIG.System.UseMultipoint {
+		response.OkWithDetailed(systemRes.LoginResponse{
+			User:      user,
+			Token:     token,
+			ExpiresAt: claims.StandardClaims.ExpiresAt * 1000,
+		}, "登录成功", c)
+		return
+	}
+
+	if jwtStr, err := jwtService.GetRedisJWT(user.Username); err == redis.Nil {
+		if err := jwtService.SetRedisJWT(token, user.Username); err != nil {
+			global.GVA_LOG.Error("设置登录状态失败!", zap.Error(err))
+			response.FailWithMessage("设置登录状态失败", c)
+			return
+		}
+		response.OkWithDetailed(systemRes.LoginResponse{
+			User:      user,
+			Token:     token,
+			ExpiresAt: claims.StandardClaims.ExpiresAt * 1000,
+		}, "登录成功", c)
+	} else if err != nil {
+		global.GVA_LOG.Error("设置登录状态失败!", zap.Error(err))
+		response.FailWithMessage("设置登录状态失败", c)
+	} else {
+		var blackJWT system.JwtBlacklist
+		blackJWT.Jwt = jwtStr
+		if err := jwtService.JsonInBlacklist(blackJWT); err != nil {
+			response.FailWithMessage("jwt作废失败", c)
+			return
+		}
+		if err := jwtService.SetRedisJWT(token, user.Username); err != nil {
+			response.FailWithMessage("设置登录状态失败", c)
+			return
+		}
+		response.OkWithDetailed(systemRes.LoginResponse{
+			User:      user,
+			Token:     token,
+			ExpiresAt: claims.StandardClaims.ExpiresAt * 1000,
+		}, "登录成功", c)
+	}
+}
+
+// @Tags SysUser
+// @Summary 用户注册账号
+// @Produce  application/json
+// @Param data body systemReq.Register true "用户名, 昵称, 密码, 角色ID"
+// @Success 200 {object} response.Response{data=systemRes.SysUserResponse,msg=string} "用户注册账号,返回包括用户信息"
+// @Router /user/admin_register [post]
+func (b *BaseApi) Register(c *gin.Context) {
+	var r systemReq.Register
+	_ = c.ShouldBindJSON(&r)
+	if err := utils.Verify(r, utils.RegisterVerify); err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	var authorities []system.SysAuthority
+	for _, v := range r.AuthorityIds {
+		authorities = append(authorities, system.SysAuthority{
+			AuthorityId: v,
+		})
+	}
+	user := &system.SysUser{Username: r.Username, NickName: r.NickName, Password: r.Password, HeaderImg: r.HeaderImg, AuthorityId: r.AuthorityId, Authorities: authorities}
+	userReturn, err := userService.Register(*user)
+	if err != nil {
+		global.GVA_LOG.Error("注册失败!", zap.Error(err))
+		response.FailWithDetailed(systemRes.SysUserResponse{User: userReturn}, "注册失败", c)
+	} else {
+		response.OkWithDetailed(systemRes.SysUserResponse{User: userReturn}, "注册成功", c)
+	}
+}
+
+// @Tags SysUser
+// @Summary 用户修改密码
+// @Security ApiKeyAuth
+// @Produce  application/json
+// @Param data body systemReq.ChangePasswordStruct true "用户名, 原密码, 新密码"
+// @Success 200 {object} response.Response{msg=string} "用户修改密码"
+// @Router /user/changePassword [post]
+func (b *BaseApi) ChangePassword(c *gin.Context) {
+	var user systemReq.ChangePasswordStruct
+	_ = c.ShouldBindJSON(&user)
+	if err := utils.Verify(user, utils.ChangePasswordVerify); err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	u := &system.SysUser{Username: user.Username, Password: user.Password}
+	if _, err := userService.ChangePassword(u, user.NewPassword); err != nil {
+		global.GVA_LOG.Error("修改失败!", zap.Error(err))
+		response.FailWithMessage("修改失败，原密码与当前账户不符", c)
+	} else {
+		response.OkWithMessage("修改成功", c)
+	}
+}
+
+// @Tags SysUser
+// @Summary 分页获取用户列表
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body request.PageInfo true "页码, 每页大小"
+// @Success 200 {object} response.Response{data=response.PageResult,msg=string} "分页获取用户列表,返回包括列表,总数,页码,每页数量"
+// @Router /user/getUserList [post]
+func (b *BaseApi) GetUserList(c *gin.Context) {
+	var pageInfo request.PageInfo
+	_ = c.ShouldBindJSON(&pageInfo)
+	if err := utils.Verify(pageInfo, utils.PageInfoVerify); err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	if list, total, err := userService.GetUserInfoList(pageInfo); err != nil {
+		global.GVA_LOG.Error("获取失败!", zap.Error(err))
+		response.FailWithMessage("获取失败", c)
+	} else {
+		response.OkWithDetailed(response.PageResult{
+			List:     list,
+			Total:    total,
+			Page:     pageInfo.Page,
+			PageSize: pageInfo.PageSize,
+		}, "获取成功", c)
+	}
+}
+
+// @Tags SysUser
+// @Summary 更改用户权限
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body systemReq.SetUserAuth true "用户UUID, 角色ID"
+// @Success 200 {object} response.Response{msg=string} "设置用户权限"
+// @Router /user/setUserAuthority [post]
+func (b *BaseApi) SetUserAuthority(c *gin.Context) {
+	var sua systemReq.SetUserAuth
+	_ = c.ShouldBindJSON(&sua)
+	if UserVerifyErr := utils.Verify(sua, utils.SetUserAuthorityVerify); UserVerifyErr != nil {
+		response.FailWithMessage(UserVerifyErr.Error(), c)
+		return
+	}
+	userID := utils.GetUserID(c)
+	uuid := utils.GetUserUuid(c)
+	if err := userService.SetUserAuthority(userID, uuid, sua.AuthorityId); err != nil {
+		global.GVA_LOG.Error("修改失败!", zap.Error(err))
+		response.FailWithMessage(err.Error(), c)
+	} else {
+		claims := utils.GetUserInfo(c)
+		j := &utils.JWT{SigningKey: []byte(global.GVA_CONFIG.JWT.SigningKey)} // 唯一签名
+		claims.AuthorityId = sua.AuthorityId
+		if token, err := j.CreateToken(*claims); err != nil {
+			global.GVA_LOG.Error("修改失败!", zap.Error(err))
+			response.FailWithMessage(err.Error(), c)
+		} else {
+			c.Header("new-token", token)
+			c.Header("new-expires-at", strconv.FormatInt(claims.ExpiresAt, 10))
+			response.OkWithMessage("修改成功", c)
+		}
+
+	}
+}
+
+// @Tags SysUser
+// @Summary 设置用户权限
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body systemReq.SetUserAuthorities true "用户UUID, 角色ID"
+// @Success 200 {object} response.Response{msg=string} "设置用户权限"
+// @Router /user/setUserAuthorities [post]
+func (b *BaseApi) SetUserAuthorities(c *gin.Context) {
+	var sua systemReq.SetUserAuthorities
+	_ = c.ShouldBindJSON(&sua)
+	if err := userService.SetUserAuthorities(sua.ID, sua.AuthorityIds); err != nil {
+		global.GVA_LOG.Error("修改失败!", zap.Error(err))
+		response.FailWithMessage("修改失败", c)
+	} else {
+		response.OkWithMessage("修改成功", c)
+	}
+}
+
+// @Tags SysUser
+// @Summary 删除用户
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body request.GetById true "用户ID"
+// @Success 200 {object} response.Response{msg=string} "删除用户"
+// @Router /user/deleteUser [delete]
+func (b *BaseApi) DeleteUser(c *gin.Context) {
+	var reqId request.GetById
+	_ = c.ShouldBindJSON(&reqId)
+	if err := utils.Verify(reqId, utils.IdVerify); err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	jwtId := utils.GetUserID(c)
+	if jwtId == uint(reqId.ID) {
+		response.FailWithMessage("删除失败, 自杀失败", c)
+		return
+	}
+	if err := userService.DeleteUser(reqId.ID); err != nil {
+		global.GVA_LOG.Error("删除失败!", zap.Error(err))
+		response.FailWithMessage("删除失败", c)
+	} else {
+		response.OkWithMessage("删除成功", c)
+	}
+}
+
+// @Tags SysUser
+// @Summary 设置用户信息
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body system.SysUser true "ID, 用户名, 昵称, 头像链接"
+// @Success 200 {object} response.Response{data=map[string]interface{},msg=string} "设置用户信息"
+// @Router /user/setUserInfo [put]
+func (b *BaseApi) SetUserInfo(c *gin.Context) {
+	var user systemReq.ChangeUserInfo
+	_ = c.ShouldBindJSON(&user)
+	if err := utils.Verify(user, utils.IdVerify); err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+
+	if len(user.AuthorityIds) != 0 {
+		err := userService.SetUserAuthorities(user.ID, user.AuthorityIds)
+		if err != nil {
+			global.GVA_LOG.Error("设置失败!", zap.Error(err))
+			response.FailWithMessage("设置失败", c)
+		}
+	}
+
+	if err := userService.SetUserInfo(system.SysUser{
+		GVA_MODEL: global.GVA_MODEL{
+			ID: user.ID,
+		},
+		NickName:  user.NickName,
+		HeaderImg: user.HeaderImg,
+		Phone:     user.Phone,
+		Email:     user.Email,
+		SideMode:  user.SideMode,
+	}); err != nil {
+		global.GVA_LOG.Error("设置失败!", zap.Error(err))
+		response.FailWithMessage("设置失败", c)
+	} else {
+		response.OkWithMessage("设置成功", c)
+	}
+}
+
+// @Tags SysUser
+// @Summary 设置用户信息
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body system.SysUser true "ID, 用户名, 昵称, 头像链接"
+// @Success 200 {object} response.Response{data=map[string]interface{},msg=string} "设置用户信息"
+// @Router /user/SetSelfInfo [put]
+func (b *BaseApi) SetSelfInfo(c *gin.Context) {
+	var user systemReq.ChangeUserInfo
+	_ = c.ShouldBindJSON(&user)
+	user.ID = utils.GetUserID(c)
+	if err := userService.SetUserInfo(system.SysUser{
+		GVA_MODEL: global.GVA_MODEL{
+			ID: user.ID,
+		},
+		NickName:  user.NickName,
+		HeaderImg: user.HeaderImg,
+		Phone:     user.Phone,
+		Email:     user.Email,
+		SideMode:  user.SideMode,
+	}); err != nil {
+		global.GVA_LOG.Error("设置失败!", zap.Error(err))
+		response.FailWithMessage("设置失败", c)
+	} else {
+		response.OkWithMessage("设置成功", c)
+	}
+}
+
+// @Tags SysUser
+// @Summary 获取用户信息
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Success 200 {object} response.Response{data=map[string]interface{},msg=string} "获取用户信息"
+// @Router /user/getUserInfo [get]
+func (b *BaseApi) GetUserInfo(c *gin.Context) {
+	uuid := utils.GetUserUuid(c)
+	if ReqUser, err := userService.GetUserInfo(uuid); err != nil {
+		global.GVA_LOG.Error("获取失败!", zap.Error(err))
+		response.FailWithMessage("获取失败", c)
+	} else {
+		response.OkWithDetailed(gin.H{"userInfo": ReqUser}, "获取成功", c)
+	}
+}
+
+// @Tags SysUser
+// @Summary 重置用户密码
+// @Security ApiKeyAuth
+// @Produce  application/json
+// @Param data body system.SysUser true "ID"
+// @Success 200 {object} response.Response{msg=string} "重置用户密码"
+// @Router /user/resetPassword [post]
+func (b *BaseApi) ResetPassword(c *gin.Context) {
+	var user system.SysUser
+	_ = c.ShouldBindJSON(&user)
+	if err := userService.ResetPassword(user.ID); err != nil {
+		global.GVA_LOG.Error("重置失败!", zap.Error(err))
+		response.FailWithMessage("重置失败"+err.Error(), c)
+	} else {
+		response.OkWithMessage("重置成功", c)
+	}
+}

server/config.docker.yaml

@@ -1,21 +1,22 @@
-# Gin-Vue-Admin Global Configuration
+# github.com/flipped-aurora/gin-vue-admin/server Global Configuration
 
 # jwt configuration
 jwt:
   signing-key: 'qmPlus'
   expires-time: 604800
   buffer-time: 86400
+  issuer: 'qmPlus'
 
 # zap logger configuration
 zap:
   level: 'info'
+  prefix: '[github.com/flipped-aurora/gin-vue-admin/server]'
   format: 'console'
-  prefix: '[GIN-VUE-ADMIN]'
   director: 'log'
-  link-name: 'latest_log'
-  show-line: true
   encode-level: 'LowercaseColorLevelEncoder'
   stacktrace-key: 'stacktrace'
+  max-age: 30 # 默认日志留存默认以天为单位
+  show-line: true
   log-in-console: true
 
 # redis configuration
@@ -34,17 +35,18 @@ email:
   secret: 'xxx'
   nickname: 'test'
 
-# casbin configuration
-casbin:
-  model-path: './resource/rbac_model.conf'
-
 # system configuration
 system:
   env: 'public'  # Change to "develop" to skip authentication for development mode
   addr: 8888
   db-type: 'mysql'
-  oss-type: 'local'    # 控制oss选择走本期还是 七牛等其他仓 自行增加其他oss仓可以在 server/utils/upload/upload.go 中 NewOss函数配置
+  oss-type: 'local'    # 控制oss选择走本地还是 七牛等其他仓 自行增加其他oss仓可以在 server/utils/upload/upload.go 中 NewOss函数配置
+  use-redis: false     # 使用redis
   use-multipoint: false
+  # IP限制次数 一个小时15000次
+  iplimit-count: 15000
+  #  IP限制一个小时
+  iplimit-time: 3600
 
 # captcha configuration
 captcha:
@@ -53,35 +55,70 @@ captcha:
   img-height: 80
 
 # mysql connect configuration
+# 未初始化之前请勿手动修改数据库信息！！！如果一定要手动初始化请看（https://gin-vue-admin.com/docs/first_master）
 mysql:
   path: ''
+  port: ''
   config: ''
   db-name: ''
   username: ''
   password: ''
   max-idle-conns: 10
   max-open-conns: 100
-  log-mode: false
-  log-zap: ""
+  log-mode: ""
+  log-zap: false
+
+# pgsql connect configuration
+# 未初始化之前请勿手动修改数据库信息！！！如果一定要手动初始化请看（https://gin-vue-admin.com/docs/first_master）
+pgsql:
+  path: ''
+  port: ''
+  config: ''
+  db-name: ''
+  username: ''
+  password: ''
+  max-idle-conns: 10
+  max-open-conns: 100
+  log-mode: ""
+  log-zap: false
+
+db-list:
+  - disabled: true # 是否启用
+    type: "" # 数据库的类型,目前支持mysql、pgsql
+    alias-name: "" # 数据库的名称,注意: alias-name 需要在db-list中唯一
+    path: ''
+    port: ''
+    config: ''
+    db-name: ''
+    username: ''
+    password: ''
+    max-idle-conns: 10
+    max-open-conns: 100
+    log-mode: ""
+    log-zap: false
+
 
 # local configuration
 local:
-  path: 'uploads/file'
+  path: 'uploads/file' # 访问路径
+  store-path: 'uploads/file' # 存储路径
 
 # autocode configuration
 autocode:
   transfer-restart: true
+  # root 自动适配项目根目录
+  # 请不要手动配置,他会在项目加载的时候识别出根路径
   root: ""
   server: /server
-  server-api: /api/v1
+  server-plug: /plugin/%s
+  server-api: /api/v1/%s
   server-initialize: /initialize
-  server-model: /model
-  server-request: /model/request/
-  server-router: /router
-  server-service: /service
+  server-model: /model/%s
+  server-request: /model/%s/request/
+  server-router: /router/%s
+  server-service: /service/%s
   web: /web/src
   web-api: /api
-  web-flow: /view
   web-form: /view
   web-table: /view
 
@@ -95,7 +132,6 @@ qiniu:
   secret-key: ''
   use-cdn-domains: false
 
-
 # aliyun oss configuration
 aliyun-oss:
   endpoint: 'yourEndpoint'
@@ -103,6 +139,7 @@ aliyun-oss:
   access-key-secret: 'yourAccessKeySecret'
   bucket-name: 'yourBucketName'
   bucket-url: 'yourBucketUrl'
+  base-path: 'yourBasePath'
 
 # tencent cos configuration
 tencent-cos:
@@ -111,22 +148,56 @@ tencent-cos:
   secret-id: 'xxxxxxxx'
   secret-key: 'xxxxxxxx'
   base-url: 'https://gin.vue.admin'
-  path-prefix: 'gin-vue-admin'
+  path-prefix: 'github.com/flipped-aurora/gin-vue-admin/server'
+
+# aws s3 configuration (minio compatible)
+aws-s3:
+  bucket: xxxxx-10005608
+  region: ap-shanghai
+  endpoint: ''
+  s3-force-path-style: false
+  disable-ssl: false
+  secret-id: xxxxxxxx
+  secret-key: xxxxxxxx
+  base-url: https://gin.vue.admin
+  path-prefix: github.com/flipped-aurora/gin-vue-admin/server
+
+# huawei obs configuration
+hua-wei-obs:
+  path: 'you-path'
+  bucket: 'you-bucket'
+  endpoint: 'you-endpoint'
+  access-key: 'you-access-key'
+  secret-key: 'you-secret-key'
 
 # excel configuration
 excel:
   dir: './resource/excel/'
 
-
 # timer task db clear table
 Timer:
   start: true
   spec: "@daily"  # 定时任务详细配置参考 https://pkg.go.dev/github.com/robfig/cron/v3
-  detail: [
-    # tableName: 需要清理的表名
-    # compareField: 需要比较时间的字段
-    # interval: 时间间隔, 具体配置详看 time.ParseDuration() 中字符串表示 且不能为负数
-    # 2160h = 24 * 30 * 3 -> 三个月
-    { tableName: "sys_operation_records" , compareField: "created_at", interval: "2160h" },
-    #{ tableName: "log2" , compareField: "created_at", interval: "2160h" }
-  ]
+  detail:
+    - tableName: "sys_operation_records"
+      compareField: "created_at"
+      interval: "2160h"
+    - tableName: "jwt_blacklists"
+      compareField: "created_at"
+      interval: "168h"
+
+# 跨域配置
+# 需要配合 server/initialize/router.go#L32 使用
+cors:
+  mode: whitelist # 放行模式: allow-all, 放行全部; whitelist, 白名单模式, 来自白名单内域名的请求添加 cors 头; strict-whitelist 严格白名单模式, 白名单外的请求一律拒绝
+  whitelist:
+    - allow-origin: example1.com
+      allow-headers: content-type
+      allow-methods: GET, POST
+      expose-headers: Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers, Content-Type
+      allow-credentials: true # 布尔值
+    - allow-origin: example2.com
+      allow-headers: content-type
+      allow-methods: GET, POST
+      expose-headers: Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers, Content-Type
+      allow-credentials: true # 布尔值

server/config.yaml

@@ -1,21 +1,22 @@
-# Gin-Vue-Admin Global Configuration
+# github.com/flipped-aurora/gin-vue-admin/server Global Configuration
 
 # jwt configuration
 jwt:
   signing-key: 'qmPlus'
   expires-time: 604800
   buffer-time: 86400
+  issuer: 'qmPlus'
 
 # zap logger configuration
 zap:
   level: 'info'
+  prefix: '[github.com/flipped-aurora/gin-vue-admin/server]'
   format: 'console'
-  prefix: '[GIN-VUE-ADMIN]'
   director: 'log'
-  link-name: 'latest_log'
-  show-line: true
   encode-level: 'LowercaseColorLevelEncoder'
   stacktrace-key: 'stacktrace'
+  max-age: 30 # 默认日志留存默认以天为单位
+  show-line: true
   log-in-console: true
 
 # redis configuration
@@ -34,17 +35,18 @@ email:
   secret: 'xxx'
   nickname: 'test'
 
-# casbin configuration
-casbin:
-  model-path: './resource/rbac_model.conf'
-
 # system configuration
 system:
   env: 'public'  # Change to "develop" to skip authentication for development mode
   addr: 8888
   db-type: 'mysql'
-  oss-type: 'local'    # 控制oss选择走本期还是 七牛等其他仓 自行增加其他oss仓可以在 server/utils/upload/upload.go 中 NewOss函数配置
+  oss-type: 'local'    # 控制oss选择走本地还是 七牛等其他仓 自行增加其他oss仓可以在 server/utils/upload/upload.go 中 NewOss函数配置
+  use-redis: false     # 使用redis
   use-multipoint: false
+  # IP限制次数 一个小时15000次
+  iplimit-count: 15000
+  #  IP限制一个小时
+  iplimit-time: 3600
 
 # captcha configuration
 captcha:
@@ -53,36 +55,70 @@ captcha:
   img-height: 80
 
 # mysql connect configuration
-# 未初始化之前请勿手动修改数据库信息！！！如果一定要手动初始化请看（https://www.gin-vue-admin.com/docs/first）
+# 未初始化之前请勿手动修改数据库信息！！！如果一定要手动初始化请看（https://gin-vue-admin.com/docs/first_master）
 mysql:
   path: ''
+  port: ''
   config: ''
   db-name: ''
   username: ''
   password: ''
   max-idle-conns: 10
   max-open-conns: 100
-  log-mode: false
-  log-zap: ""
+  log-mode: ""
+  log-zap: false
+
+# pgsql connect configuration
+# 未初始化之前请勿手动修改数据库信息！！！如果一定要手动初始化请看（https://gin-vue-admin.com/docs/first_master）
+pgsql:
+  path: ''
+  port: ''
+  config: ''
+  db-name: ''
+  username: ''
+  password: ''
+  max-idle-conns: 10
+  max-open-conns: 100
+  log-mode: ""
+  log-zap: false
+
+db-list:
+  - disabled: true # 是否启用
+    type: "" # 数据库的类型,目前支持mysql、pgsql
+    alias-name: "" # 数据库的名称,注意: alias-name 需要在db-list中唯一
+    path: ''
+    port: ''
+    config: ''
+    db-name: ''
+    username: ''
+    password: ''
+    max-idle-conns: 10
+    max-open-conns: 100
+    log-mode: ""
+    log-zap: false
+
 
 # local configuration
 local:
-  path: 'uploads/file'
+  path: 'uploads/file' # 访问路径
+  store-path: 'uploads/file' # 存储路径
 
 # autocode configuration
 autocode:
   transfer-restart: true
+  # root 自动适配项目根目录
+  # 请不要手动配置,他会在项目加载的时候识别出根路径
   root: ""
   server: /server
-  server-api: /api/v1
+  server-plug: /plugin/%s
+  server-api: /api/v1/%s
   server-initialize: /initialize
-  server-model: /model
-  server-request: /model/request/
-  server-router: /router
-  server-service: /service
+  server-model: /model/%s
+  server-request: /model/%s/request/
+  server-router: /router/%s
+  server-service: /service/%s
   web: /web/src
   web-api: /api
-  web-flow: /view
   web-form: /view
   web-table: /view
 
@@ -96,7 +132,6 @@ qiniu:
   secret-key: ''
   use-cdn-domains: false
 
-
 # aliyun oss configuration
 aliyun-oss:
   endpoint: 'yourEndpoint'
@@ -113,22 +148,56 @@ tencent-cos:
   secret-id: 'xxxxxxxx'
   secret-key: 'xxxxxxxx'
   base-url: 'https://gin.vue.admin'
-  path-prefix: 'gin-vue-admin'
+  path-prefix: 'github.com/flipped-aurora/gin-vue-admin/server'
+
+# aws s3 configuration (minio compatible)
+aws-s3:
+  bucket: xxxxx-10005608
+  region: ap-shanghai
+  endpoint: ''
+  s3-force-path-style: false
+  disable-ssl: false
+  secret-id: xxxxxxxx
+  secret-key: xxxxxxxx
+  base-url: https://gin.vue.admin
+  path-prefix: github.com/flipped-aurora/gin-vue-admin/server
+
+# huawei obs configuration
+hua-wei-obs:
+  path: 'you-path'
+  bucket: 'you-bucket'
+  endpoint: 'you-endpoint'
+  access-key: 'you-access-key'
+  secret-key: 'you-secret-key'
 
 # excel configuration
 excel:
   dir: './resource/excel/'
 
-
 # timer task db clear table
 Timer:
   start: true
   spec: "@daily"  # 定时任务详细配置参考 https://pkg.go.dev/github.com/robfig/cron/v3
-  detail: [
-    # tableName: 需要清理的表名
-    # compareField: 需要比较时间的字段
-    # interval: 时间间隔, 具体配置详看 time.ParseDuration() 中字符串表示 且不能为负数
-    # 2160h = 24 * 30 * 3 -> 三个月
-    { tableName: "sys_operation_records" , compareField: "created_at", interval: "2160h" },
-    #{ tableName: "log2" , compareField: "created_at", interval: "2160h" }
-  ]
+  detail:
+    - tableName: "sys_operation_records"
+      compareField: "created_at"
+      interval: "2160h"
+    - tableName: "jwt_blacklists"
+      compareField: "created_at"
+      interval: "168h"
+
+# 跨域配置
+# 需要配合 server/initialize/router.go#L32 使用
+cors:
+  mode: whitelist # 放行模式: allow-all, 放行全部; whitelist, 白名单模式, 来自白名单内域名的请求添加 cors 头; strict-whitelist 严格白名单模式, 白名单外的请求一律拒绝
+  whitelist:
+    - allow-origin: example1.com
+      allow-headers: content-type
+      allow-methods: GET, POST
+      expose-headers: Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers, Content-Type
+      allow-credentials: true # 布尔值
+    - allow-origin: example2.com
+      allow-headers: content-type
+      allow-methods: GET, POST
+      expose-headers: Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers, Content-Type
+      allow-credentials: true # 布尔值

server/config/auto_code.go

@@ -1,18 +1,18 @@
 package config
 
 type Autocode struct {
-	TransferRestart bool   `mapstructure:"transfer-restart" json:"transferRestart" yaml:"transfer-restart"`
+	TransferRestart bool   `mapstructure:"transfer-restart" json:"transfer-restart" yaml:"transfer-restart"`
 	Root            string `mapstructure:"root" json:"root" yaml:"root"`
 	Server          string `mapstructure:"server" json:"server" yaml:"server"`
-	SApi            string `mapstructure:"server-api" json:"serverApi" yaml:"server-api"`
-	SInitialize     string `mapstructure:"server-initialize" json:"serverInitialize" yaml:"server-initialize"`
-	SModel          string `mapstructure:"server-model" json:"serverModel" yaml:"server-model"`
-	SRequest        string `mapstructure:"server-request" json:"serverRequest"  yaml:"server-request"`
-	SRouter         string `mapstructure:"server-router" json:"serverRouter" yaml:"server-router"`
-	SService        string `mapstructure:"server-service" json:"serverService" yaml:"server-service"`
+	SApi            string `mapstructure:"server-api" json:"server-api" yaml:"server-api"`
+	SPlug           string `mapstructure:"server-plug" json:"server-plug" yaml:"server-plug"`
+	SInitialize     string `mapstructure:"server-initialize" json:"server-initialize" yaml:"server-initialize"`
+	SModel          string `mapstructure:"server-model" json:"server-model" yaml:"server-model"`
+	SRequest        string `mapstructure:"server-request" json:"server-request"  yaml:"server-request"`
+	SRouter         string `mapstructure:"server-router" json:"server-router" yaml:"server-router"`
+	SService        string `mapstructure:"server-service" json:"server-service" yaml:"server-service"`
 	Web             string `mapstructure:"web" json:"web" yaml:"web"`
-	WApi            string `mapstructure:"web-api" json:"webApi" yaml:"web-api"`
-	WForm           string `mapstructure:"web-form" json:"webForm" yaml:"web-form"`
-	WTable          string `mapstructure:"web-table" json:"webTable" yaml:"web-table"`
-	WFlow           string `mapstructure:"web-flow" json:"webFlow" yaml:"web-flow"`
+	WApi            string `mapstructure:"web-api" json:"web-api" yaml:"web-api"`
+	WForm           string `mapstructure:"web-form" json:"web-form" yaml:"web-form"`
+	WTable          string `mapstructure:"web-table" json:"web-table" yaml:"web-table"`
 }

server/config/captcha.go

@@ -1,7 +1,7 @@
 package config
 
 type Captcha struct {
-	KeyLong   int `mapstructure:"key-long" json:"keyLong" yaml:"key-long"`       // 验证码长度
-	ImgWidth  int `mapstructure:"img-width" json:"imgWidth" yaml:"img-width"`    // 验证码宽度
-	ImgHeight int `mapstructure:"img-height" json:"imgHeight" yaml:"img-height"` // 验证码高度
+	KeyLong   int `mapstructure:"key-long" json:"key-long" yaml:"key-long"`       // 验证码长度
+	ImgWidth  int `mapstructure:"img-width" json:"img-width" yaml:"img-width"`    // 验证码宽度
+	ImgHeight int `mapstructure:"img-height" json:"img-height" yaml:"img-height"` // 验证码高度
 }

server/config/casbin.go

@@ -1,5 +0,0 @@
-package config
-
-type Casbin struct {
-	ModelPath string `mapstructure:"model-path" json:"modelPath" yaml:"model-path"` // 存放casbin模型的相对路径
-}

server/config/config.go

@@ -5,18 +5,25 @@ type Server struct {
 	Zap     Zap     `mapstructure:"zap" json:"zap" yaml:"zap"`
 	Redis   Redis   `mapstructure:"redis" json:"redis" yaml:"redis"`
 	Email   Email   `mapstructure:"email" json:"email" yaml:"email"`
-	Casbin  Casbin  `mapstructure:"casbin" json:"casbin" yaml:"casbin"`
 	System  System  `mapstructure:"system" json:"system" yaml:"system"`
 	Captcha Captcha `mapstructure:"captcha" json:"captcha" yaml:"captcha"`
 	// auto
-	AutoCode Autocode `mapstructure:"autoCode" json:"autoCode" yaml:"autoCode"`
+	AutoCode Autocode `mapstructure:"autocode" json:"autocode" yaml:"autocode"`
 	// gorm
-	Mysql Mysql `mapstructure:"mysql" json:"mysql" yaml:"mysql"`
+	Mysql  Mysql           `mapstructure:"mysql" json:"mysql" yaml:"mysql"`
+	Pgsql  Pgsql           `mapstructure:"pgsql" json:"pgsql" yaml:"pgsql"`
+	DBList []SpecializedDB `mapstructure:"db-list" json:"db-list" yaml:"db-list"`
 	// oss
 	Local      Local      `mapstructure:"local" json:"local" yaml:"local"`
 	Qiniu      Qiniu      `mapstructure:"qiniu" json:"qiniu" yaml:"qiniu"`
-	AliyunOSS  AliyunOSS  `mapstructure:"aliyun-oss" json:"aliyunOSS" yaml:"aliyun-oss"`
-	TencentCOS TencentCOS `mapstructure:"tencent-cos" json:"tencentCOS" yaml:"tencent-cos"`
-	Excel      Excel      `mapstructure:"excel" json:"excel" yaml:"excel"`
-	Timer      Timer      `mapstructure:"timer" json:"timer" yaml:"timer"`
+	AliyunOSS  AliyunOSS  `mapstructure:"aliyun-oss" json:"aliyun-oss" yaml:"aliyun-oss"`
+	HuaWeiObs  HuaWeiObs  `mapstructure:"hua-wei-obs" json:"hua-wei-obs" yaml:"hua-wei-obs"`
+	TencentCOS TencentCOS `mapstructure:"tencent-cos" json:"tencent-cos" yaml:"tencent-cos"`
+	AwsS3      AwsS3      `mapstructure:"aws-s3" json:"aws-s3" yaml:"aws-s3"`
+
+	Excel Excel `mapstructure:"excel" json:"excel" yaml:"excel"`
+	Timer Timer `mapstructure:"timer" json:"timer" yaml:"timer"`
+
+	// 跨域配置
+	Cors CORS `mapstructure:"cors" json:"cors" yaml:"cors"`
 }

server/config/cors.go

@@ -0,0 +1,14 @@
+package config
+
+type CORS struct {
+	Mode      string          `mapstructure:"mode" json:"mode" yaml:"mode"`
+	Whitelist []CORSWhitelist `mapstructure:"whitelist" json:"whitelist" yaml:"whitelist"`
+}
+
+type CORSWhitelist struct {
+	AllowOrigin      string `mapstructure:"allow-origin" json:"allow-origin" yaml:"allow-origin"`
+	AllowMethods     string `mapstructure:"allow-methods" json:"allow-methods" yaml:"allow-methods"`
+	AllowHeaders     string `mapstructure:"allow-headers" json:"allow-headers" yaml:"allow-headers"`
+	ExposeHeaders    string `mapstructure:"expose-headers" json:"expose-headers" yaml:"expose-headers"`
+	AllowCredentials bool   `mapstructure:"allow-credentials" json:"allow-credentials" yaml:"allow-credentials"`
+}

server/config/db_list.go

@@ -0,0 +1,29 @@
+package config
+
+type DsnProvider interface {
+	Dsn() string
+}
+
+// Embeded 结构体可以压平到上一层，从而保持 config 文件的结构和原来一样
+// 见 playground: https://go.dev/play/p/KIcuhqEoxmY
+
+// GeneralDB 也被 Pgsql 和 Mysql 原样使用
+type GeneralDB struct {
+	Path         string `mapstructure:"path" json:"path" yaml:"path"`                               // 服务器地址:端口
+	Port         string `mapstructure:"port" json:"port" yaml:"port"`                               //:端口
+	Config       string `mapstructure:"config" json:"config" yaml:"config"`                         // 高级配置
+	Dbname       string `mapstructure:"db-name" json:"db-name" yaml:"db-name"`                      // 数据库名
+	Username     string `mapstructure:"username" json:"username" yaml:"username"`                   // 数据库用户名
+	Password     string `mapstructure:"password" json:"password" yaml:"password"`                   // 数据库密码
+	MaxIdleConns int    `mapstructure:"max-idle-conns" json:"max-idle-conns" yaml:"max-idle-conns"` // 空闲中的最大连接数
+	MaxOpenConns int    `mapstructure:"max-open-conns" json:"max-open-conns" yaml:"max-open-conns"` // 打开到数据库的最大连接数
+	LogMode      string `mapstructure:"log-mode" json:"log-mode" yaml:"log-mode"`                   // 是否开启Gorm全局日志
+	LogZap       bool   `mapstructure:"log-zap" json:"log-zap" yaml:"log-zap"`                      // 是否通过zap写入日志文件
+}
+
+type SpecializedDB struct {
+	Disable   bool   `mapstructure:"disable" json:"disable" yaml:"disable"`
+	Type      string `mapstructure:"type" json:"type" yaml:"type"`
+	AliasName string `mapstructure:"alias-name" json:"alias-name" yaml:"alias-name"`
+	GeneralDB `yaml:",inline" mapstructure:",squash"`
+}

server/config/email.go

@@ -5,7 +5,7 @@ type Email struct {
 	Port     int    `mapstructure:"port" json:"port" yaml:"port"`             // 端口
 	From     string `mapstructure:"from" json:"from" yaml:"from"`             // 收件人
 	Host     string `mapstructure:"host" json:"host" yaml:"host"`             // 服务器地址
-	IsSSL    bool   `mapstructure:"is-ssl" json:"isSSL" yaml:"is-ssl"`        // 是否SSL
+	IsSSL    bool   `mapstructure:"is-ssl" json:"is-ssl" yaml:"is-ssl"`       // 是否SSL
 	Secret   string `mapstructure:"secret" json:"secret" yaml:"secret"`       // 密钥
 	Nickname string `mapstructure:"nickname" json:"nickname" yaml:"nickname"` // 昵称
 }

server/config/gorm.go

@@ -1,17 +0,0 @@
-package config
-
-type Mysql struct {
-	Path         string `mapstructure:"path" json:"path" yaml:"path"`                             // 服务器地址:端口
-	Config       string `mapstructure:"config" json:"config" yaml:"config"`                       // 高级配置
-	Dbname       string `mapstructure:"db-name" json:"dbname" yaml:"db-name"`                     // 数据库名
-	Username     string `mapstructure:"username" json:"username" yaml:"username"`                 // 数据库用户名
-	Password     string `mapstructure:"password" json:"password" yaml:"password"`                 // 数据库密码
-	MaxIdleConns int    `mapstructure:"max-idle-conns" json:"maxIdleConns" yaml:"max-idle-conns"` // 空闲中的最大连接数
-	MaxOpenConns int    `mapstructure:"max-open-conns" json:"maxOpenConns" yaml:"max-open-conns"` // 打开到数据库的最大连接数
-	LogMode      string `mapstructure:"log-mode" json:"logMode" yaml:"log-mode"`                  // 是否开启Gorm全局日志
-	LogZap       bool   `mapstructure:"log-zap" json:"logZap" yaml:"log-zap"`                     // 是否通过zap写入日志文件
-}
-
-func (m *Mysql) Dsn() string {
-	return m.Username + ":" + m.Password + "@tcp(" + m.Path + ")/" + m.Dbname + "?" + m.Config
-}

server/config/gorm_mysql.go

@@ -0,0 +1,13 @@
+package config
+
+type Mysql struct {
+	GeneralDB `yaml:",inline" mapstructure:",squash"`
+}
+
+func (m *Mysql) Dsn() string {
+	return m.Username + ":" + m.Password + "@tcp(" + m.Path + ":" + m.Port + ")/" + m.Dbname + "?" + m.Config
+}
+
+func (m *Mysql) GetLogMode() string {
+	return m.LogMode
+}

server/config/gorm_pgsql.go

@@ -0,0 +1,21 @@
+package config
+
+type Pgsql struct {
+	GeneralDB `yaml:",inline" mapstructure:",squash"`
+}
+
+// Dsn 基于配置文件获取 dsn
+// Author [SliverHorn](https://github.com/SliverHorn)
+func (p *Pgsql) Dsn() string {
+	return "host=" + p.Path + " user=" + p.Username + " password=" + p.Password + " dbname=" + p.Dbname + " port=" + p.Port + " " + p.Config
+}
+
+// LinkDsn 根据 dbname 生成 dsn
+// Author [SliverHorn](https://github.com/SliverHorn)
+func (p *Pgsql) LinkDsn(dbname string) string {
+	return "host=" + p.Path + " user=" + p.Username + " password=" + p.Password + " dbname=" + dbname + " port=" + p.Port + " " + p.Config
+}
+
+func (m *Pgsql) GetLogMode() string {
+	return m.LogMode
+}

server/config/jwt.go

@@ -1,7 +1,8 @@
 package config
 
 type JWT struct {
-	SigningKey  string `mapstructure:"signing-key" json:"signingKey" yaml:"signing-key"`    // jwt签名
-	ExpiresTime int64  `mapstructure:"expires-time" json:"expiresTime" yaml:"expires-time"` // 过期时间
-	BufferTime  int64  `mapstructure:"buffer-time" json:"bufferTime" yaml:"buffer-time"`    // 缓冲时间
+	SigningKey  string `mapstructure:"signing-key" json:"signing-key" yaml:"signing-key"`    // jwt签名
+	ExpiresTime int64  `mapstructure:"expires-time" json:"expires-time" yaml:"expires-time"` // 过期时间
+	BufferTime  int64  `mapstructure:"buffer-time" json:"buffer-time" yaml:"buffer-time"`    // 缓冲时间
+	Issuer      string `mapstructure:"issuer" json:"issuer" yaml:"issuer"`                   // 签发者
 }

server/config/oss.go

@@ -1,32 +0,0 @@
-package config
-
-type Local struct {
-	Path string `mapstructure:"path" json:"path" yaml:"path"` // 本地文件路径
-}
-
-type Qiniu struct {
-	Zone          string `mapstructure:"zone" json:"zone" yaml:"zone"`                                // 存储区域
-	Bucket        string `mapstructure:"bucket" json:"bucket" yaml:"bucket"`                          // 空间名称
-	ImgPath       string `mapstructure:"img-path" json:"imgPath" yaml:"img-path"`                     // CDN加速域名
-	UseHTTPS      bool   `mapstructure:"use-https" json:"useHttps" yaml:"use-https"`                  // 是否使用https
-	AccessKey     string `mapstructure:"access-key" json:"accessKey" yaml:"access-key"`               // 秘钥AK
-	SecretKey     string `mapstructure:"secret-key" json:"secretKey" yaml:"secret-key"`               // 秘钥SK
-	UseCdnDomains bool   `mapstructure:"use-cdn-domains" json:"useCdnDomains" yaml:"use-cdn-domains"` // 上传是否使用CDN上传加速
-}
-
-type AliyunOSS struct {
-	Endpoint        string `mapstructure:"endpoint" json:"endpoint" yaml:"endpoint"`
-	AccessKeyId     string `mapstructure:"access-key-id" json:"accessKeyId" yaml:"access-key-id"`
-	AccessKeySecret string `mapstructure:"access-key-secret" json:"accessKeySecret" yaml:"access-key-secret"`
-	BucketName      string `mapstructure:"bucket-name" json:"bucketName" yaml:"bucket-name"`
-	BucketUrl       string `mapstructure:"bucket-url" json:"bucketUrl" yaml:"bucket-url"`
-	BasePath 		string `mapstructure:"base-path" json:"basePath" yaml:"base-path"`
-}
-type TencentCOS struct {
-	Bucket     string `mapstructure:"bucket" json:"bucket" yaml:"bucket"`
-	Region     string `mapstructure:"region" json:"region" yaml:"region"`
-	SecretID   string `mapstructure:"secret-id" json:"secretID" yaml:"secret-id"`
-	SecretKey  string `mapstructure:"secret-key" json:"secretKey" yaml:"secret-key"`
-	BaseURL    string `mapstructure:"base-url" json:"baseURL" yaml:"base-url"`
-	PathPrefix string `mapstructure:"path-prefix" json:"pathPrefix" yaml:"path-prefix"`
-}

server/config/oss_aliyun.go

@@ -0,0 +1,10 @@
+package config
+
+type AliyunOSS struct {
+	Endpoint        string `mapstructure:"endpoint" json:"endpoint" yaml:"endpoint"`
+	AccessKeyId     string `mapstructure:"access-key-id" json:"access-key-id" yaml:"access-key-id"`
+	AccessKeySecret string `mapstructure:"access-key-secret" json:"access-key-secret" yaml:"access-key-secret"`
+	BucketName      string `mapstructure:"bucket-name" json:"bucket-name" yaml:"bucket-name"`
+	BucketUrl       string `mapstructure:"bucket-url" json:"bucket-url" yaml:"bucket-url"`
+	BasePath        string `mapstructure:"base-path" json:"base-path" yaml:"base-path"`
+}

server/config/oss_aws.go

@@ -0,0 +1,13 @@
+package config
+
+type AwsS3 struct {
+	Bucket           string `mapstructure:"bucket" json:"bucket" yaml:"bucket"`
+	Region           string `mapstructure:"region" json:"region" yaml:"region"`
+	Endpoint         string `mapstructure:"endpoint" json:"endpoint" yaml:"endpoint"`
+	S3ForcePathStyle bool   `mapstructure:"s3-force-path-style" json:"s3-force-path-style" yaml:"s3-force-path-style"`
+	DisableSSL       bool   `mapstructure:"disable-ssl" json:"disable-ssl" yaml:"disable-ssl"`
+	SecretID         string `mapstructure:"secret-id" json:"secret-id" yaml:"secret-id"`
+	SecretKey        string `mapstructure:"secret-key" json:"secret-key" yaml:"secret-key"`
+	BaseURL          string `mapstructure:"base-url" json:"base-url" yaml:"base-url"`
+	PathPrefix       string `mapstructure:"path-prefix" json:"path-prefix" yaml:"path-prefix"`
+}

server/config/oss_huawei.go

@@ -0,0 +1,9 @@
+package config
+
+type HuaWeiObs struct {
+	Path      string `mapstructure:"path" json:"path" yaml:"path"`
+	Bucket    string `mapstructure:"bucket" json:"bucket" yaml:"bucket"`
+	Endpoint  string `mapstructure:"endpoint" json:"endpoint" yaml:"endpoint"`
+	AccessKey string `mapstructure:"access-key" json:"access-key" yaml:"access-key"`
+	SecretKey string `mapstructure:"secret-key" json:"secret-key" yaml:"secret-key"`
+}

server/config/oss_local.go

@@ -0,0 +1,6 @@
+package config
+
+type Local struct {
+	Path      string `mapstructure:"path" json:"path" yaml:"path"`                   // 本地文件访问路径
+	StorePath string `mapstructure:"store-path" json:"store-path" yaml:"store-path"` // 本地文件存储路径
+}

server/config/oss_qiniu.go

@@ -0,0 +1,11 @@
+package config
+
+type Qiniu struct {
+	Zone          string `mapstructure:"zone" json:"zone" yaml:"zone"`                                  // 存储区域
+	Bucket        string `mapstructure:"bucket" json:"bucket" yaml:"bucket"`                            // 空间名称
+	ImgPath       string `mapstructure:"img-path" json:"img-path" yaml:"img-path"`                      // CDN加速域名
+	UseHTTPS      bool   `mapstructure:"use-https" json:"use-https" yaml:"use-https"`                   // 是否使用https
+	AccessKey     string `mapstructure:"access-key" json:"access-key" yaml:"access-key"`                // 秘钥AK
+	SecretKey     string `mapstructure:"secret-key" json:"secret-key" yaml:"secret-key"`                // 秘钥SK
+	UseCdnDomains bool   `mapstructure:"use-cdn-domains" json:"use-cdn-domains" yaml:"use-cdn-domains"` // 上传是否使用CDN上传加速
+}

server/config/oss_tencent.go

@@ -0,0 +1,10 @@
+package config
+
+type TencentCOS struct {
+	Bucket     string `mapstructure:"bucket" json:"bucket" yaml:"bucket"`
+	Region     string `mapstructure:"region" json:"region" yaml:"region"`
+	SecretID   string `mapstructure:"secret-id" json:"secret-id" yaml:"secret-id"`
+	SecretKey  string `mapstructure:"secret-key" json:"secret-key" yaml:"secret-key"`
+	BaseURL    string `mapstructure:"base-url" json:"base-url" yaml:"base-url"`
+	PathPrefix string `mapstructure:"path-prefix" json:"path-prefix" yaml:"path-prefix"`
+}

server/config/system.go

@@ -1,9 +1,12 @@
 package config
 
 type System struct {
-	Env           string `mapstructure:"env" json:"env" yaml:"env"`                                 // 环境值
-	Addr          int    `mapstructure:"addr" json:"addr" yaml:"addr"`                              // 端口值
-	DbType        string `mapstructure:"db-type" json:"dbType" yaml:"db-type"`                      // 数据库类型:mysql(默认)|sqlite|sqlserver|postgresql
-	OssType       string `mapstructure:"oss-type" json:"ossType" yaml:"oss-type"`                   // Oss类型
-	UseMultipoint bool   `mapstructure:"use-multipoint" json:"useMultipoint" yaml:"use-multipoint"` // 多点登录拦截
+	Env           string `mapstructure:"env" json:"env" yaml:"env"`                                  // 环境值
+	Addr          int    `mapstructure:"addr" json:"addr" yaml:"addr"`                               // 端口值
+	DbType        string `mapstructure:"db-type" json:"db-type" yaml:"db-type"`                      // 数据库类型:mysql(默认)|sqlite|sqlserver|postgresql
+	OssType       string `mapstructure:"oss-type" json:"oss-type" yaml:"oss-type"`                   // Oss类型
+	UseMultipoint bool   `mapstructure:"use-multipoint" json:"use-multipoint" yaml:"use-multipoint"` // 多点登录拦截
+	UseRedis      bool   `mapstructure:"use-redis" json:"use-redis" yaml:"use-redis"`                // 使用redis
+	LimitCountIP  int    `mapstructure:"iplimit-count" json:"iplimit-count" yaml:"iplimit-count"`
+	LimitTimeIP   int    `mapstructure:"iplimit-time" json:"iplimit-time" yaml:"iplimit-time"`
 }

server/config/zap.go

@@ -1,13 +1,60 @@
 package config
 
+import (
+	"go.uber.org/zap/zapcore"
+	"strings"
+)
+
 type Zap struct {
-	Level         string `mapstructure:"level" json:"level" yaml:"level"`                           // 级别
-	Format        string `mapstructure:"format" json:"format" yaml:"format"`                        // 输出
-	Prefix        string `mapstructure:"prefix" json:"prefix" yaml:"prefix"`                        // 日志前缀
-	Director      string `mapstructure:"director" json:"director"  yaml:"director"`                 // 日志文件夹
-	LinkName      string `mapstructure:"link-name" json:"linkName" yaml:"link-name"`                // 软链接名称
-	ShowLine      bool   `mapstructure:"show-line" json:"showLine" yaml:"showLine"`                 // 显示行
-	EncodeLevel   string `mapstructure:"encode-level" json:"encodeLevel" yaml:"encode-level"`       // 编码级
-	StacktraceKey string `mapstructure:"stacktrace-key" json:"stacktraceKey" yaml:"stacktrace-key"` // 栈名
-	LogInConsole  bool   `mapstructure:"log-in-console" json:"logInConsole" yaml:"log-in-console"`  // 输出控制台
+	Level         string `mapstructure:"level" json:"level" yaml:"level"`                            // 级别
+	Prefix        string `mapstructure:"prefix" json:"prefix" yaml:"prefix"`                         // 日志前缀
+	Format        string `mapstructure:"format" json:"format" yaml:"format"`                         // 输出
+	Director      string `mapstructure:"director" json:"director"  yaml:"director"`                  // 日志文件夹
+	EncodeLevel   string `mapstructure:"encode-level" json:"encode-level" yaml:"encode-level"`       // 编码级
+	StacktraceKey string `mapstructure:"stacktrace-key" json:"stacktrace-key" yaml:"stacktrace-key"` // 栈名
+
+	MaxAge       int  `mapstructure:"mintage" json:"max-age" yaml:"max-age"`                      // 日志留存时间
+	ShowLine     bool `mapstructure:"show-line" json:"show-line" yaml:"show-line"`                // 显示行
+	LogInConsole bool `mapstructure:"log-in-console" json:"log-in-console" yaml:"log-in-console"` // 输出控制台
+}
+
+// ZapEncodeLevel 根据 EncodeLevel 返回 zapcore.LevelEncoder
+// Author [SliverHorn](https://github.com/SliverHorn)
+func (z *Zap) ZapEncodeLevel() zapcore.LevelEncoder {
+	switch {
+	case z.EncodeLevel == "LowercaseLevelEncoder": // 小写编码器(默认)
+		return zapcore.LowercaseLevelEncoder
+	case z.EncodeLevel == "LowercaseColorLevelEncoder": // 小写编码器带颜色
+		return zapcore.LowercaseColorLevelEncoder
+	case z.EncodeLevel == "CapitalLevelEncoder": // 大写编码器
+		return zapcore.CapitalLevelEncoder
+	case z.EncodeLevel == "CapitalColorLevelEncoder": // 大写编码器带颜色
+		return zapcore.CapitalColorLevelEncoder
+	default:
+		return zapcore.LowercaseLevelEncoder
+	}
+}
+
+// TransportLevel 根据字符串转化为 zapcore.Level
+// Author [SliverHorn](https://github.com/SliverHorn)
+func (z *Zap) TransportLevel() zapcore.Level {
+	z.Level = strings.ToLower(z.Level)
+	switch z.Level {
+	case "debug":
+		return zapcore.DebugLevel
+	case "info":
+		return zapcore.InfoLevel
+	case "warn":
+		return zapcore.WarnLevel
+	case "error":
+		return zapcore.WarnLevel
+	case "dpanic":
+		return zapcore.DPanicLevel
+	case "panic":
+		return zapcore.PanicLevel
+	case "fatal":
+		return zapcore.FatalLevel
+	default:
+		return zapcore.DebugLevel
+	}
 }

server/core/internal/constant.go

@@ -0,0 +1,9 @@
+package internal
+
+const (
+	ConfigEnv         = "GVA_CONFIG"
+	ConfigDefaultFile = "config.yaml"
+	ConfigTestFile    = "config.test.yaml"
+	ConfigDebugFile   = "config.debug.yaml"
+	ConfigReleaseFile = "config.release.yaml"
+)

server/core/internal/file_rotatelogs.go

@@ -0,0 +1,29 @@
+package internal
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	rotatelogs "github.com/lestrrat-go/file-rotatelogs"
+	"go.uber.org/zap/zapcore"
+	"os"
+	"path"
+	"time"
+)
+
+var FileRotatelogs = new(fileRotatelogs)
+
+type fileRotatelogs struct{}
+
+// GetWriteSyncer 获取 zapcore.WriteSyncer
+// Author [SliverHorn](https://github.com/SliverHorn)
+func (r *fileRotatelogs) GetWriteSyncer(level string) (zapcore.WriteSyncer, error) {
+	fileWriter, err := rotatelogs.New(
+		path.Join(global.GVA_CONFIG.Zap.Director, "%Y-%m-%d", level+".log"),
+		rotatelogs.WithClock(rotatelogs.Local),
+		rotatelogs.WithMaxAge(time.Duration(global.GVA_CONFIG.Zap.MaxAge)*24*time.Hour), // 日志留存时间
+		rotatelogs.WithRotationTime(time.Hour*24),
+	)
+	if global.GVA_CONFIG.Zap.LogInConsole {
+		return zapcore.NewMultiWriteSyncer(zapcore.AddSync(os.Stdout), zapcore.AddSync(fileWriter)), err
+	}
+	return zapcore.AddSync(fileWriter), err
+}

server/core/internal/zap.go

@@ -0,0 +1,107 @@
+package internal
+
+import (
+	"fmt"
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
+	"time"
+)
+
+var Zap = new(_zap)
+
+type _zap struct{}
+
+// GetEncoder 获取 zapcore.Encoder
+// Author [SliverHorn](https://github.com/SliverHorn)
+func (z *_zap) GetEncoder() zapcore.Encoder {
+	if global.GVA_CONFIG.Zap.Format == "json" {
+		return zapcore.NewJSONEncoder(z.GetEncoderConfig())
+	}
+	return zapcore.NewConsoleEncoder(z.GetEncoderConfig())
+}
+
+// GetEncoderConfig 获取zapcore.EncoderConfig
+// Author [SliverHorn](https://github.com/SliverHorn)
+func (z *_zap) GetEncoderConfig() zapcore.EncoderConfig {
+	return zapcore.EncoderConfig{
+		MessageKey:     "message",
+		LevelKey:       "level",
+		TimeKey:        "time",
+		NameKey:        "logger",
+		CallerKey:      "caller",
+		StacktraceKey:  global.GVA_CONFIG.Zap.StacktraceKey,
+		LineEnding:     zapcore.DefaultLineEnding,
+		EncodeLevel:    global.GVA_CONFIG.Zap.ZapEncodeLevel(),
+		EncodeTime:     z.CustomTimeEncoder,
+		EncodeDuration: zapcore.SecondsDurationEncoder,
+		EncodeCaller:   zapcore.FullCallerEncoder,
+	}
+}
+
+// GetEncoderCore 获取Encoder的 zapcore.Core
+// Author [SliverHorn](https://github.com/SliverHorn)
+func (z *_zap) GetEncoderCore(l zapcore.Level, level zap.LevelEnablerFunc) zapcore.Core {
+	writer, err := FileRotatelogs.GetWriteSyncer(l.String()) // 使用file-rotatelogs进行日志分割
+	if err != nil {
+		fmt.Printf("Get Write Syncer Failed err:%v", err.Error())
+		return nil
+	}
+
+	return zapcore.NewCore(z.GetEncoder(), writer, level)
+}
+
+// CustomTimeEncoder 自定义日志输出时间格式
+// Author [SliverHorn](https://github.com/SliverHorn)
+func (z *_zap) CustomTimeEncoder(t time.Time, encoder zapcore.PrimitiveArrayEncoder) {
+	encoder.AppendString(t.Format(global.GVA_CONFIG.Zap.Prefix + "2006/01/02 - 15:04:05.000"))
+}
+
+// GetZapCores 根据配置文件的Level获取 []zapcore.Core
+// Author [SliverHorn](https://github.com/SliverHorn)
+func (z *_zap) GetZapCores() []zapcore.Core {
+	cores := make([]zapcore.Core, 0, 7)
+	for level := global.GVA_CONFIG.Zap.TransportLevel(); level <= zapcore.FatalLevel; level++ {
+		cores = append(cores, z.GetEncoderCore(level, z.GetLevelPriority(level)))
+	}
+	return cores
+}
+
+// GetLevelPriority 根据 zapcore.Level 获取 zap.LevelEnablerFunc
+// Author [SliverHorn](https://github.com/SliverHorn)
+func (z *_zap) GetLevelPriority(level zapcore.Level) zap.LevelEnablerFunc {
+	switch level {
+	case zapcore.DebugLevel:
+		return func(level zapcore.Level) bool { // 调试级别
+			return level == zap.DebugLevel
+		}
+	case zapcore.InfoLevel:
+		return func(level zapcore.Level) bool { // 日志级别
+			return level == zap.InfoLevel
+		}
+	case zapcore.WarnLevel:
+		return func(level zapcore.Level) bool { // 警告级别
+			return level == zap.WarnLevel
+		}
+	case zapcore.ErrorLevel:
+		return func(level zapcore.Level) bool { // 错误级别
+			return level == zap.ErrorLevel
+		}
+	case zapcore.DPanicLevel:
+		return func(level zapcore.Level) bool { // dpanic级别
+			return level == zap.DPanicLevel
+		}
+	case zapcore.PanicLevel:
+		return func(level zapcore.Level) bool { // panic级别
+			return level == zap.PanicLevel
+		}
+	case zapcore.FatalLevel:
+		return func(level zapcore.Level) bool { // 终止级别
+			return level == zap.FatalLevel
+		}
+	default:
+		return func(level zapcore.Level) bool { // 调试级别
+			return level == zap.DebugLevel
+		}
+	}
+}

server/core/server.go

@@ -2,10 +2,12 @@ package core
 
 import (
 	"fmt"
-	"gin-vue-admin/global"
-	"gin-vue-admin/initialize"
-	"go.uber.org/zap"
 	"time"
+
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"github.com/flipped-aurora/gin-vue-admin/server/initialize"
+	"github.com/flipped-aurora/gin-vue-admin/server/service/system"
+	"go.uber.org/zap"
 )
 
 type server interface {
@@ -13,10 +15,16 @@ type server interface {
 }
 
 func RunWindowsServer() {
-	if global.GVA_CONFIG.System.UseMultipoint {
+	if global.GVA_CONFIG.System.UseMultipoint || global.GVA_CONFIG.System.UseRedis {
 		// 初始化redis服务
 		initialize.Redis()
 	}
+
+	// 从db加载jwt数据
+	if global.GVA_DB != nil {
+		system.LoadAll()
+	}
+
 	Router := initialize.Routers()
 	Router.Static("/form-generator", "./resource/page")
 
@@ -28,9 +36,11 @@ func RunWindowsServer() {
 	global.GVA_LOG.Info("server run success on ", zap.String("address", address))
 
 	fmt.Printf(`
-	欢迎使用 Gin-Vue-Admin
-	当前版本:V2.4.3
+	欢迎使用 gin-vue-admin
+	当前版本:v2.5.3beta
     加群方式:微信号：shouzi_1994 QQ群：622360840
+	插件市场:https://plugin.gin-vue-admin.com
+	GVA讨论社区:https://support.qq.com/products/371961
 	默认自动化文档地址:http://127.0.0.1%s/swagger/index.html
 	默认前端文件运行地址:http://127.0.0.1:8080
 	如果项目让您获得了收益，希望您能请团队喝杯可乐:https://www.gin-vue-admin.com/docs/coffee

server/core/server_other.go

@@ -1,17 +1,19 @@
+//go:build !windows
 // +build !windows
 
 package core
 
 import (
+	"time"
+
 	"github.com/fvbock/endless"
 	"github.com/gin-gonic/gin"
-	"time"
 )
 
 func initServer(address string, router *gin.Engine) server {
 	s := endless.NewServer(address, router)
-	s.ReadHeaderTimeout = 10 * time.Millisecond
-	s.WriteTimeout = 10 * time.Second
+	s.ReadHeaderTimeout = 20 * time.Second
+	s.WriteTimeout = 20 * time.Second
 	s.MaxHeaderBytes = 1 << 20
 	return s
 }

server/core/server_win.go

@@ -1,19 +1,21 @@
+//go:build windows
 // +build windows
 
 package core
 
 import (
-	"github.com/gin-gonic/gin"
 	"net/http"
 	"time"
+
+	"github.com/gin-gonic/gin"
 )
 
 func initServer(address string, router *gin.Engine) server {
 	return &http.Server{
 		Addr:           address,
 		Handler:        router,
-		ReadTimeout:    10 * time.Second,
-		WriteTimeout:   10 * time.Second,
+		ReadTimeout:    20 * time.Second,
+		WriteTimeout:   20 * time.Second,
 		MaxHeaderBytes: 1 << 20,
 	}
 }

server/core/viper.go

@@ -3,35 +3,52 @@ package core
 import (
 	"flag"
 	"fmt"
-	"gin-vue-admin/global"
-	_ "gin-vue-admin/packfile"
-	"gin-vue-admin/utils"
+	"github.com/flipped-aurora/gin-vue-admin/server/core/internal"
+	"github.com/gin-gonic/gin"
 	"os"
 	"path/filepath"
+	"time"
 
+	"github.com/songzhibin97/gkit/cache/local_cache"
+
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	_ "github.com/flipped-aurora/gin-vue-admin/server/packfile"
 	"github.com/fsnotify/fsnotify"
 	"github.com/spf13/viper"
 )
 
+// Viper //
+// 优先级: 命令行 > 环境变量 > 默认值
+// Author [SliverHorn](https://github.com/SliverHorn)
 func Viper(path ...string) *viper.Viper {
 	var config string
+
 	if len(path) == 0 {
 		flag.StringVar(&config, "c", "", "choose config file.")
 		flag.Parse()
-		if config == "" { // 优先级: 命令行 > 环境变量 > 默认值
-			if configEnv := os.Getenv(utils.ConfigEnv); configEnv == "" {
-				config = utils.ConfigFile
-				fmt.Printf("您正在使用config的默认值,config的路径为%v\n", utils.ConfigFile)
-			} else {
+		if config == "" { // 判断命令行参数是否为空
+			if configEnv := os.Getenv(internal.ConfigEnv); configEnv == "" { // 判断 internal.ConfigEnv 常量存储的环境变量是否为空
+				switch gin.Mode() {
+				case gin.DebugMode:
+					config = internal.ConfigDefaultFile
+					fmt.Printf("您正在使用gin模式的%s环境名称,config的路径为%s\n", gin.EnvGinMode, internal.ConfigDefaultFile)
+				case gin.ReleaseMode:
+					config = internal.ConfigReleaseFile
+					fmt.Printf("您正在使用gin模式的%s环境名称,config的路径为%s\n", gin.EnvGinMode, internal.ConfigReleaseFile)
+				case gin.TestMode:
+					config = internal.ConfigTestFile
+					fmt.Printf("您正在使用gin模式的%s环境名称,config的路径为%s\n", gin.EnvGinMode, internal.ConfigTestFile)
+				}
+			} else { // internal.ConfigEnv 常量存储的环境变量不为空 将值赋值于config
 				config = configEnv
-				fmt.Printf("您正在使用GVA_CONFIG环境变量,config的路径为%v\n", config)
+				fmt.Printf("您正在使用%s环境变量,config的路径为%s\n", internal.ConfigEnv, config)
 			}
-		} else {
-			fmt.Printf("您正在使用命令行的-c参数传递的值,config的路径为%v\n", config)
+		} else { // 命令行参数不为空 将值赋值于config
+			fmt.Printf("您正在使用命令行的-c参数传递的值,config的路径为%s\n", config)
 		}
-	} else {
+	} else { // 函数传递的可变参数的第一个值赋值于config
 		config = path[0]
-		fmt.Printf("您正在使用func Viper()传递的值,config的路径为%v\n", config)
+		fmt.Printf("您正在使用func Viper()传递的值,config的路径为%s\n", config)
 	}
 
 	v := viper.New()
@@ -45,13 +62,18 @@ func Viper(path ...string) *viper.Viper {
 
 	v.OnConfigChange(func(e fsnotify.Event) {
 		fmt.Println("config file changed:", e.Name)
-		if err := v.Unmarshal(&global.GVA_CONFIG); err != nil {
+		if err = v.Unmarshal(&global.GVA_CONFIG); err != nil {
 			fmt.Println(err)
 		}
 	})
-	if err := v.Unmarshal(&global.GVA_CONFIG); err != nil {
+	if err = v.Unmarshal(&global.GVA_CONFIG); err != nil {
 		fmt.Println(err)
 	}
+
+	// root 适配性 根据root位置去找到对应迁移位置,保证root路径有效
 	global.GVA_CONFIG.AutoCode.Root, _ = filepath.Abs("..")
+	global.BlackCache = local_cache.NewCache(
+		local_cache.SetDefaultExpire(time.Second * time.Duration(global.GVA_CONFIG.JWT.ExpiresTime)),
+	)
 	return v
 }

server/core/zap.go

@@ -2,101 +2,27 @@ package core
 
 import (
 	"fmt"
-	"gin-vue-admin/global"
-	"gin-vue-admin/utils"
+	"github.com/flipped-aurora/gin-vue-admin/server/core/internal"
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"github.com/flipped-aurora/gin-vue-admin/server/utils"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 	"os"
-	"time"
 )
 
-var level zapcore.Level
-
+// Zap 获取 zap.Logger
+// Author [SliverHorn](https://github.com/SliverHorn)
 func Zap() (logger *zap.Logger) {
 	if ok, _ := utils.PathExists(global.GVA_CONFIG.Zap.Director); !ok { // 判断是否有Director文件夹
 		fmt.Printf("create %v directory\n", global.GVA_CONFIG.Zap.Director)
 		_ = os.Mkdir(global.GVA_CONFIG.Zap.Director, os.ModePerm)
 	}
 
-	switch global.GVA_CONFIG.Zap.Level { // 初始化配置文件的Level
-	case "debug":
-		level = zap.DebugLevel
-	case "info":
-		level = zap.InfoLevel
-	case "warn":
-		level = zap.WarnLevel
-	case "error":
-		level = zap.ErrorLevel
-	case "dpanic":
-		level = zap.DPanicLevel
-	case "panic":
-		level = zap.PanicLevel
-	case "fatal":
-		level = zap.FatalLevel
-	default:
-		level = zap.InfoLevel
-	}
+	cores := internal.Zap.GetZapCores()
+	logger = zap.New(zapcore.NewTee(cores...))
 
-	if level == zap.DebugLevel || level == zap.ErrorLevel {
-		logger = zap.New(getEncoderCore(), zap.AddStacktrace(level))
-	} else {
-		logger = zap.New(getEncoderCore())
-	}
 	if global.GVA_CONFIG.Zap.ShowLine {
 		logger = logger.WithOptions(zap.AddCaller())
 	}
 	return logger
 }
-
-// getEncoderConfig 获取zapcore.EncoderConfig
-func getEncoderConfig() (config zapcore.EncoderConfig) {
-	config = zapcore.EncoderConfig{
-		MessageKey:     "message",
-		LevelKey:       "level",
-		TimeKey:        "time",
-		NameKey:        "logger",
-		CallerKey:      "caller",
-		StacktraceKey:  global.GVA_CONFIG.Zap.StacktraceKey,
-		LineEnding:     zapcore.DefaultLineEnding,
-		EncodeLevel:    zapcore.LowercaseLevelEncoder,
-		EncodeTime:     CustomTimeEncoder,
-		EncodeDuration: zapcore.SecondsDurationEncoder,
-		EncodeCaller:   zapcore.FullCallerEncoder,
-	}
-	switch {
-	case global.GVA_CONFIG.Zap.EncodeLevel == "LowercaseLevelEncoder": // 小写编码器(默认)
-		config.EncodeLevel = zapcore.LowercaseLevelEncoder
-	case global.GVA_CONFIG.Zap.EncodeLevel == "LowercaseColorLevelEncoder": // 小写编码器带颜色
-		config.EncodeLevel = zapcore.LowercaseColorLevelEncoder
-	case global.GVA_CONFIG.Zap.EncodeLevel == "CapitalLevelEncoder": // 大写编码器
-		config.EncodeLevel = zapcore.CapitalLevelEncoder
-	case global.GVA_CONFIG.Zap.EncodeLevel == "CapitalColorLevelEncoder": // 大写编码器带颜色
-		config.EncodeLevel = zapcore.CapitalColorLevelEncoder
-	default:
-		config.EncodeLevel = zapcore.LowercaseLevelEncoder
-	}
-	return config
-}
-
-// getEncoder 获取zapcore.Encoder
-func getEncoder() zapcore.Encoder {
-	if global.GVA_CONFIG.Zap.Format == "json" {
-		return zapcore.NewJSONEncoder(getEncoderConfig())
-	}
-	return zapcore.NewConsoleEncoder(getEncoderConfig())
-}
-
-// getEncoderCore 获取Encoder的zapcore.Core
-func getEncoderCore() (core zapcore.Core) {
-	writer, err := utils.GetWriteSyncer() // 使用file-rotatelogs进行日志分割
-	if err != nil {
-		fmt.Printf("Get Write Syncer Failed err:%v", err.Error())
-		return
-	}
-	return zapcore.NewCore(getEncoder(), writer, level)
-}
-
-// 自定义日志输出时间格式
-func CustomTimeEncoder(t time.Time, enc zapcore.PrimitiveArrayEncoder) {
-	enc.AppendString(t.Format(global.GVA_CONFIG.Zap.Prefix + "2006/01/02 - 15:04:05.000"))
-}

server/global/global.go

@@ -1,26 +1,51 @@
 package global
 
 import (
-	"gin-vue-admin/utils/timer"
+	"sync"
+
+	"github.com/flipped-aurora/gin-vue-admin/server/utils/timer"
+	"github.com/songzhibin97/gkit/cache/local_cache"
 
 	"golang.org/x/sync/singleflight"
 
 	"go.uber.org/zap"
 
-	"gin-vue-admin/config"
+	"github.com/flipped-aurora/gin-vue-admin/server/config"
 
-	"github.com/go-redis/redis"
+	"github.com/go-redis/redis/v8"
 	"github.com/spf13/viper"
 	"gorm.io/gorm"
 )
 
 var (
 	GVA_DB     *gorm.DB
+	GVA_DBList map[string]*gorm.DB
 	GVA_REDIS  *redis.Client
 	GVA_CONFIG config.Server
 	GVA_VP     *viper.Viper
-	//GVA_LOG    *oplogging.Logger
+	// GVA_LOG    *oplogging.Logger
 	GVA_LOG                 *zap.Logger
 	GVA_Timer               timer.Timer = timer.NewTimerTask()
 	GVA_Concurrency_Control             = &singleflight.Group{}
+
+	BlackCache local_cache.Cache
+	lock       sync.RWMutex
 )
+
+// GetGlobalDBByDBName 通过名称获取db list中的db
+func GetGlobalDBByDBName(dbname string) *gorm.DB {
+	lock.RLock()
+	defer lock.RUnlock()
+	return GVA_DBList[dbname]
+}
+
+// MustGetGlobalDBByDBName 通过名称获取db 如果不存在则panic
+func MustGetGlobalDBByDBName(dbname string) *gorm.DB {
+	lock.RLock()
+	defer lock.RUnlock()
+	db, ok := GVA_DBList[dbname]
+	if !ok || db == nil {
+		panic("db no init")
+	}
+	return db
+}

server/global/model.go

@@ -1,8 +1,9 @@
 package global
 
 import (
-	"gorm.io/gorm"
 	"time"
+
+	"gorm.io/gorm"
 )
 
 type GVA_MODEL struct {