Merge branch 'gva_gormv2_dev' of...

Merge branch 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev

.docker-compose/nginx/conf.d/my.conf

+server {
+    listen       8000;
+    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://177.7.0.12:8888; # 设置代理服务器的协议和地址
+     }
+
+    location /api/swagger/index.html {
+        proxy_pass http://127.0.0.1:8888/swagger/index.html;
+     }
+ }
\ No newline at end of file

.docker-compose/shell/server-handle.sh

 #! /bin/bash
 
-rm -f ./core/server.go
-# 生成server.go文件, 添加Router.Static("/admin", "./resource/dist")这个代码
-touch ./core/server.go
-filename="./core/server.go"
-cat>"${filename}"<<EOF
-package core
-
-import (
-	"fmt"
-	"gin-vue-admin/global"
-	"gin-vue-admin/initialize"
-	"time"
-)
-
-type server interface {
-	ListenAndServe() error
-}
-
-func RunWindowsServer() {
-	if global.GVA_CONFIG.System.UseMultipoint {
-		// 初始化redis服务
-		initialize.Redis()
-	}
-	Router := initialize.Routers()
-	Router.Static("/form-generator", "./resource/page")
-	Router.Static("/admin", "./resource/dist")
-
-	//InstallPlugs(Router)
-	// end 插件描述
-
-	address := fmt.Sprintf(":%d", global.GVA_CONFIG.System.Addr)
-	s := initServer(address, Router)
-	// 保证文本顺序输出
-	// In order to ensure that the text order output can be deleted
-	time.Sleep(10 * time.Microsecond)
-	global.GVA_LOG.Debug("server run success on ", address)
-
-	fmt.Printf("欢迎使用 Gin-Vue-Admin默认自动化文档地址:http://127.0.0.1%s/swagger/index.html\n 默认前端文件运行地址:http://127.0.0.1:8888/admin\n", address)
-	global.GVA_LOG.Error(s.ListenAndServe())
-}
-EOF
-
 rm -f ./config.yaml
 # 生成config.yaml文件, 用于docker-compose的使用
 touch ./config.yaml
@@ -108,11 +66,28 @@ captcha:
     img-width: 240
     img-height: 80
 
-# logger configuration
-log:
-    prefix: '[GIN-VUE-ADMIN]'
-    log-file: true
-    stdout: 'DEBUG'
-    file: 'DEBUG'
+# zap logger configuration
+zap:
+  # 可使用 "debug", "info", "warn", "error", "dpanic", "panic", "fatal",
+  level: 'info'
+  # console: 控制台, json: json格式输出
+  format: 'console'
+  prefix: '[GIN-VUE-ADMIN]'
+  director: 'log'
+  link-name: 'latest_log'
+  show-line: true
+  # LowercaseLevelEncoder:小写, LowercaseColorLevelEncoder:小写带颜色,CapitalLevelEncoder: 大写, CapitalColorLevelEncoder: 大写带颜色,
+  encode-level: 'LowercaseColorLevelEncoder'
+  stacktrace-key: 'stacktrace'
+  log-in-console: true
+
+email:
+  email-from: 'xxx@163.com'
+  email-nickname: 'test'
+  email-secret: 'xxx'
+  email-to: 'xxx@qq.com'
+  email-host: 'smtp.163.com'
+  email-port: 465
+  email-isSSL: true
 EOF
 

.docker-compose/shell/web-handle.sh

-#! /bin/bash
-
-rm -f .env.production
-touch .env.production
-filename="./.env.production"
-cat>"${filename}"<<EOF
-ENV = 'production'
-VUE_APP_BASE_API = ''
-EOF
-

README-en.md

+
+<div align=center>
+<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.12-blue"/>
+<img src="https://img.shields.io/badge/gin-1.4.0-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.9.12-red"/>
+</div>
+
+English | [简体中文](./README.md)
+
+# Project Guidelines
+[Online Documentation](https://www.gin-vue-admin.com/) : https://www.gin-vue-admin.com/
+
+
+
+[Development Steps](https://www.gin-vue-admin.com/docs/help) (Contributor:  <a href="https://github.com/LLemonGreen">LLemonGreen</a> And <a href="https://github.com/fkk0509">Fann</a>)
+- Web UI Framework：[element-ui](https://github.com/ElemeFE/element)  
+- Server Framework：[gin](https://github.com/gin-gonic/gin) 
+
+## 1. Basic Introduction
+
+### 1.1 Project Introduction
+
+[Online Demo](http://demo.gin-vue-admin.com/)
+
+username：admin
+
+password：123456
+
+> Gin-vue-admin is a full-stack (frontend and backend separation) framework designed for management system. 
+> It integrates multiple functions, such as JWT authentication, dynamic routing, dynamic menu, casbin authentication, form generator, code generator, etc. So that you can focus more time on your business Requirements.
+
+Hi! Thank you for choosing gin-vue-admin.
+
+Gin-vue-admin is a full-stack (frontend and backend separation) framework for developers, designers and product managers.
+
+We are excited that you are interested in contributing to gin-vue-admin. Before submitting your contribution though, please make sure to take a moment and read through the following guidelines.
+
+### 1.2 Contributing Guide
+#### 1.2.1 Issue Guidelines
+
+- Issues are exclusively for bug reports, feature requests and design-related topics. Other questions may be closed directly. If any questions come up when you are using Element, please hit [Gitter](https://gitter.im/element-en/Lobby) for help.
+
+- Before submitting an issue, please check if similar problems have already been issued.
+
+#### 1.2.2 Pull Request Guidelines
+
+- Fork this repository to your own account. Do not create branches here.
+
+- Commit info should be formatted as `[File Name]: Info about commit.` (e.g. `README.md: Fix xxx bug`)
+
+- <font color=red>Make sure PRs are created to `develop` branch instead of `master` branch.</font>
+
+- If your PR fixes a bug, please provide a description about the related bug.
+
+- Merging a PR takes two maintainers: one approves the changes after reviewing, and then the other reviews and merges.
+
+### 1.3 Version list
+
+- master: 2.0 code, for prod
+- develop: 2.0 dev code, for test
+- [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) Stable branch)
+- [gva_gormv2_dev](https://github.com/flipped-aurora/gin-vue-admin/tree/gva_gormv2_dev) (v2.0 [GormV2](https://v2.gorm.io) Development branch)
+
+## 2. Getting started
+
+```
+- node version > v8.6.0
+- golang version >= v1.11
+- IDE recommendation: Goland
+- We recommend you to apply for your own cloud service in QINIU. Replace the public key, private key, warehouse name and default url address with your own, so as not to mess up the test database.
+```
+
+> Use docker-compose to experience this project
+- Installation docker-compose [Official document](https://docs.docker.com/compose/install/)
+    - ```shell script
+       # Install on Linux
+       # 1.1 Run this command to download the current stable version of Docker Compose
+       sudo curl -L "https://github.com/docker/compose/releases/download/1.26.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+       # 1.2 Apply executable permissions to binary files
+       sudo chmod +x /usr/local/bin/docker-compose 
+      ```
+    - ```shell script
+       # Use Python's pip installation
+       pip3 install docker-compose -i https://pypi.tuna.tsinghua.edu.cn/simple
+      ```
+    - Use Docker Desktop 
+        - Windows: https://hub.docker.com/editions/community/docker-ce-desktop-windows
+        - Mac: https://hub.docker.com/editions/community/docker-ce-desktop-mac/
+
+- Use git to clone this project
+    - ```git
+        git clone https://github.com/flipped-aurora/gin-vue-admin.git
+      ```
+    
+- Use docker-compose up to start the startup project with one click
+    - ```shell script
+      # Use docker-compose to start four containers
+      docker-compose up
+      # If you modify some configuration options, you can use this command to repackage the image
+      docker-compose up --build
+      # Use docker-compose to start in the background
+      docker-compose up -d
+      ```
+
+    - Web project preview [http://127.0.0.1:8000](http://127.0.0.1:8000)
+
+    - swagger APIs [http://127.0.0.1:8888/swagger/index.html](http://127.0.0.1:8888/swagger/index.html)
+
+- If the internal ip of the server's 177.7.0.12 container is occupied, the place to be modified is
+
+  - Replace 177.7.0.12 on line 39 of [docker-compose.yaml](./docker-compose.yaml) with the ip you want
+  - Replace 177.7.0.12 in line 20 of [.docker-compose/nginx/conf.d/my.conf](./.docker-compose/nginx/conf.d/my.conf) with the ip you want
+
+- docker-compose uses a custom docker network
+
+    - ```dockerfile
+        networks:
+          network:
+            ipam:
+              driver: default
+              config:
+                - subnet: '177.7.0.0/16' 
+        ```
+
+    - Subnet address, the default gateway is 177.7.0.1 (docker-compose V2 needs to write, V3 does not need),For specific information, see the [official document](https://docs.docker.com/compose/compose-file/#ipv4_address-ipv6_address)
+
+    - The default network name is gin-vue-admin_network, and the default is bridge mode
+
+    - If the subnet is modified, the ipv4_address of each service needs to be modified, and the ip of the server on line 20 of [.docker-compose/nginx/conf.d/my.conf](.docker-compose/nginx/conf.d/my.conf) also needs to be modified
+
+> <font color=red>**Use docker-compose to deploy this project need attention**</font>
+
+- For mysql database, please use a local database installed on the server disk.
+	- Avoid using mysql in the docker container, there may be write problems, io is lower than the host machine, docker's persistence mechanism problem
+- [init.sql](.docker-compose/docker-entrypoint-initdb.d/init.sql) is for docker-compose ==experience this project==, prohibit the use of [init.sql](.docker-compose/docker-entrypoint-initdb.d/init.sql) to initialize project data, Database initialization[Please use this method](https://www.gin-vue-admin.com/docs/help#step1%EF%BC%9A%E6%95%B0%E6%8D%AE%E5%BA%93%E5%88%9D%E5%A7%8B%E5%8C%96)
+	- Use [init.sql](.docker-compose/docker-entrypoint-initdb.d/init.sql) to initialize all problems, please bear it yourself, and have nothing to do with this project
+- When deploying using docker-compose of this project,Please modify the [nginx configuration](.docker-compose/nginx/conf.d/my.conf), mysql configuration, networks configuration, redis configuration corresponding to [docker-compose.yaml](./docker-compose.yaml), and make changes as needed.
+
+### 2.1 Web
+
+```bash
+# clone the project
+git clone https://github.com/piexlmax/gin-vue-admin.git
+
+# enter the project directory
+cd web
+
+# install dependency
+npm install
+
+# develop
+npm run serve
+```
+
+### 2.2 Server
+
+```bash
+# using go.mod
+
+# install go modules
+go list (go mod tidy)
+
+# build the server
+go build
+```
+
+> Zap log library usage guide && configuration guide
+
+The configuration of the Zap log library selects zap under [config.yaml](./server/config.yaml)
+
+```yaml
+# zap logger configuration
+zap:
+  level: 'debug'
+  format: 'console'
+  prefix: '[GIN-VUE-ADMIN]'
+  director: 'log'
+  link_name: 'latest_log'
+  show_line: true
+  encode_level: 'LowercaseColorLevelEncoder'
+  stacktrace_key: 'stacktrace'
+  log_in_console: true
+```
+
+| Configuration Name | Type Of Configuration | Description                                                  |
+| ------------------ | --------------------- | ------------------------------------------------------------ |
+| level              | string                | For a detailed description of the level mode, please see the official [zap documentation](https://pkg.go.dev/go.uber.org/zap?tab=doc#pkg-constants) <br />info: info mode, stack information without errors, only output information<br />debug: debug mode, stack details with errors<br />warn:warn mode<br />error: error mode, stack details with error<br />dpanic: dpanic mode<br />panic: panic mode<br />fatal: fatal mode<br /> |
+| format             | string                | console: Output log in console format<br />json: json format output log |
+| prefix             | string                | Log prefix                                                   |
+| director           | string                | The folder to store the log can be modified, no need to create it manually |
+| link_name          | string                | [A soft connection file](https://baike.baidu.com/item/%E8%BD%AF%E9%93%BE%E6%8E%A5) of link_name will be generated in the server directory, and the link is the latest log file of the director configuration item |
+| show_line          | bool                  | Display the line number, the default is true, it is not recommended to modify |
+| encode_level       | string                | LowercaseLevelEncoder: lowercase<br /> LowercaseColorLevelEncoder: lowercase with color<br />CapitalLevelEncoder: uppercase<br />CapitalColorLevelEncoder: uppercase with color |
+| stacktrace_key     | string                | The name of the stack, that is, the key of josn when outputting the log in json format |
+| log_in_console     | bool                  | Whether to output to the console, the default is true        |
+
+- Development environment || Debug environment configuration recommendations
+	- `level:debug`
+	- `format:console`
+	- `encode_level:LowercaseColorLevelEncoder`或者`encode_leve:CapitalColorLevelEncoder`
+- Deployment environment configuration recommendations
+	- `level:error`
+	- `format:json` 
+	- `encode_level: LowercaseLevelEncoder `或者 `encode_level:CapitalLevelEncoder`
+	- `log_in_console: false` 
+- <font color=red>Suggestions are only suggestions, you can proceed according to your own needs, and suggestions are for reference only</font>
+
+### 2.3 API docs auto-generation using swagger
+
+#### 2.3.1 install swagger 
+
+##### (1) Using VPN or outside mainland China
+````
+go get -u github.com/swaggo/swag/cmd/swag
+````
+
+##### (2) In mainland China
+
+In mainland China, access to go.org/x is prohibited，we recommend [goproxy.io](https://goproxy.io/zh/)
+
+````bash
+If you are using Go version 1.13 and above (recommended)
+# Enable Go Modules function
+go env -w GO111MODULE=on 
+# Configure GOPROXY environment variables
+go env -w GOPROXY=https://goproxy.io,direct
+If you are using Go version 1.12 and below
+go env -w GO111MODULE=on
+go env -w GOPROXY=https://goproxy.io
+
+# Use the following command to download swag
+go get -u github.com/swaggo/swag/cmd/swag
+````
+
+#### 2.3.2 API docs generation
+
+````
+cd server
+swag init
+````
+After executing the above command，`docs` will show in `server/`，then open your browser, jump into `http://localhost:8888/swagger/index.html` to see the swagger APIs.
+
+
+## 3. Technical selection
+
+- Frontend: using `Element-UI` based on vue，to code the page.
+- Backend: using `Gin` to quickly build basic RESTful API. `Gin` is a web framework written in Go (Golang).
+- DB: `MySql`(5.6.44)，using `gorm` to implement data manipulation, added support for SQLite databases.
+- Cache: using `Redis` to implement the recording of the JWT token of the currently active user and implement the multi-login restriction.
+- API: using Swagger to auto generate APIs docs。
+- Config: using `fsnotify` and `viper` to implement `yaml` config file。
+- Log: using `go-logging` record logs。
+
+## 4. Project Architecture
+
+### 4.1 Architecture Diagram
+
+![Architecture diagram](http://qmplusimg.henrongyi.top/gva/gin-vue-admin.png)
+
+### 4.2 Front-end Detailed Design Diagram (Contributor: <a href="https://github.com/baobeisuper">baobeisuper</a>)
+
+![Front-end Detailed Design Diagram](http://qmplusimg.henrongyi.top/naotu.png)
+
+### 4.3 Project Layout
+
+```
+    ├─server  	     （backend）
+    │  ├─api            （API entrance）
+    │  ├─config         （config file）
+    │  ├─core  	        （core code）
+    │  ├─docs  	        （swagger APIs docs）
+    │  ├─global         （global objet）
+    │  ├─initialiaze    （initialiazation）
+    │  ├─middleware     （middle ware）
+    │  ├─model          （model and services）
+    │  ├─resource       （resources, such as static pages, templates）
+    │  ├─router         （routers）
+    │  ├─service         (services)
+    │  └─utils	        （common utilities）
+    └─web            （frontend）
+        ├─public        （deploy templates）
+        └─src           （source code）
+            ├─api       （frontend APIs）
+            ├─assets	（static files）
+            ├─components（components）
+            ├─router	（frontend routers）
+            ├─store     （vuex state management）
+            ├─style     （common styles）
+            ├─utils     （frontend common utilitie）
+            └─view      （pages）
+
+```
+
+## 5. Features
+
+- Authority management: Authority management based on `jwt` and `casbin`. 
+- File upload & download: File upload operation based on Qiniu Cloud (In order to make it easier for everyone to test, I have provided various important tokens of my Qiniu test number, and I urge you not to make things a mess).
+- Pagination Encapsulation：The frontend uses mixins to encapsulate paging, and the paging method can call mixins
+- User management: The system administrator assigns user roles and role permissions.
+- Role management: Create the main object of permission control, and then assign different API permissions and menu permissions to the role.
+- Menu management: User dynamic menu configuration implementation, assigning different menus to different roles.
+- API management: Different users can call different API permissions.
+- Configuration management: The configuration file can be modified in the web page (the test environment does not provide this function).
+- Rich text editor: Embed MarkDown editor function.
+- Conditional search: Add an example of conditional search.
+- Restful example: You can see sample APIs in user management module.
+
+```
+fontend code file: src\view\superAdmin\api\api.vue 
+backend code file: model\dnModel\api.go 
+```
+- Multi-login restriction: Change `userMultipoint` to true in `system` in `config.yaml` (You need to configure redis and redis parameters yourself. During the test period, please report in time if there is a bug).
+- Upload file by chunk：Provides examples of file upload and large file upload by chunk.
+- Form Builder：With the help of [@form-generator](https://github.com/JakHuang/form-generator).
+- Code generator: Providing backend with basic logic and simple curd code generator.
+
+## 6. To-do list
+
+- [ ] upload & export Excel
+- [ ] e-chart
+- [ ] workflow, task transfer function
+- [ ] frontend independent mode, mock
+
+## 7. Knowledge base
+
+### 7.1 Team blog
+
+> https://www.yuque.com/flipped-aurora
+>
+>There are video courses about frontend framework in our blo. If you think the project is helpful to you, you can add my personal WeChat:shouzi_1994，your comments is welcomed。
+
+### 7.2 Video courses
+
+(1) Development environment course
+> Bilibili：https://www.bilibili.com/video/BV1Fg4y187Bw/
+
+(2) Template course
+> Bilibili：https://www.bilibili.com/video/BV16K4y1r7BD/
+
+（3）2.0 version introduction and development experience
+> Bilibili：https://www.bilibili.com/video/BV1aV411d7Gm#reply2831798461
+
+(4) Golang basic course (coming soon)
+
+> https://space.bilibili.com/322210472/channel/detail?cid=108884
+
+## 8. Contacts
+### 8.1 Groups
+#### QQ group: 622360840
+
+| QQ group |d
+|  :---:  |
+| <img src="http://qmplusimg.henrongyi.top/qq.jpg" width="180"/> |
+
+
+#### Wechat group: comment "加入gin-vue-admin交流群"
+
+| Wechat |
+|  :---:  | 
+| <img width="150" src="http://qmplusimg.henrongyi.top/qrjjz.png"> 
+
+#### [About Us](https://www.gin-vue-admin.com/about/)
+
+## 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)
+
+## 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-zh_CN.md

-
-<div align=center>
-<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.12-blue"/>
-<img src="https://img.shields.io/badge/gin-1.4.0-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.9.12-red"/>
-</div>
-
-[English](./README.md) | 简体中文
-
-# 项目文档
-[在线文档](https://www.gin-vue-admin.com/) : https://www.gin-vue-admin.com/
-
-[开发教学](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>)
-- 前端UI框架：[element-ui](https://github.com/ElemeFE/element) 
-- 后台框架：[gin](https://github.com/gin-gonic/gin) 
-
-## 1. 基本介绍
-
-### 1.1 项目介绍
-
-[在线预览](http://demo.gin-vue-admin.com/)
-
-测试用户名：admin
-
-测试密码：123456
-
-> Gin-vue-admin是一个基于vue和gin开发的全栈前后端分离的后台管理系统，集成jwt鉴权，动态路由，动态菜单，casbin鉴权，表单生成器，代码生成器等功能，提供多种示例文件，让您把更多时间专注在业务开发上。
-
-### 1.2 贡献指南
-Hi! 首先感谢你使用 gin-vue-admin。
-
-Gin-vue-admin 是一套为后台管理平台准备的一整套前后端分离架构式的开源框架，旨在快速搭建后台管理系统。
-
-Gin-vue-admin 的成长离不开大家的支持，如果你愿意为 gin-vue-admin 贡献代码或提供建议，请阅读以下内容。
-
-#### 1.2.1 Issue 规范
-- issue 仅用于提交 Bug 或 Feature 以及设计相关的内容，其它内容可能会被直接关闭。如果你在使用时产生了疑问，请到 Slack 或 [Gitter](https://gitter.im/ElemeFE/element) 里咨询。
-
-- 在提交 issue 之前，请搜索相关内容是否已被提出。
-
-#### 1.2.2 Pull Request 规范
-- 请先 fork 一份到自己的项目下，不要直接在仓库下建分支。
-
-- 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.0_dev](https://github.com/flipped-aurora/gin-vue-admin/tree/gin-vue-admin_v2_dev) （v2.0 不再兼容 v1.0）
-
-- [gin-vue-admin_v1.0_stable](https://github.com/flipped-aurora/gin-vue-admin/tree/gin-vue-admin_v1_stable) （v1.0停止维护）
-
-- [gin-vue-admin_v1.0_dev](https://github.com/flipped-aurora/gin-vue-admin/tree/gin-vue-admin_v1_dev) （v1.0停止维护）
-
-
-## 2. 使用说明
-
-```
-- node版本 > v8.6.0
-- golang版本 >= v1.11
-- IDE推荐：Goland
-- 各位在clone项目以后，把db文件导入自己创建的库后，最好前往七牛云申请自己的空间地址。
-- gormv2版本初始化数据库可以利用批量创建功能，这里已经写好初始化代码，需要在main.go内打开 initialize.Data() 的注释即可
-- 替换掉项目中的七牛云公钥，私钥，仓名和默认url地址，以免发生测试文件数据错乱
-```
-
-> 使用docker-compose体验本项目
-- 安装 docker-compose [官方文档](https://docs.docker.com/compose/install/)
-    - ```shell script
-       # 在Linux安装
-       # 1.1 运行此命令以下载Docker Compose的当前稳定版本
-       sudo curl -L "https://github.com/docker/compose/releases/download/1.26.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
-       # 1.2 将可执行权限应用于二进制文件
-       sudo chmod +x /usr/local/bin/docker-compose 
-      ```
-    - ```shell script
-       # 使用Python的pip安装 
-       pip3 install docker-compose -i https://pypi.tuna.tsinghua.edu.cn/simple
-      ```
-    - 使用 Docker Desktop 
-        - Windows: https://hub.docker.com/editions/community/docker-ce-desktop-windows
-        - Mac: https://hub.docker.com/editions/community/docker-ce-desktop-mac/
-
-- 使用git克隆本项目
-    - ```git
-        git clone https://github.com/flipped-aurora/gin-vue-admin.git
-      ```
-- 使用docker-compose up一键启动启动项目
-    - ```shell script
-      # 使用docker-compose启动四个容器
-      docker-compose up
-      # 如果您修改了某些配置选项,可以使用此命令重新打包镜像
-      docker-compose up --build
-      # 使用docker-compose 后台启动
-      docker-compose up -d
-      ```
-
-    - web项目预览 [http://127.0.0.1:8888/admin](http://127.0.0.1:8888/admin)
-
-    - swagger文档 [http://127.0.0.1:8888/swagger/index.html](http://127.0.0.1:8888/swagger/index.html)
-
-
-
-### 2.1 web端
-
-```bash
-# clone the project
-git clone https://github.com/piexlmax/gin-vue-admin.git
-
-# enter the project directory
-cd web
-
-# install dependency
-npm install
-
-# develop
-npm run serve
-```
-
-### 2.2 server端
-
-```bash
-# 使用 go.mod
-
-# 安装go依赖包
-go list (go mod tidy)
-
-# 编译
-go build
-```
-
-### 2.3 swagger自动化API文档
-
-#### 2.3.1 安装 swagger
-
-##### （1）可以翻墙
-````
-go get -u github.com/swaggo/swag/cmd/swag
-````
-
-##### （2）无法翻墙
-
-由于国内没法安装 go.org/x 包下面的东西，推荐使用 [goproxy.io](https://goproxy.io/zh/)
-
-```bash
-如果您使用的 Go 版本是 1.13 及以上(推荐)
-# 启用 Go Modules 功能
-go env -w GO111MODULE=on 
-# 配置 GOPROXY 环境变量
-go env -w GOPROXY=https://goproxy.io,direct
-
-# 执行
-go get -g -v github.com/swaggo/swag/cmd/swag
-
-# 到GOPATH的/src/github.com/swaggo/swag/cmd/swag路径下执行
-go install
-```
-
-#### 2.3.2 生成API文档
-
-````
-cd server
-swag init
-````
-执行上面的命令后，server目录下会出现docs文件夹，登录http://localhost:8888/swagger/index.html，即可查看swagger文档
-
-
-## 3. 技术选型
-
-- 前端：用基于`vue`的`Element-UI`构建基础页面。
-- 后端：用`Gin`快速搭建基础restful风格API，`Gin`是一个go语言编写的Web框架。
-- 数据库：采用`MySql`(5.6.44)版本，使用`gorm`实现对数据库的基本操作,已添加对sqlite数据库的支持。
-- 缓存：使用`Redis`实现记录当前活跃用户的`jwt`令牌并实现多点登录限制。
-- API文档：使用`Swagger`构建自动化文档。
-- 配置文件：使用`fsnotify`和`viper`实现`yaml`格式的配置文件。
-- 日志：使用`go-logging`实现日志记录。
-
-
-## 4. 项目架构
-### 4.1 系统架构图
-
-![系统架构图](http://qmplusimg.henrongyi.top/gva/gin-vue-admin.png)
-
-### 4.2 前端详细设计图 （提供者:<a href="https://github.com/baobeisuper">baobeisuper</a>）
-
-![前端详细设计图](http://qmplusimg.henrongyi.top/naotu.png)
-
-### 4.3 目录结构
-
-```
-    ├─server  	     （后端文件夹）
-    │  ├─api            （API）
-    │  ├─config         （配置包）
-    │  ├─core  	        （內核）
-    │  ├─db             （数据库脚本）
-    │  ├─docs  	        （swagger文档目录）
-    │  ├─global         （全局对象）
-    │  ├─initialiaze    （初始化）
-    │  ├─middleware     （中间件）
-    │  ├─model          （结构体层）
-    │  ├─resource       （资源）
-    │  ├─router         （路由）
-    │  ├─service         (服务)
-    │  └─utils	        （公共功能）
-    └─web            （前端文件）
-        ├─public        （发布模板）
-        └─src           （源码包）
-            ├─api       （向后台发送ajax的封装层）
-            ├─assets	（静态文件）
-            ├─components（组件）
-            ├─router	（前端路由）
-            ├─store     （vuex 状态管理仓）
-            ├─style     （通用样式文件）
-            ├─utils     （前端工具库）
-            └─view      （前端页面）
-
-```
-
-## 5. 主要功能
-
-- 权限管理：基于`jwt`和`casbin`实现的权限管理 
-- 文件上传下载：实现基于七牛云的文件上传操作（为了方便大家测试，我公开了自己的七牛测试号的各种重要token，恳请大家不要乱传东西）
-- 分页封装：前端使用mixins封装分页，分页方法调用mixins即可 
-- 用户管理：系统管理员分配用户角色和角色权限。
-- 角色管理：创建权限控制的主要对象，可以给角色分配不同api权限和菜单权限。
-- 菜单管理：实现用户动态菜单配置，实现不同角色不同菜单。
-- api管理：不同用户可调用的api接口的权限不同。
-- 配置管理：配置文件可前台修改（测试环境不开放此功能）。
-- 富文本编辑器：MarkDown编辑器功能嵌入。
-- 条件搜索：增加条件搜索示例。
-- restful示例：可以参考用户管理模块中的示例API。 
-```
-前端文件参考: src\view\superAdmin\api\api.vue 
-后台文件参考: model\dnModel\api.go 
-```
-- 多点登录限制：需要在`config.yaml`中把`system`中的`useMultipoint`修改为true(需要自行配置Redis和Config中的Redis参数，测试阶段，有bug请及时反馈)。
-- 分片长传：提供文件分片上传和大文件分片上传功能示例。
-- 表单生成器：表单生成器借助 [@form-generator](https://github.com/JakHuang/form-generator)。
-- 代码生成器：后台基础逻辑以及简单curd的代码生成器。 
-
-## 6. 计划任务
-
-- [ ] 导入，导出Excel
-- [ ] Echart图表支持
-- [ ] 工作流，任务交接功能开发
-- [ ] 单独前端使用模式以及数据模拟
-
-## 7. 知识库 
-## 7.1 团队博客
-
-> https://www.yuque.com/flipped-aurora
->
->内有前端框架教学视频。如果觉得项目对您有所帮助可以添加我的个人微信:shouzi_1994，欢迎您提出宝贵的需求。
-
-## 7.2 教学视频
-
-（1）环境搭建
-> Bilibili：https://www.bilibili.com/video/BV1Fg4y187Bw/ (v1.0版本视频，v2.0操作相同目录不同)
-    
-（2）模板使用
-> Bilibili：https://www.bilibili.com/video/BV16K4y1r7BD/ (v1.0版本视频，v2.0操作相同目录不同)
-
-（3）2.0目录以及开发体验
-> Bilibili：https://www.bilibili.com/video/BV1aV411d7Gm#reply2831798461
-
-（4）golang基础教学视频录制中...
-> https://space.bilibili.com/322210472/channel/detail?cid=108884
-
-## 8. 联系方式
-
-### 8.1 技术群
-
-### QQ交流群：622360840
-| QQ 群(满) |
-|  :---:  |   
-| <img src="http://qmplusimg.henrongyi.top/qq.jpg" width="180"/> |
-
-### 微信交流群
-可以添加上面任意一位开发者，备注"加入gin-vue-admin交流群"
-
-### 8.2 项目组成员
-| 蒋 | 严 | 尹 | 杜 | 印 | 宋 |
-|  :---:  |  :---: | :---: | :---:  |  :---: | :---: |
-| <img width="150" src="http://qmplusimg.henrongyi.top/qrjjz.png"> | <img width="150" src="http://qmplusimg.henrongyi.top/qryr.png"> | <img width="150" src="http://qmplusimg.henrongyi.top/qryx.png"> | <img width="150" src="http://qmplusimg.henrongyi.top/qrdjl.png"> | <img width="150" src="http://qmplusimg.henrongyi.top/qrygl.png"> | <img width="150" src="http://qmplusimg.henrongyi.top/qrsong.png"> |
-
-|  昵称   | 项目职务  | 姓  |
-|  ----  | ----  | ----  |
-| [@piexlmax](https://github.com/piexlmax)  | 项目发起者 | 蒋 |
-| [@Ruio9244](https://github.com/Ruio9244)  | 架构师 | 严 |
-| [@granty1](https://github.com/granty1)  | 后台开发 | 印 |
-| [@1319612909](https://github.com/1319612909)  | 前端UI开发 |  杜 |
-| [@krank666](https://github.com/krank666)  | 前端开发 | 尹 |
-| [@chen-chen-up](https://github.com/chen-chen-up)  | 新手开发 | 宋 |
-| [@SliverHorn](https://github.com/SliverHorn)  | 社区管理员 | 赖 |
-
-## 9. 捐赠
-
-如果你觉得这个项目对你有帮助，你可以请作者喝饮料 :tropical_drink: [点我](https://www.gin-vue-admin.com/docs/coffee)
-
-## 10. 商用注意事项
-
-如果您将此项目用于商业用途，请遵守Apache2.0协议并保留作者技术支持声明。

docker-compose.yaml

 version: "3.8"
 
+networks:
+  network:
+    ipam:
+      driver: default
+      config:
+        - subnet: '177.7.0.0/16'
+
 services:
+  web:
+    build:
+      context: ./
+      dockerfile: ./dockerfile_web
+    container_name: gva-web
+    restart: always
+    ports:
+      - '8000:8000'
+    depends_on:
+      - server
+    command: [ 'nginx-debug', '-g', 'daemon off;' ]
+    networks:
+      network:
+        ipv4_address: 177.7.0.11
+
   server:
     build:
       context: ./
       dockerfile: ./dockerfile_server
-    container_name: gva-server # 容器名
+    container_name: gva-server
     restart: always
     ports:
       - '8888:8888'
     depends_on:
       - mysql
       - redis
+    networks:
+      network:
+        ipv4_address: 177.7.0.12
 
   mysql:
     image: mysql:8.0.21
@@ -19,16 +44,22 @@ services:
     command: mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci #设置utf8字符集
     restart: always
     ports:
-      - "13306:3306"  # host物理直接映射端口为6606
+      - "13306:3306"  # host物理直接映射端口为13306
     environment:
       MYSQL_DATABASE: 'qmPlus' # 初始化启动时要创建的数据库的名称
       MYSQL_ROOT_PASSWORD: 'Aa@6447985' # root管理员用户密码
     volumes:
-    - '.docker-compose/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d'
+      - '.docker-compose/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d'
+    networks:
+      network:
+        ipv4_address: 177.7.0.13
 
   redis:
     image: redis:6.0.6
     container_name: gva-redis # 容器名
     restart: always
     ports:
-      - '6379:6379'
\ No newline at end of file
+      - '6379:6379'
+    networks:
+      network:
+        ipv4_address: 177.7.0.14
\ No newline at end of file

dockerfile_server

-FROM node:12.16.1 as gva-web
-
-WORKDIR /gva_web/
-COPY web/ .
-
-RUN cat .env.production
-COPY .docker-compose/shell/web-handle.sh .
-RUN ls -al
-RUN sh ./web-handle.sh
-RUN cat .env.production
-RUN rm -f web-handle.sh
-
-RUN npm install -g cnpm --registry=https://registry.npm.taobao.org
-RUN cnpm install || npm install
-RUN npm run build
-
-FROM golang:alpine as gva-server
+FROM golang:alpine
 
 ENV GO111MODULE=on
 ENV GOPROXY=https://goproxy.io,direct
 WORKDIR /go/src/gin-vue-admin
 COPY server/ ./
 
-RUN cat ./core/server.go
 RUN cat ./config.yaml
 COPY .docker-compose/shell/server-handle.sh .
 RUN ls -al
 RUN sh ./server-handle.sh
 RUN rm -f server-handle.sh
-RUN cat ./core/server.go
 RUN cat ./config.yaml
 
-RUN go env && go list && go build -o gva-server .
-
+RUN go env && go build -o server .
 
-FROM nginx:alpine
-LABEL MAINTAINER="SliverHorn"
 
-WORKDIR gva/
-
-# copy web
-COPY --from=gva-web /gva_web/dist ./resource/dist
-# copy server
-COPY --from=gva-server /go/src/gin-vue-admin/gva-server ./
-COPY --from=gva-server /go/src/gin-vue-admin/config.yaml ./
-COPY --from=gva-server /go/src/gin-vue-admin/resource ./resource
+FROM alpine:latest
+LABEL MAINTAINER="SliverHorn@sliver_horn@qq.com"
 
+WORKDIR /go/src/gin-vue-admin
 
-EXPOSE 8888
+COPY --from=0 /go/src/gin-vue-admin/server ./
+COPY --from=0 /go/src/gin-vue-admin/config.yaml ./
+COPY --from=0 /go/src/gin-vue-admin/resource ./resource
 
-ENTRYPOINT ./gva-server
+ENTRYPOINT ./server
 
 # 根据Dockerfile生成Docker镜像
 

dockerfile_web

+FROM node:12.16.1
+
+WORKDIR /gva_web/
+COPY web/ .
+
+RUN npm install -g cnpm --registry=https://registry.npm.taobao.org
+RUN cnpm install || npm install
+RUN npm run build
+
+FROM nginx:alpine
+LABEL MAINTAINER="SliverHorn@sliver_horn@qq.com"
+
+COPY .docker-compose/nginx/conf.d/my.conf /etc/nginx/conf.d/my.conf
+COPY --from=0 /gva_web/dist /usr/share/nginx/html
+RUN cat /etc/nginx/nginx.conf
+RUN cat /etc/nginx/conf.d/my.conf
+RUN ls -al /usr/share/nginx/html
+CMD ls -al /usr/share/nginx/html

server/api/v1/sys_email.go

+package v1
+
+import (
+	"fmt"
+	"gin-vue-admin/global/response"
+	"gin-vue-admin/service"
+	"github.com/gin-gonic/gin"
+)
+
+// @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) {
+	err := service.EmailTest()
+	if err != nil {
+		response.FailWithMessage(fmt.Sprintf("发送失败，%v", err), c)
+	} else {
+		response.OkWithData("发送成功", c)
+	}
+}

server/config.yaml

@@ -19,18 +19,42 @@ mysql:
   max-open-conns: 10
   log-mode: false
 
-#sqlite 配置
+# Postgresql connect configuration
+postgresql:
+  username: 'gorm'
+  password: 'gorm'
+  db-name: 'gorm'
+  port: '9920'
+  config: 'sslmode=disable TimeZone=Asia/Shanghai'
+  max-idle-conns: 10
+  max-open-conns: 10
+  logger: false
+  prefer-simple-protocol: true
+
+# sqlite connect configuration
+# sqlite需要gcc支持 windows用户需要自行安装gcc
 sqlite:
-  path: db.db
-  log-mode: true
-  config: 'loc=Asia/Shanghai'
+  # path: 'file::memory:?cache=shared' # 内存模式
+  path: 'db.db'
+  max-idle-conns: 10
+  max-open-conns: 10
+  logger: true
+
+# Sqlserver connect configuration
+sqlserver:
+  username: 'gorm'
+  password: 'LoremIpsum86'
+  db-name: 'gorm'
+  path: 'localhost:9930'
+  max-idle-conns: 10
+  max-open-conns: 10
+  logger: true
 
 # oss configuration
 
 # 切换本地与七牛云上传，分配头像和文件路径
 localupload:
   local: false
-  avatar-path: uploads/avatar
   file-path: uploads/file
 
 # 请自行七牛申请对应的 公钥 私钥 bucket 和 域名地址
@@ -51,7 +75,8 @@ system:
   use-multipoint: false
   env: 'public'  # Change to "develop" to skip authentication for development mode
   addr: 8888
-  db-type: "mysql"  # support mysql/sqlite
+  db-type: "mysql"  # support mysql/postgresql/sqlite/sqlserver
+  need-init-data: false
 
 # captcha configuration
 captcha:
@@ -59,24 +84,26 @@ captcha:
   img-width: 240
   img-height: 80
 
-# logger configuration
-log:
-  prefix: '[GIN-VUE-ADMIN]'
-  log-file: true
-  stdout: 'DEBUG'
-  file: 'DEBUG'
-
 # zap logger configuration
 zap:
   # 可使用 "debug", "info", "warn", "error", "dpanic", "panic", "fatal",
-  level: 'debug'
+  level: 'info'
   # console: 控制台, json: json格式输出
   format: 'console'
   prefix: '[GIN-VUE-ADMIN]'
   director: 'log'
-  link_name: 'latest_log'
-  show_line: true
+  link-name: 'latest_log'
+  show-line: true
   # LowercaseLevelEncoder:小写, LowercaseColorLevelEncoder:小写带颜色,CapitalLevelEncoder: 大写, CapitalColorLevelEncoder: 大写带颜色,
-  encode_level: 'LowercaseColorLevelEncoder'
-  stacktrace_key: 'stacktrace'
-  log_in_console: true
\ No newline at end of file
+  encode-level: 'LowercaseColorLevelEncoder'
+  stacktrace-key: 'stacktrace'
+  log-in-console: true
+
+email:
+  email-from: 'xxx@163.com'
+  email-nickname: 'test'
+  email-secret: 'xxx'
+  email-to: 'xxx@qq.com'
+  email-host: 'smtp.163.com'
+  email-port: 465
+  email-isSSL: true
\ No newline at end of file

server/config/config.go

@@ -2,7 +2,9 @@ package config
 
 type Server struct {
 	Mysql       Mysql       `mapstructure:"mysql" json:"mysql" yaml:"mysql"`
+	Postgresql  Postgresql  `mapstructure:"postgresql" json:"postgresql" yaml:"postgresql"`
 	Sqlite      Sqlite      `mapstructure:"sqlite" json:"sqlite" yaml:"sqlite"`
+	Sqlserver   Sqlserver   `mapstructure:"sqlserver" json:"sqlserver" yaml:"sqlserver"`
 	Qiniu       Qiniu       `mapstructure:"qiniu" json:"qiniu" yaml:"qiniu"`
 	Casbin      Casbin      `mapstructure:"casbin" json:"casbin" yaml:"casbin"`
 	Redis       Redis       `mapstructure:"redis" json:"redis" yaml:"redis"`
@@ -11,6 +13,7 @@ type Server struct {
 	Captcha     Captcha     `mapstructure:"captcha" json:"captcha" yaml:"captcha"`
 	Zap         Zap         `mapstructure:"zap" json:"zap" yaml:"zap"`
 	LocalUpload LocalUpload `mapstructure:"localUpload" json:"localUpload" yaml:"localUpload"`
+	Email       Email       `mapstructure:"email" json:"email" yaml:"email"`
 }
 
 type System struct {
@@ -18,6 +21,7 @@ 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"`
+	NeedInitData  bool   `mapstructure:"need-init-data" json:"needInitData" yaml:"need-init-data"`
 }
 
 type JWT struct {
@@ -39,6 +43,35 @@ type Mysql struct {
 	LogMode      bool   `mapstructure:"log-mode" json:"logMode" yaml:"log-mode"`
 }
 
+type Postgresql struct {
+	Username             string `mapstructure:"username" json:"username" yaml:"username"`
+	Password             string `mapstructure:"password" json:"password" yaml:"password"`
+	Dbname               string `mapstructure:"db-name" json:"dbname" yaml:"db-name"`
+	Port                 string `mapstructure:"port" json:"port" yaml:"port"`
+	Config               string `mapstructure:"config" json:"config" yaml:"config"`
+	MaxIdleConns         int    `mapstructure:"max-idle-conns" json:"maxIdleConns" yaml:"max-idle-conns"`
+	MaxOpenConns         int    `mapstructure:"max-open-conns" json:"maxOpenConns" yaml:"max-open-conns"`
+	Logger               bool   `mapstructure:"logger" json:"logger" yaml:"logger"`
+	PreferSimpleProtocol bool   `mapstructure:"prefer-simple-protocol" json:"preferSimpleProtocol" yaml:"prefer-simple-protocol"`
+}
+
+type Sqlite struct {
+	Path         string `mapstructure:"path" json:"path" yaml:"path"`
+	MaxIdleConns int    `mapstructure:"max-idle-conns" json:"maxIdleConns" yaml:"max-idle-conns"`
+	MaxOpenConns int    `mapstructure:"max-open-conns" json:"maxOpenConns" yaml:"max-open-conns"`
+	Logger       bool   `mapstructure:"logger" json:"logger" yaml:"logger"`
+}
+
+type Sqlserver struct {
+	Username     string `mapstructure:"username" json:"username" yaml:"username"`
+	Password     string `mapstructure:"password" json:"password" yaml:"password"`
+	Path         string `mapstructure:"path" json:"path" yaml:"path"`
+	Dbname       string `mapstructure:"db-name" json:"dbname" yaml:"db-name"`
+	MaxIdleConns int    `mapstructure:"max-idle-conns" json:"maxIdleConns" yaml:"max-idle-conns"`
+	MaxOpenConns int    `mapstructure:"max-open-conns" json:"maxOpenConns" yaml:"max-open-conns"`
+	Logger       bool   `mapstructure:"logger" json:"logger" yaml:"logger"`
+}
+
 type Redis struct {
 	Addr     string `mapstructure:"addr" json:"addr" yaml:"addr"`
 	Password string `mapstructure:"password" json:"password" yaml:"password"`
@@ -46,9 +79,8 @@ type Redis struct {
 }
 
 type LocalUpload struct {
-	Local      bool   `mapstructure:"local" json:"local" yaml:"local"`
-	AvatarPath string `mapstructure:"avatar-path" json:"avatarPath" yaml:"avatar-path"`
-	FilePath   string `mapstructure:"file-path" json:"filePath" yaml:"file-path"`
+	Local    bool   `mapstructure:"local" json:"local" yaml:"local"`
+	FilePath string `mapstructure:"file-path" json:"filePath" yaml:"file-path"`
 }
 
 type Qiniu struct {
@@ -64,22 +96,24 @@ type Captcha struct {
 	ImgHeight int `mapstructure:"img-height" json:"imgHeight" yaml:"img-height"`
 }
 
-type Sqlite struct {
-	Username string `mapstructure:"username" json:"username" yaml:"username"`
-	Password string `mapstructure:"password" json:"password" yaml:"password"`
-	Path     string `mapstructure:"path" json:"path" yaml:"path"`
-	Config   string `mapstructure:"config" json:"config" yaml:"config"`
-	LogMode  bool   `mapstructure:"log-mode" json:"logMode" yaml:"log-mode"`
-}
-
 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"`
+	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"`
+}
+
+type Email struct {
+	EmailFrom     string `mapstructure:"email-from" json:"emailFrom" yaml:"email-from"`
+	EmailNickname string `mapstructure:"email-nickname" json:"emailNickname" yaml:"email-nickname"`
+	EmailSecret   string `mapstructure:"email-secret" json:"emailSecret" yaml:"email-secret"`
+	EmailTo       string `mapstructure:"email-to" json:"emailTo" yaml:"email-to"`
+	EmailHost     string `mapstructure:"email-host" json:"emailHost" yaml:"email-host"`
+	EmailPort     int    `mapstructure:"email-port" json:"emailPort" yaml:"email-port"`
+	EmailIsSSL    bool   `mapstructure:"email-is-ssl" json:"emailIsSSL" yaml:"email-is-ssl"`
 }

server/core/config.go

@@ -6,13 +6,27 @@ import (
 	_ "gin-vue-admin/packfile"
 	"github.com/fsnotify/fsnotify"
 	"github.com/spf13/viper"
+	"github.com/spf13/pflag"
 )
 
 const defaultConfigFile = "config.yaml"
 
 func init() {
+	pflag.StringP("configFile","c", "", "choose config file.")
+	pflag.Parse()
+
+	// 优先级: 命令行 > 环境变量 > 默认值
 	v := viper.New()
-	v.SetConfigFile(defaultConfigFile)
+	v.BindPFlags(pflag.CommandLine)
+	v.SetEnvPrefix("gva")
+	v.BindEnv("configFile") // GVA_CONFIGFILE
+
+	configFile := v.GetString("configFile")
+	if configFile == ""{
+		configFile = defaultConfigFile
+	}
+
+	v.SetConfigFile(configFile)
 	err := v.ReadInConfig()
 	if err != nil {
 		panic(fmt.Errorf("Fatal error config file: %s \n", err))

server/core/server.go

@@ -25,11 +25,11 @@ func RunWindowsServer() {
 	// 保证文本顺序输出
 	// In order to ensure that the text order output can be deleted
 	time.Sleep(10 * time.Microsecond)
-	global.GVA_LOG.Debug("server run success on ", zap.String("address", address))
+	global.GVA_LOG.Info("server run success on ", zap.String("address", address))
 
 	fmt.Printf(`欢迎使用 Gin-Vue-Admin
 	默认自动化文档地址:http://127.0.0.1%s/swagger/index.html
-	默认前端文件运行地址:http://127.0.0.1:8080
+	默认前端文件运行地址:http://127.0.0.1:8000
 `, address)
 	global.GVA_LOG.Error(s.ListenAndServe().Error())
 }

server/core/zap.go

@@ -82,30 +82,20 @@ func getEncoderConfig() (config zapcore.EncoderConfig) {
 		CallerKey:      "caller",
 		StacktraceKey:  global.GVA_CONFIG.Zap.StacktraceKey,
 		LineEnding:     zapcore.DefaultLineEnding,
-		EncodeLevel:    zapcore.CapitalLevelEncoder,
+		EncodeLevel:    zapcore.LowercaseLevelEncoder,
 		EncodeTime:     CustomTimeEncoder,
 		EncodeDuration: zapcore.SecondsDurationEncoder,
 		EncodeCaller:   zapcore.FullCallerEncoder,
 	}
 	switch  {
-	case global.GVA_CONFIG.Zap.EncodeLevel == "LowercaseLevelEncoder" && global.GVA_CONFIG.Zap.Format == "console" : // console小写编码器
+	case global.GVA_CONFIG.Zap.EncodeLevel == "LowercaseLevelEncoder": // 小写编码器(默认)
 		config.EncodeLevel = zapcore.LowercaseLevelEncoder
-	case global.GVA_CONFIG.Zap.EncodeLevel == "LowercaseLevelEncoder" && global.GVA_CONFIG.Zap.Format == "json" : // json小写编码器
-		config.EncodeLevel = zapcore.LowercaseLevelEncoder
-	case global.GVA_CONFIG.Zap.EncodeLevel == "LowercaseColorLevelEncoder" && global.GVA_CONFIG.Zap.Format == "console": // console小写编码器带颜色
-		config.EncodeLevel = zapcore.LowercaseColorLevelEncoder
-	case global.GVA_CONFIG.Zap.EncodeLevel == "LowercaseColorLevelEncoder" && global.GVA_CONFIG.Zap.Format == "json": // json小写编码器带颜色
+	case global.GVA_CONFIG.Zap.EncodeLevel == "LowercaseColorLevelEncoder": // 小写编码器带颜色
 		config.EncodeLevel = zapcore.LowercaseColorLevelEncoder
-	case global.GVA_CONFIG.Zap.EncodeLevel == "CapitalLevelEncoder" && global.GVA_CONFIG.Zap.Format == "console": // console大写编码器
-		config.EncodeLevel = zapcore.CapitalLevelEncoder
-	case global.GVA_CONFIG.Zap.EncodeLevel == "CapitalLevelEncoder" && global.GVA_CONFIG.Zap.Format == "json": // json大写编码器
+	case global.GVA_CONFIG.Zap.EncodeLevel == "CapitalLevelEncoder": // 大写编码器
 		config.EncodeLevel = zapcore.CapitalLevelEncoder
-	case global.GVA_CONFIG.Zap.EncodeLevel == "CapitalColorLevelEncoder" && global.GVA_CONFIG.Zap.Format == "console": // console 大写编码器带颜色
+	case global.GVA_CONFIG.Zap.EncodeLevel == "CapitalColorLevelEncoder": // 大写编码器带颜色
 		config.EncodeLevel = zapcore.CapitalColorLevelEncoder
-	case global.GVA_CONFIG.Zap.EncodeLevel == "CapitalColorLevelEncoder" && global.GVA_CONFIG.Zap.Format == "json": // json 大写编码器带颜色
-		config.EncodeLevel = zapcore.CapitalColorLevelEncoder
-	default:
-		config.EncodeLevel = zapcore.LowercaseLevelEncoder
 	}
 	return config
 }

server/go.mod

@@ -19,11 +19,10 @@ require (
 	github.com/go-sql-driver/mysql v1.5.0
 	github.com/golang/protobuf v1.4.2 // indirect
 	github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 // indirect
+	github.com/jordan-wright/email v0.0.0-20200824153738-3f5bafa1cd84
 	github.com/json-iterator/go v1.1.10 // indirect
 	github.com/lestrrat-go/file-rotatelogs v2.3.0+incompatible
 	github.com/lestrrat-go/strftime v1.0.3 // indirect
-	github.com/lestrrat/go-envload v0.0.0-20180220120943-6ed08b54a570 // indirect
-	github.com/lestrrat/go-strftime v0.0.0-20180220042222-ba3bf9c1d042 // indirect
 	github.com/mailru/easyjson v0.7.1 // indirect
 	github.com/mitchellh/mapstructure v1.2.2 // indirect
 	github.com/mojocn/base64Captcha v1.3.1
@@ -36,20 +35,21 @@ require (
 	github.com/spf13/afero v1.2.2 // indirect
 	github.com/spf13/cast v1.3.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.6.2
 	github.com/swaggo/gin-swagger v1.2.0
 	github.com/swaggo/swag v1.6.7
 	github.com/tebeka/strftime v0.1.3 // indirect
 	github.com/unrolled/secure v1.0.7
-	github.com/urfave/cli v1.22.2 // indirect
 	go.uber.org/zap v1.10.0
-	golang.org/x/net v0.0.0-20200320220750-118fecf932d8 // indirect
+	golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e // indirect
 	golang.org/x/sys v0.0.0-20200610111108-226ff32320da // indirect
 	golang.org/x/tools v0.0.0-20200324003944-a576cf524670 // indirect
 	google.golang.org/protobuf v1.24.0 // indirect
 	gopkg.in/ini.v1 v1.55.0 // indirect
 	gopkg.in/yaml.v2 v2.3.0 // indirect
-	gorm.io/driver/mysql v0.3.1
-	gorm.io/gorm v0.2.35
+	gorm.io/driver/mysql v0.3.0
+	gorm.io/driver/postgres v0.2.6
+	gorm.io/driver/sqlserver v0.2.4
+	gorm.io/gorm v1.20.1
 )

server/initialize/data.go

-package initialize
-
-import (
-	"gin-vue-admin/global"
-	"gin-vue-admin/service"
-	"go.uber.org/zap"
-)
-
-func Data() {
-	var err error
-	err = service.InitSysApi()
-	err = service.InitSysUser()
-	err = service.InitExaCustomer()
-	err = service.InitCasbinModel()
-	err = service.InitSysAuthority()
-	err = service.InitSysBaseMenus()
-	err = service.InitAuthorityMenu()
-	err = service.InitSysDictionary()
-	err = service.InitSysAuthorityMenus()
-	err = service.InitSysDataAuthorityId()
-	err = service.InitSysDictionaryDetail()
-	err = service.InitExaFileUploadAndDownload()
-	if err != nil {
-		global.GVA_LOG.Error("initialize data failed", zap.Any("err", err))
-	}
-	global.GVA_LOG.Debug("initialize data success")
-}

server/initialize/db_table.go

-package initialize
-
-import (
-	"gin-vue-admin/global"
-	"gin-vue-admin/model"
-	"go.uber.org/zap"
-	"os"
-)
-
-// 注册数据库表专用
-func DBTables() {
-	db := global.GVA_DB
-	err := db.AutoMigrate(
-		model.SysUser{},
-		model.SysAuthority{},
-		model.SysApi{},
-		model.SysBaseMenu{},
-		model.SysBaseMenuParameter{},
-		model.JwtBlacklist{},
-		model.SysWorkflow{},
-		model.SysWorkflowStepInfo{},
-		model.SysDictionary{},
-		model.SysDictionaryDetail{},
-		model.ExaFileUploadAndDownload{},
-		model.ExaFile{},
-		model.ExaFileChunk{},
-		model.ExaSimpleUploader{},
-		model.ExaCustomer{},
-		model.SysOperationRecord{},
-	)
-	if err != nil {
-		global.GVA_LOG.Error("register table failed", zap.Any("err", err))
-		os.Exit(0)
-	}
-	global.GVA_LOG.Debug("register table success")
-}

server/initialize/gorm.go

+package initialize
+
+import (
+	"gin-vue-admin/global"
+	"gin-vue-admin/model"
+	"go.uber.org/zap"
+	"gorm.io/driver/mysql"
+	"gorm.io/driver/postgres"
+	"gorm.io/driver/sqlserver"
+	"gorm.io/gorm"
+	"gorm.io/gorm/logger"
+	"os"
+)
+
+var err error
+
+// Gorm 初始化数据库并产生数据库全局变量
+func Gorm() {
+	switch global.GVA_CONFIG.System.DbType {
+	case "mysql":
+		GormMysql()
+	case "postgresql":
+		GormPostgreSql()
+	//case "sqlite": // sqlite需要gcc支持 windows用户需要自行安装gcc 如需使用打开注释即可
+	//	GormSqlite()
+	case "sqlserver":
+		GormSqlServer()
+	}
+}
+
+// GormDBTables 注册数据库表专用
+func GormDBTables(db *gorm.DB) {
+	err := db.AutoMigrate(
+		model.SysUser{},
+		model.SysAuthority{},
+		model.SysApi{},
+		model.SysBaseMenu{},
+		model.SysBaseMenuParameter{},
+		model.JwtBlacklist{},
+		model.SysWorkflow{},
+		model.SysWorkflowStepInfo{},
+		model.SysDictionary{},
+		model.SysDictionaryDetail{},
+		model.ExaFileUploadAndDownload{},
+		model.ExaFile{},
+		model.ExaFileChunk{},
+		model.ExaSimpleUploader{},
+		model.ExaCustomer{},
+		model.SysOperationRecord{},
+	)
+	if err != nil {
+		global.GVA_LOG.Error("register table failed", zap.Any("err", err))
+		os.Exit(0)
+	}
+	global.GVA_LOG.Info("register table success")
+}
+
+// GormMysql 初始化Mysql数据库
+func GormMysql() {
+	m := global.GVA_CONFIG.Mysql
+	dsn := m.Username + ":" + m.Password + "@tcp(" + m.Path + ")/" + m.Dbname + "?" + m.Config
+	mysqlConfig := mysql.Config{
+		DSN:                       dsn,   // DSN data source name
+		DefaultStringSize:         191,   // string 类型字段的默认长度
+		DisableDatetimePrecision:  true,  // 禁用 datetime 精度，MySQL 5.6 之前的数据库不支持
+		DontSupportRenameIndex:    true,  // 重命名索引时采用删除并新建的方式，MySQL 5.7 之前的数据库和 MariaDB 不支持重命名索引
+		DontSupportRenameColumn:   true,  // 用 `change` 重命名列，MySQL 8 之前的数据库和 MariaDB 不支持重命名列
+		SkipInitializeWithVersion: false, // 根据版本自动配置
+	}
+	gormConfig := config(m.LogMode)
+	if global.GVA_DB, err = gorm.Open(mysql.New(mysqlConfig), gormConfig); err != nil {
+		global.GVA_LOG.Error("MySQL启动异常", zap.Any("err", err))
+		os.Exit(0)
+	} else {
+		GormDBTables(global.GVA_DB)
+		sqlDB, _ := global.GVA_DB.DB()
+		sqlDB.SetMaxIdleConns(m.MaxIdleConns)
+		sqlDB.SetMaxOpenConns(m.MaxOpenConns)
+	}
+}
+
+// GormPostgreSql 初始化PostgreSql数据库
+func GormPostgreSql() {
+	p := global.GVA_CONFIG.Postgresql
+	dsn := "user=" + p.Username + " password=" + p.Password + " dbname=" + p.Dbname + " port=" + p.Port + " " + p.Config
+	postgresConfig := postgres.Config{
+		DSN:                  dsn,                    // DSN data source name
+		PreferSimpleProtocol: p.PreferSimpleProtocol, // 禁用隐式 prepared statement
+	}
+	gormConfig := config(p.Logger)
+	if global.GVA_DB, err = gorm.Open(postgres.New(postgresConfig), gormConfig); err != nil {
+		global.GVA_LOG.Error("PostgreSql启动异常", zap.Any("err", err))
+		os.Exit(0)
+	} else {
+		GormDBTables(global.GVA_DB)
+		sqlDB, _ := global.GVA_DB.DB()
+		sqlDB.SetMaxIdleConns(p.MaxIdleConns)
+		sqlDB.SetMaxOpenConns(p.MaxOpenConns)
+	}
+}
+
+// GormSqlite 初始化Sqlite数据库 sqlite需要gcc支持 windows用户需要自行安装gcc 如需使用打开注释即可
+//func GormSqlite() {
+//	s := global.GVA_CONFIG.Sqlite
+//	gormConfig := config(s.Logger)
+//	if global.GVA_DB, err = gorm.Open(sqlite.Open(s.Path), gormConfig); err != nil {
+//		global.GVA_LOG.Error("Sqlite启动异常", zap.Any("err", err))
+//		os.Exit(0)
+//	} else {
+//      GormDBTables(global.GVA_DB)
+//		sqlDB, _ := global.GVA_DB.DB()
+//		sqlDB.SetMaxIdleConns(s.MaxIdleConns)
+//		sqlDB.SetMaxOpenConns(s.MaxOpenConns)
+//	}
+//}
+
+// GormSqlServer 初始化SqlServer数据库
+func GormSqlServer() {
+	ss := global.GVA_CONFIG.Sqlserver
+	dsn := "sqlserver://" + ss.Username + ":" + ss.Password + "@" + ss.Path + "?database=gorm"
+	if global.GVA_DB, err = gorm.Open(sqlserver.Open(dsn), &gorm.Config{}); err != nil {
+		global.GVA_LOG.Error("SqlServer启动异常", zap.Any("err", err))
+		os.Exit(0)
+	} else {
+		GormDBTables(global.GVA_DB)
+		sqlDB, _ := global.GVA_DB.DB()
+		sqlDB.SetMaxIdleConns(ss.MaxIdleConns)
+		sqlDB.SetMaxOpenConns(ss.MaxOpenConns)
+	}
+}
+
+// config 根据配置决定是否开启日志
+func config(mod bool) (c *gorm.Config) {
+	if mod {
+		c = &gorm.Config{
+			Logger:                                   logger.Default.LogMode(logger.Info),
+			DisableForeignKeyConstraintWhenMigrating: true,
+		}
+	} else {
+		c = &gorm.Config{
+			Logger:                                   logger.Default.LogMode(logger.Silent),
+			DisableForeignKeyConstraintWhenMigrating: true,
+		}
+	}
+	return
+}

server/initialize/mysql.go

-package initialize
-
-import (
-	"gin-vue-admin/global"
-	"go.uber.org/zap"
-	"gorm.io/driver/mysql"
-	"gorm.io/gorm"
-	"gorm.io/gorm/logger"
-	"os"
-)
-
-// 初始化数据库并产生数据库全局变量
-func Mysql() {
-	admin := global.GVA_CONFIG.Mysql
-	mysqlConfig := mysql.Config{
-		DSN:                       admin.Username + ":" + admin.Password + "@(" + admin.Path + ")/" + admin.Dbname + "?" + admin.Config, // DSN data source name
-		DefaultStringSize:         191,                                                                                                  // string 类型字段的默认长度
-		DisableDatetimePrecision:  true,                                                                                                 // 禁用 datetime 精度，MySQL 5.6 之前的数据库不支持
-		DontSupportRenameIndex:    true,                                                                                                 // 重命名索引时采用删除并新建的方式，MySQL 5.7 之前的数据库和 MariaDB 不支持重命名索引
-		DontSupportRenameColumn:   true,                                                                                                 // 用 `change` 重命名列，MySQL 8 之前的数据库和 MariaDB 不支持重命名列
-		SkipInitializeWithVersion: false,                                                                                                // 根据版本自动配置
-	}
-	var gormConfig *gorm.Config
-	if admin.LogMode { //根据配置决定是否开启日志
-		gormConfig = &gorm.Config{
-			Logger:                                   logger.Default.LogMode(logger.Info),
-			DisableForeignKeyConstraintWhenMigrating: true,
-		}
-	} else {
-		gormConfig = &gorm.Config{
-			Logger:                                   logger.Default.LogMode(logger.Silent),
-			DisableForeignKeyConstraintWhenMigrating: true,
-		}
-	}
-
-	if db, err := gorm.Open(mysql.New(mysqlConfig), gormConfig); err != nil {
-		global.GVA_LOG.Error("MySQL启动异常", zap.Any("err", err))
-		os.Exit(0)
-	} else {
-		global.GVA_DB = db
-		sqlDB, _ := db.DB()
-		sqlDB.SetMaxIdleConns(admin.MaxIdleConns)
-		sqlDB.SetMaxOpenConns(admin.MaxOpenConns)
-	}
-}

server/initialize/router.go

@@ -16,15 +16,14 @@ import (
 func Routers() *gin.Engine {
 	var Router = gin.Default()
 	// 为用户头像和文件提供静态地址
-	Router.StaticFS(global.GVA_CONFIG.LocalUpload.AvatarPath, http.Dir(global.GVA_CONFIG.LocalUpload.AvatarPath))
 	Router.StaticFS(global.GVA_CONFIG.LocalUpload.FilePath, http.Dir(global.GVA_CONFIG.LocalUpload.FilePath))
 	// Router.Use(middleware.LoadTls())  // 打开就能玩https了
-	global.GVA_LOG.Debug("use middleware logger")
+	global.GVA_LOG.Info("use middleware logger")
 	// 跨域
 	Router.Use(middleware.Cors())
-	global.GVA_LOG.Debug("use middleware cors")
+	global.GVA_LOG.Info("use middleware cors")
 	Router.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
-	global.GVA_LOG.Debug("register swagger handler")
+	global.GVA_LOG.Info("register swagger handler")
 	// 方便统一添加路由组前缀 多服务器上线使用
 	ApiGroup := Router.Group("")
 	router.InitUserRouter(ApiGroup)                  // 注册用户路由
@@ -43,6 +42,7 @@ func Routers() *gin.Engine {
 	router.InitSysDictionaryDetailRouter(ApiGroup)   // 字典详情管理
 	router.InitSysDictionaryRouter(ApiGroup)         // 字典管理
 	router.InitSysOperationRecordRouter(ApiGroup)    // 操作记录
+	router.InitEmailRouter(ApiGroup)                 // 邮件相关路由
 
 	global.GVA_LOG.Info("router register success")
 	return Router

server/initialize/sqlite.go

-package initialize
-
-// sqlite需要gcc支持 windows用户需要自行安装gcc 如需使用打开注释即可
-
-// 感谢 sqlitet提供者 [rikugun] 作者github： https://github.com/rikugun
-
-// import (
-// 	"fmt"
-// 	"gin-vue-admin/global"
-// 	"gorm.io/gorm"
-// 	_ "github.com/jinzhu/gorm/dialects/sqlite"
-// )
-//
-// // 初始化数据库并产生数据库全局变量
-// func Sqlite() {
-// 	admin := global.GVA_CONFIG.Sqlite
-// 	if db, err := gorm.Open("sqlite3", fmt.Sprintf("%s?%s", admin.Path,admin.Config)); err != nil {
-// 		global.GVA_LOG.Error("DEFAULTDB数据库启动异常", err)
-// 	} else {
-// 		global.GVA_DB = db
-// 		global.GVA_DB.LogMode(admin.LogMode)
-// 	}
-// }

server/main.go

@@ -3,8 +3,8 @@ package main
 import (
 	"gin-vue-admin/core"
 	"gin-vue-admin/global"
+	"gin-vue-admin/gva/init_data"
 	"gin-vue-admin/initialize"
-	//"runtime"
 )
 
 // @title Swagger Example API
@@ -15,16 +15,10 @@ import (
 // @name x-token
 // @BasePath /
 func main() {
-	switch global.GVA_CONFIG.System.DbType {
-	case "mysql":
-		initialize.Mysql()
-	// case "sqlite":
-	//	initialize.Sqlite()  // sqlite需要gcc支持 windows用户需要自行安装gcc 如需使用打开注释即可
-	default:
-		initialize.Mysql()
+	initialize.Gorm()
+	if global.GVA_CONFIG.System.NeedInitData {
+		init_data.InitData() // 通过配置文件初始化数据 默认为 false 首次运行需要将 ./config.yaml中 system下的 need-init-data 修改为true
 	}
-	initialize.DBTables()
-	//initialize.Data() // 打开注释即可初始化数据
 	// 程序结束前关闭数据库链接
 	db, _ := global.GVA_DB.DB()
 	defer db.Close()

server/model/exa_customer.go

@@ -2,20 +2,13 @@ package model
 
 import (
 	"gorm.io/gorm"
-	"time"
 )
 
 type ExaCustomer struct {
 	gorm.Model
-	CustomerName       string  `json:"customerName" form:"customerName" gorm:"comment:'客户名'"`
-	CustomerPhoneData  string  `json:"customerPhoneData" form:"customerPhoneData" gorm:"comment:'客户手机号'"`
-	SysUserID          uint    `json:"sysUserId" form:"sysUserId" gorm:"comment:'管理ID'"`
-	SysUserAuthorityID string  `json:"sysUserAuthorityID" form:"sysUserAuthorityID" gorm:"comment:'管理角色ID'"`
-	SysUser            SysUser `json:"sysUser" form:"sysUser" gorm:"comment:'管理详情'"`
-}
-
-func ExaCustomerData() []ExaCustomer {
-	return []ExaCustomer{
-		{Model: gorm.Model{ID: 1, CreatedAt: time.Now(), UpdatedAt: time.Now()}, CustomerName: "测试客户", CustomerPhoneData: "1761111111", SysUserID: 1, SysUserAuthorityID: "888"},
-	}
+	CustomerName       string  `json:"customerName" form:"customerName" gorm:"comment:客户名"`
+	CustomerPhoneData  string  `json:"customerPhoneData" form:"customerPhoneData" gorm:"comment:客户手机号"`
+	SysUserID          uint    `json:"sysUserId" form:"sysUserId" gorm:"comment:管理ID"`
+	SysUserAuthorityID string  `json:"sysUserAuthorityID" form:"sysUserAuthorityID" gorm:"comment:管理角色ID"`
+	SysUser            SysUser `json:"sysUser" form:"sysUser" gorm:"comment:管理详情"`
 }

server/model/exa_file_upload_download.go

@@ -2,20 +2,12 @@ package model
 
 import (
 	"gorm.io/gorm"
-	"time"
 )
 
 type ExaFileUploadAndDownload struct {
 	gorm.Model
-	Name string `json:"name" gorm:"comment:'文件名'"`
-	Url  string `json:"url" gorm:"comment:'文件地址'"`
-	Tag  string `json:"tag" gorm:"comment:'文件标签'"`
-	Key  string `json:"key" gorm:"comment:'编号'"`
-}
-
-func ExaFileUploadAndDownloadData() []ExaFileUploadAndDownload {
-	return []ExaFileUploadAndDownload{
-		{gorm.Model{ID: 1, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "10.png", "http://qmplusimg.henrongyi.top/gvalogo.png", "png", "158787308910.png"},
-		{gorm.Model{ID: 2, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "logo.png", "http://qmplusimg.henrongyi.top/1576554439myAvatar.png", "png", "1587973709logo.png"},
-	}
+	Name string `json:"name" gorm:"comment:文件名"`
+	Url  string `json:"url" gorm:"comment:文件地址"`
+	Tag  string `json:"tag" gorm:"comment:文件标签"`
+	Key  string `json:"key" gorm:"comment:编号"`
 }

server/model/exa_simple_uploader.go

 package model
 
 type ExaSimpleUploader struct {
-	ChunkNumber      string `json:"chunkNumber" gorm:"comment:'当前切片标记'"`
-	CurrentChunkSize string `json:"currentChunkSize" gorm:"comment:'当前切片容量'"`
-	CurrentChunkPath string `json:"currentChunkPath" gorm:"comment:'切片本地路径'"`
-	TotalSize        string `json:"totalSize" gorm:"comment:'总容量'"`
-	Identifier       string `json:"identifier" gorm:"comment:'文件标识（md5）'"`
-	Filename         string `json:"filename" gorm:"comment:'文件名'"`
-	TotalChunks      string `json:"totalChunks" gorm:"comment:'切片总数'"`
-	IsDone           bool   `json:"isDone" gorm:"comment:'是否上传完成'"`
-	FilePath         string `json:"filePath" gorm:"comment:'文件本地路径'"`
+	ChunkNumber      string `json:"chunkNumber" gorm:"comment:当前切片标记"`
+	CurrentChunkSize string `json:"currentChunkSize" gorm:"comment:当前切片容量"`
+	CurrentChunkPath string `json:"currentChunkPath" gorm:"comment:切片本地路径"`
+	TotalSize        string `json:"totalSize" gorm:"comment:总容量"`
+	Identifier       string `json:"identifier" gorm:"comment:文件标识（md5）"`
+	Filename         string `json:"filename" gorm:"comment:文件名"`
+	TotalChunks      string `json:"totalChunks" gorm:"comment:切片总数"`
+	IsDone           bool   `json:"isDone" gorm:"comment:是否上传完成"`
+	FilePath         string `json:"filePath" gorm:"comment:文件本地路径"`
 }

server/model/sys_api.go

@@ -2,82 +2,12 @@ package model
 
 import (
 	"gorm.io/gorm"
-	"time"
 )
 
 type SysApi struct {
 	gorm.Model
-	Path        string `json:"path" gorm:"comment:'api路径'"`
-	Description string `json:"description" gorm:"comment:'api中文描述'"`
-	ApiGroup    string `json:"apiGroup" gorm:"comment:'api组'"`
-	Method      string `json:"method" gorm:"default:'POST'" gorm:"comment:'方法'"`
-}
-
-func SysApiData() []SysApi {
-	return []SysApi{
-		{gorm.Model{ID: 1, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/base/login", "用户登录", "base", "POST"},
-		{gorm.Model{ID: 2, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/base/register", "用户注册", "base", "POST"},
-		{gorm.Model{ID: 3, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/api/createApi", "创建api", "api", "POST"},
-		{gorm.Model{ID: 4, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/api/getApiList", "获取api列表", "api", "POST"},
-		{gorm.Model{ID: 5, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/api/getApiById", "获取api详细信息", "api", "POST"},
-		{gorm.Model{ID: 6, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/api/deleteApi", "删除Api", "api", "POST"},
-		{gorm.Model{ID: 7, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/api/updateApi", "更新Api", "api", "POST"},
-		{gorm.Model{ID: 8, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/api/getAllApis", "获取所有api", "api", "POST"},
-		{gorm.Model{ID: 9, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/authority/createAuthority", "创建角色", "authority", "POST"},
-		{gorm.Model{ID: 10, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/authority/deleteAuthority", "删除角色", "authority", "POST"},
-		{gorm.Model{ID: 11, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/authority/getAuthorityList", "获取角色列表", "authority", "POST"},
-		{gorm.Model{ID: 12, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/menu/getMenu", "获取菜单树", "menu", "POST"},
-		{gorm.Model{ID: 13, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/menu/getMenuList", "分页获取基础menu列表", "menu", "POST"},
-		{gorm.Model{ID: 14, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/menu/addBaseMenu", "新增菜单", "menu", "POST"},
-		{gorm.Model{ID: 15, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/menu/getBaseMenuTree", "获取用户动态路由", "menu", "POST"},
-		{gorm.Model{ID: 16, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/menu/addMenuAuthority", "增加menu和角色关联关系", "menu", "POST"},
-		{gorm.Model{ID: 17, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/menu/getMenuAuthority", "获取指定角色menu", "menu", "POST"},
-		{gorm.Model{ID: 18, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/menu/deleteBaseMenu", "删除菜单", "menu", "POST"},
-		{gorm.Model{ID: 19, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/menu/updateBaseMenu", "更新菜单", "menu", "POST"},
-		{gorm.Model{ID: 20, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/menu/getBaseMenuById", "根据id获取菜单", "menu", "POST"},
-		{gorm.Model{ID: 21, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/user/changePassword", "修改密码", "user", "POST"},
-		{gorm.Model{ID: 23, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/user/getUserList", "获取用户列表", "user", "POST"},
-		{gorm.Model{ID: 24, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/user/setUserAuthority", "修改用户角色", "user", "POST"},
-		{gorm.Model{ID: 25, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/fileUploadAndDownload/upload", "文件上传示例", "fileUploadAndDownload", "POST"},
-		{gorm.Model{ID: 26, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/fileUploadAndDownload/getFileList", "获取上传文件列表", "fileUploadAndDownload", "POST"},
-		{gorm.Model{ID: 27, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/casbin/updateCasbin", "更改角色api权限", "casbin", "POST"},
-		{gorm.Model{ID: 28, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/casbin/getPolicyPathByAuthorityId", "获取权限列表", "casbin", "POST"},
-		{gorm.Model{ID: 29, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/fileUploadAndDownload/deleteFile", "删除文件", "fileUploadAndDownload", "POST"},
-		{gorm.Model{ID: 30, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/jwt/jsonInBlacklist", "jwt加入黑名单", "jwt", "POST"},
-		{gorm.Model{ID: 31, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/authority/setDataAuthority", "设置角色资源权限", "authority", "POST"},
-		{gorm.Model{ID: 32, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/system/getSystemConfig", "获取配置文件内容", "system", "POST"},
-		{gorm.Model{ID: 33, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/system/setSystemConfig", "设置配置文件内容", "system", "POST"},
-		{gorm.Model{ID: 34, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/customer/customer", "创建客户", "customer", "POST"},
-		{gorm.Model{ID: 35, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/customer/customer", "更新客户", "customer", "PUT"},
-		{gorm.Model{ID: 36, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/customer/customer", "删除客户", "customer", "DELETE"},
-		{gorm.Model{ID: 37, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/customer/customer", "获取单一客户", "customer", "GET"},
-		{gorm.Model{ID: 38, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/customer/customerList", "获取客户列表", "customer", "GET"},
-		{gorm.Model{ID: 39, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/casbin/casbinTest/:pathParam", "RESTFUL模式测试", "casbin", "GET"},
-		{gorm.Model{ID: 40, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/autoCode/createTemp", "自动化代码", "autoCode", "POST"},
-		{gorm.Model{ID: 41, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/authority/updateAuthority", "更新角色信息", "authority", "PUT"},
-		{gorm.Model{ID: 42, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/authority/copyAuthority", "拷贝角色", "authority", "POST"},
-		{gorm.Model{ID: 43, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/user/deleteUser", "删除用户", "user", "DELETE"},
-		{gorm.Model{ID: 44, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/sysDictionaryDetail/createSysDictionaryDetail", "新增字典内容", "sysDictionaryDetail", "POST"},
-		{gorm.Model{ID: 45, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/sysDictionaryDetail/deleteSysDictionaryDetail", "删除字典内容", "sysDictionaryDetail", "DELETE"},
-		{gorm.Model{ID: 46, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/sysDictionaryDetail/updateSysDictionaryDetail", "更新字典内容", "sysDictionaryDetail", "PUT"},
-		{gorm.Model{ID: 47, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/sysDictionaryDetail/findSysDictionaryDetail", "根据ID获取字典内容", "sysDictionaryDetail", "GET"},
-		{gorm.Model{ID: 48, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/sysDictionaryDetail/getSysDictionaryDetailList", "获取字典内容列表", "sysDictionaryDetail", "GET"},
-		{gorm.Model{ID: 49, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/sysDictionary/createSysDictionary", "新增字典", "sysDictionary", "POST"},
-		{gorm.Model{ID: 50, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/sysDictionary/deleteSysDictionary", "删除字典", "sysDictionary", "DELETE"},
-		{gorm.Model{ID: 51, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/sysDictionary/updateSysDictionary", "更新字典", "sysDictionary", "PUT"},
-		{gorm.Model{ID: 52, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/sysDictionary/findSysDictionary", "根据ID获取字典", "sysDictionary", "GET"},
-		{gorm.Model{ID: 53, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/sysDictionary/getSysDictionaryList", "获取字典列表", "sysDictionary", "GET"},
-		{gorm.Model{ID: 54, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/sysOperationRecord/createSysOperationRecord", "新增操作记录", "sysOperationRecord", "POST"},
-		{gorm.Model{ID: 55, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/sysOperationRecord/deleteSysOperationRecord", "删除操作记录", "sysOperationRecord", "DELETE"},
-		{gorm.Model{ID: 56, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/sysOperationRecord/findSysOperationRecord", "根据ID获取操作记录", "sysOperationRecord", "GET"},
-		{gorm.Model{ID: 57, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/sysOperationRecord/getSysOperationRecordList", "获取操作记录列表", "sysOperationRecord", "GET"},
-		{gorm.Model{ID: 58, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/autoCode/getTables", "获取数据库表", "autoCode", "GET"},
-		{gorm.Model{ID: 59, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/autoCode/getDB", "获取所有数据库", "autoCode", "GET"},
-		{gorm.Model{ID: 60, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/autoCode/getColume", "获取所选table的所有字段", "autoCode", "GET"},
-		{gorm.Model{ID: 61, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/sysOperationRecord/deleteSysOperationRecordByIds", "批量删除操作历史", "sysOperationRecord", "DELETE"},
-		{gorm.Model{ID: 62, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/simpleUploader/upload", "插件版分片上传", "simpleUploader", "POST"},
-		{gorm.Model{ID: 63, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/simpleUploader/checkFileMd5", "文件完整度验证", "simpleUploader", "GET"},
-		{gorm.Model{ID: 64, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/simpleUploader/mergeFileMd5", "上传完成合并文件", "simpleUploader", "GET"},
-		{gorm.Model{ID: 65, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/user/setUserInfo", "设置用户信息", "user", "PUT"},
-	}
+	Path        string `json:"path" gorm:"comment:api路径"`
+	Description string `json:"description" gorm:"comment:api中文描述"`
+	ApiGroup    string `json:"apiGroup" gorm:"comment:api组"`
+	Method      string `json:"method" gorm:"default:POST" gorm:"comment:方法"`
 }

server/model/sys_authority.go

@@ -8,18 +8,10 @@ type SysAuthority struct {
 	CreatedAt       time.Time
 	UpdatedAt       time.Time
 	DeletedAt       *time.Time     `sql:"index"`
-	AuthorityId     string         `json:"authorityId" gorm:"not null;unique;primary_key;comment:'角色ID';size:90"`
-	AuthorityName   string         `json:"authorityName" gorm:"comment:'角色名'"`
-	ParentId        string         `json:"parentId" gorm:"comment:'父角色ID'"`
+	AuthorityId     string         `json:"authorityId" gorm:"not null;unique;primary_key;comment:角色ID;size:90"`
+	AuthorityName   string         `json:"authorityName" gorm:"comment:角色名"`
+	ParentId        string         `json:"parentId" gorm:"comment:父角色ID"`
 	DataAuthorityId []SysAuthority `json:"dataAuthorityId" gorm:"many2many:sys_data_authority_id"`
 	Children        []SysAuthority `json:"children" gorm:"-"`
 	SysBaseMenus    []SysBaseMenu  `json:"menus" gorm:"many2many:sys_authority_menus;"`
 }
-
-func SysAuthorityData() []SysAuthority {
-	return []SysAuthority{
-		{CreatedAt: time.Now(), UpdatedAt: time.Now(), AuthorityId: "888", AuthorityName: "普通用户", ParentId: "0"},
-		{CreatedAt: time.Now(), UpdatedAt: time.Now(), AuthorityId: "8881", AuthorityName: "普通用户子角色", ParentId: "888"},
-		{CreatedAt: time.Now(), UpdatedAt: time.Now(), AuthorityId: "9528", AuthorityName: "测试角色", ParentId: "0"},
-	}
-}

server/model/sys_authority_menu.go

@@ -2,8 +2,8 @@ package model
 
 type SysMenu struct {
 	SysBaseMenu
-	MenuId      string                 `json:"menuId" gorm:"comment:'菜单ID'"`
-	AuthorityId string                 `json:"-" gorm:"comment:'角色ID'"`
+	MenuId      string                 `json:"menuId" gorm:"comment:菜单ID"`
+	AuthorityId string                 `json:"-" gorm:"comment:角色ID"`
 	Children    []SysMenu              `json:"children" gorm:"-"`
 	Parameters  []SysBaseMenuParameter `json:"parameters" gorm:"foreignKey:SysBaseMenuID;references:MenuId"`
 }

server/model/sys_base_menu.go

@@ -2,29 +2,28 @@ package model
 
 import (
 	"gorm.io/gorm"
-	"time"
 )
 
 type SysBaseMenu struct {
 	gorm.Model
 	MenuLevel     uint   `json:"-"`
-	ParentId      string `json:"parentId" gorm:"comment:'父菜单ID'"`
-	Path          string `json:"path" gorm:"comment:'路由path'"`
-	Name          string `json:"name" gorm:"comment:'路由name'"`
-	Hidden        bool   `json:"hidden" gorm:"comment:'是否在列表隐藏'"`
-	Component     string `json:"component" gorm:"comment:'对应前端文件路径'"`
-	Sort          int    `json:"sort" gorm:"comment:'排序标记'"`
-	Meta          `json:"meta" gorm:"comment:'附加属性'"`
+	ParentId      string `json:"parentId" gorm:"comment:父菜单ID"`
+	Path          string `json:"path" gorm:"comment:路由path"`
+	Name          string `json:"name" gorm:"comment:路由name"`
+	Hidden        bool   `json:"hidden" gorm:"comment:是否在列表隐藏"`
+	Component     string `json:"component" gorm:"comment:对应前端文件路径"`
+	Sort          int    `json:"sort" gorm:"comment:排序标记"`
+	Meta          `json:"meta" gorm:"comment:附加属性"`
 	SysAuthoritys []SysAuthority         `json:"authoritys" gorm:"many2many:sys_authority_menus;"`
 	Children      []SysBaseMenu          `json:"children" gorm:"-"`
 	Parameters    []SysBaseMenuParameter `json:"parameters"`
 }
 
 type Meta struct {
-	KeepAlive   bool   `json:"keepAlive" gorm:"comment:'是否缓存'"`
-	DefaultMenu bool   `json:"defaultMenu" gorm:"comment:'是否是基础路由（开发中）'"`
-	Title       string `json:"title" gorm:"comment:'菜单名'"`
-	Icon        string `json:"icon" gorm:"comment:'菜单图标'"`
+	KeepAlive   bool   `json:"keepAlive" gorm:"comment:是否缓存"`
+	DefaultMenu bool   `json:"defaultMenu" gorm:"comment:是否是基础路由（开发中）"`
+	Title       string `json:"title" gorm:"comment:菜单名"`
+	Icon        string `json:"icon" gorm:"comment:菜单图标"`
 }
 
 type SysBaseMenuParameter struct {
@@ -34,34 +33,3 @@ type SysBaseMenuParameter struct {
 	Key           string `json:"key" gorm:"commit:'地址栏携带参数的key'"`
 	Value         string `json:"value" gorm:"commit:'地址栏携带参数的值'"`
 }
-
-func SysBaseMenusData() []SysBaseMenu {
-	return []SysBaseMenu{
-		{Model: gorm.Model{ID: 1, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, ParentId: "0", Path: "dashboard", Name: "dashboard", Hidden: false, Component: "view/dashboard/index.vue", Sort: 1, Meta: Meta{Title: "仪表盘", Icon: "setting"}},
-		{Model: gorm.Model{ID: 2, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: false, ParentId: "0", Path: "about", Name: "about", Component: "view/about/index.vue", Sort: 7, Meta: Meta{Title: "关于我们", Icon: "info"}},
-		{Model: gorm.Model{ID: 3, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: false, ParentId: "0", Path: "admin", Name: "superAdmin", Component: "view/superAdmin/index.vue", Sort: 3, Meta: Meta{Title: "超级管理员", Icon: "user-solid"}},
-		{Model: gorm.Model{ID: 4, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: false, ParentId: "3", Path: "authority", Name: "authority", Component: "view/superAdmin/authority/authority.vue", Sort: 1, Meta: Meta{Title: "角色管理", Icon: "s-custom"}},
-		{Model: gorm.Model{ID: 5, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: false, ParentId: "3", Path: "menu", Name: "menu", Component: "view/superAdmin/menu/menu.vue", Sort: 2, Meta: Meta{Title: "菜单管理", Icon: "s-order", KeepAlive: true}},
-		{Model: gorm.Model{ID: 6, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: false, ParentId: "3", Path: "api", Name: "api", Component: "view/superAdmin/api/api.vue", Sort: 3, Meta: Meta{Title: "api管理", Icon: "s-platform", KeepAlive: true}},
-		{Model: gorm.Model{ID: 7, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: false, ParentId: "3", Path: "user", Name: "user", Component: "view/superAdmin/user/user.vue", Sort: 4, Meta: Meta{Title: "用户管理", Icon: "coordinate"}},
-		{Model: gorm.Model{ID: 8, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: true, ParentId: "0", Path: "person", Name: "person", Component: "view/person/person.vue", Sort: 4, Meta: Meta{Title: "个人信息", Icon: "message-solid"}},
-		{Model: gorm.Model{ID: 9, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: false, ParentId: "0", Path: "example", Name: "example", Component: "view/example/index.vue", Sort: 6, Meta: Meta{Title: "示例文件", Icon: "s-management"}},
-		{Model: gorm.Model{ID: 10, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: false, ParentId: "9", Path: "table", Name: "table", Component: "view/example/table/table.vue", Sort: 1, Meta: Meta{Title: "表格示例", Icon: "s-order"}},
-		{Model: gorm.Model{ID: 11, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: false, ParentId: "9", Path: "form", Name: "form", Component: "view/example/form/form.vue", Sort: 2, Meta: Meta{Title: "表单示例", Icon: "document"}},
-		{Model: gorm.Model{ID: 12, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: false, ParentId: "9", Path: "rte", Name: "rte", Component: "view/example/rte/rte.vue", Sort: 3, Meta: Meta{Title: "富文本编辑器", Icon: "reading"}},
-		{Model: gorm.Model{ID: 13, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: false, ParentId: "9", Path: "excel", Name: "excel", Component: "view/example/excel/excel.vue", Sort: 4, Meta: Meta{Title: "excel导入导出", Icon: "s-marketing"}},
-		{Model: gorm.Model{ID: 14, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: false, ParentId: "9", Path: "upload", Name: "upload", Component: "view/example/upload/upload.vue", Sort: 5, Meta: Meta{Title: "上传下载", Icon: "upload"}},
-		{Model: gorm.Model{ID: 15, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: false, ParentId: "9", Path: "breakpoint", Name: "breakpoint", Component: "view/example/breakpoint/breakpoint.vue", Sort: 6, Meta: Meta{Title: "断点续传", Icon: "upload"}},
-		{Model: gorm.Model{ID: 16, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: false, ParentId: "9", Path: "customer", Name: "customer", Component: "view/example/customer/customer.vue", Sort: 7, Meta: Meta{Title: "客户列表（资源示例）", Icon: "s-custom"}},
-		{Model: gorm.Model{ID: 17, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: false, ParentId: "0", Path: "systemTools", Name: "systemTools", Component: "view/systemTools/index.vue", Sort: 5, Meta: Meta{Title: "系统工具", Icon: "s-cooperation"}},
-		{Model: gorm.Model{ID: 18, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: false, ParentId: "17", Path: "autoCode", Name: "autoCode", Component: "view/systemTools/autoCode/index.vue", Sort: 1, Meta: Meta{Title: "代码生成器", Icon: "cpu", KeepAlive: true}},
-		{Model: gorm.Model{ID: 19, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: false, ParentId: "17", Path: "formCreate", Name: "formCreate", Component: "view/systemTools/formCreate/index.vue", Sort: 2, Meta: Meta{Title: "表单生成器", Icon: "magic-stick", KeepAlive: true}},
-		{Model: gorm.Model{ID: 20, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: false, ParentId: "17", Path: "system", Name: "system", Component: "view/systemTools/system/system.vue", Sort: 3, Meta: Meta{Title: "系统配置", Icon: "s-operation"}},
-		{Model: gorm.Model{ID: 21, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: false, ParentId: "0", Path: "iconList", Name: "iconList", Component: "view/iconList/index.vue", Sort: 2, Meta: Meta{Title: "图标集合", Icon: "star-on"}},
-		{Model: gorm.Model{ID: 22, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: false, ParentId: "3", Path: "dictionary", Name: "dictionary", Component: "view/superAdmin/dictionary/sysDictionary.vue", Sort: 5, Meta: Meta{Title: "字典管理", Icon: "notebook-2"}},
-		{Model: gorm.Model{ID: 23, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: true, ParentId: "3", Path: "dictionaryDetail/:id", Name: "dictionaryDetail", Component: "view/superAdmin/dictionary/sysDictionaryDetail.vue", Sort: 1, Meta: Meta{Title: "字典详情", Icon: "s-order"}},
-		{Model: gorm.Model{ID: 24, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: false, ParentId: "3", Path: "operation", Name: "operation", Component: "view/superAdmin/operation/sysOperationRecord.vue", Sort: 6, Meta: Meta{Title: "操作历史", Icon: "time"}},
-		{Model: gorm.Model{ID: 25, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, Hidden: false, ParentId: "9", Path: "simpleUploader", Name: "simpleUploader", Component: "view/example/simpleUploader/simpleUploader", Sort: 6, Meta: Meta{Title: "断点续传（插件版）", Icon: "upload"}},
-		{Model: gorm.Model{ID: 26, CreatedAt: time.Now(), UpdatedAt: time.Now()}, MenuLevel: 0, ParentId: "0", Path: "https://www.gin-vue-admin.com", Name: "https://www.gin-vue-admin.com", Hidden: false, Component: "/", Sort: 0, Meta: Meta{Title: "官方网站", Icon: "s-home"}},
-	}
-}

server/model/sys_casbin.go

@@ -6,145 +6,3 @@ type CasbinModel struct {
 	Path        string `json:"path" gorm:"column:v1"`
 	Method      string `json:"method" gorm:"column:v2"`
 }
-
-func CasbinModelData() []CasbinModel {
-	return []CasbinModel{
-		{"p", "888", "/base/login", "POST"},
-		{"p", "888", "/base/register", "POST"},
-		{"p", "888", "/api/createApi", "POST"},
-		{"p", "888", "/api/getApiList", "POST"},
-		{"p", "888", "/api/getApiById", "POST"},
-		{"p", "888", "/api/deleteApi", "POST"},
-		{"p", "888", "/api/updateApi", "POST"},
-		{"p", "888", "/api/getAllApis", "POST"},
-		{"p", "888", "/authority/createAuthority", "POST"},
-		{"p", "888", "/authority/deleteAuthority", "POST"},
-		{"p", "888", "/authority/getAuthorityList", "POST"},
-		{"p", "888", "/authority/setDataAuthority", "POST"},
-		{"p", "888", "/authority/updateAuthority", "PUT"},
-		{"p", "888", "/authority/copyAuthority", "POST"},
-		{"p", "888", "/menu/getMenu", "POST"},
-		{"p", "888", "/menu/getMenuList", "POST"},
-		{"p", "888", "/menu/addBaseMenu", "POST"},
-		{"p", "888", "/menu/getBaseMenuTree", "POST"},
-		{"p", "888", "/menu/addMenuAuthority", "POST"},
-		{"p", "888", "/menu/getMenuAuthority", "POST"},
-		{"p", "888", "/menu/deleteBaseMenu", "POST"},
-		{"p", "888", "/menu/updateBaseMenu", "POST"},
-		{"p", "888", "/menu/getBaseMenuById", "POST"},
-		{"p", "888", "/user/changePassword", "POST"},
-		{"p", "888", "/user/getUserList", "POST"},
-		{"p", "888", "/user/setUserAuthority", "POST"},
-		{"p", "888", "/user/deleteUser", "DELETE"},
-		{"p", "888", "/fileUploadAndDownload/upload", "POST"},
-		{"p", "888", "/fileUploadAndDownload/getFileList", "POST"},
-		{"p", "888", "/fileUploadAndDownload/deleteFile", "POST"},
-		{"p", "888", "/casbin/updateCasbin", "POST"},
-		{"p", "888", "/casbin/getPolicyPathByAuthorityId", "POST"},
-		{"p", "888", "/casbin/casbinTest/:pathParam", "GET"},
-		{"p", "888", "/jwt/jsonInBlacklist", "POST"},
-		{"p", "888", "/system/getSystemConfig", "POST"},
-		{"p", "888", "/system/setSystemConfig", "POST"},
-		{"p", "888", "/customer/customer", "POST"},
-		{"p", "888", "/customer/customer", "PUT"},
-		{"p", "888", "/customer/customer", "DELETE"},
-		{"p", "888", "/customer/customer", "GET"},
-		{"p", "888", "/customer/customerList", "GET"},
-		{"p", "888", "/autoCode/createTemp", "POST"},
-		{"p", "888", "/autoCode/getTables", "GET"},
-		{"p", "888", "/autoCode/getDB", "GET"},
-		{"p", "888", "/autoCode/getColume", "GET"},
-		{"p", "888", "/sysDictionaryDetail/createSysDictionaryDetail", "POST"},
-		{"p", "888", "/sysDictionaryDetail/deleteSysDictionaryDetail", "DELETE"},
-		{"p", "888", "/sysDictionaryDetail/updateSysDictionaryDetail", "PUT"},
-		{"p", "888", "/sysDictionaryDetail/findSysDictionaryDetail", "GET"},
-		{"p", "888", "/sysDictionaryDetail/getSysDictionaryDetailList", "GET"},
-		{"p", "888", "/sysDictionary/createSysDictionary", "POST"},
-		{"p", "888", "/sysDictionary/deleteSysDictionary", "DELETE"},
-		{"p", "888", "/sysDictionary/updateSysDictionary", "PUT"},
-		{"p", "888", "/sysDictionary/findSysDictionary", "GET"},
-		{"p", "888", "/sysDictionary/getSysDictionaryList", "GET"},
-		{"p", "888", "/sysOperationRecord/createSysOperationRecord", "POST"},
-		{"p", "888", "/sysOperationRecord/deleteSysOperationRecord", "DELETE"},
-		{"p", "888", "/sysOperationRecord/updateSysOperationRecord", "PUT"},
-		{"p", "888", "/sysOperationRecord/findSysOperationRecord", "GET"},
-		{"p", "888", "/sysOperationRecord/getSysOperationRecordList", "GET"},
-		{"p", "888", "/sysOperationRecord/deleteSysOperationRecordByIds", "DELETE"},
-		{"p", "888", "/user/setUserInfo", "PUT"},
-		{"p", "8881", "/base/login", "POST"},
-		{"p", "8881", "/base/register", "POST"},
-		{"p", "8881", "/api/createApi", "POST"},
-		{"p", "8881", "/api/getApiList", "POST"},
-		{"p", "8881", "/api/getApiById", "POST"},
-		{"p", "8881", "/api/deleteApi", "POST"},
-		{"p", "8881", "/api/updateApi", "POST"},
-		{"p", "8881", "/api/getAllApis", "POST"},
-		{"p", "8881", "/authority/createAuthority", "POST"},
-		{"p", "8881", "/authority/deleteAuthority", "POST"},
-		{"p", "8881", "/authority/getAuthorityList", "POST"},
-		{"p", "8881", "/authority/setDataAuthority", "POST"},
-		{"p", "8881", "/menu/getMenu", "POST"},
-		{"p", "8881", "/menu/getMenuList", "POST"},
-		{"p", "8881", "/menu/addBaseMenu", "POST"},
-		{"p", "8881", "/menu/getBaseMenuTree", "POST"},
-		{"p", "8881", "/menu/addMenuAuthority", "POST"},
-		{"p", "8881", "/menu/getMenuAuthority", "POST"},
-		{"p", "8881", "/menu/deleteBaseMenu", "POST"},
-		{"p", "8881", "/menu/updateBaseMenu", "POST"},
-		{"p", "8881", "/menu/getBaseMenuById", "POST"},
-		{"p", "8881", "/user/changePassword", "POST"},
-		{"p", "8881", "/user/getUserList", "POST"},
-		{"p", "8881", "/user/setUserAuthority", "POST"},
-		{"p", "8881", "/fileUploadAndDownload/upload", "POST"},
-		{"p", "8881", "/fileUploadAndDownload/getFileList", "POST"},
-		{"p", "8881", "/fileUploadAndDownload/deleteFile", "POST"},
-		{"p", "8881", "/casbin/updateCasbin", "POST"},
-		{"p", "8881", "/casbin/getPolicyPathByAuthorityId", "POST"},
-		{"p", "8881", "/jwt/jsonInBlacklist", "POST"},
-		{"p", "8881", "/system/getSystemConfig", "POST"},
-		{"p", "8881", "/system/setSystemConfig", "POST"},
-		{"p", "8881", "/customer/customer", "POST"},
-		{"p", "8881", "/customer/customer", "PUT"},
-		{"p", "8881", "/customer/customer", "DELETE"},
-		{"p", "8881", "/customer/customer", "GET"},
-		{"p", "8881", "/customer/customerList", "GET"},
-		{"p", "9528", "/base/login", "POST"},
-		{"p", "9528", "/base/register", "POST"},
-		{"p", "9528", "/api/createApi", "POST"},
-		{"p", "9528", "/api/getApiList", "POST"},
-		{"p", "9528", "/api/getApiById", "POST"},
-		{"p", "9528", "/api/deleteApi", "POST"},
-		{"p", "9528", "/api/updateApi", "POST"},
-		{"p", "9528", "/api/getAllApis", "POST"},
-		{"p", "9528", "/authority/createAuthority", "POST"},
-		{"p", "9528", "/authority/deleteAuthority", "POST"},
-		{"p", "9528", "/authority/getAuthorityList", "POST"},
-		{"p", "9528", "/authority/setDataAuthority", "POST"},
-		{"p", "9528", "/menu/getMenu", "POST"},
-		{"p", "9528", "/menu/getMenuList", "POST"},
-		{"p", "9528", "/menu/addBaseMenu", "POST"},
-		{"p", "9528", "/menu/getBaseMenuTree", "POST"},
-		{"p", "9528", "/menu/addMenuAuthority", "POST"},
-		{"p", "9528", "/menu/getMenuAuthority", "POST"},
-		{"p", "9528", "/menu/deleteBaseMenu", "POST"},
-		{"p", "9528", "/menu/updateBaseMenu", "POST"},
-		{"p", "9528", "/menu/getBaseMenuById", "POST"},
-		{"p", "9528", "/user/changePassword", "POST"},
-		{"p", "9528", "/user/getUserList", "POST"},
-		{"p", "9528", "/user/setUserAuthority", "POST"},
-		{"p", "9528", "/fileUploadAndDownload/upload", "POST"},
-		{"p", "9528", "/fileUploadAndDownload/getFileList", "POST"},
-		{"p", "9528", "/fileUploadAndDownload/deleteFile", "POST"},
-		{"p", "9528", "/casbin/updateCasbin", "POST"},
-		{"p", "9528", "/casbin/getPolicyPathByAuthorityId", "POST"},
-		{"p", "9528", "/jwt/jsonInBlacklist", "POST"},
-		{"p", "9528", "/system/getSystemConfig", "POST"},
-		{"p", "9528", "/system/setSystemConfig", "POST"},
-		{"p", "9528", "/customer/customer", "POST"},
-		{"p", "9528", "/customer/customer", "PUT"},
-		{"p", "9528", "/customer/customer", "DELETE"},
-		{"p", "9528", "/customer/customer", "GET"},
-		{"p", "9528", "/customer/customerList", "GET"},
-		{"p", "9528", "/autoCode/createTemp", "POST"},
-	}
-}

server/model/sys_dictionary.go

@@ -3,28 +3,14 @@ package model
 
 import (
 	"gorm.io/gorm"
-	"time"
 )
 
 // 如果含有time.Time 请自行import time包
 type SysDictionary struct {
 	gorm.Model
-	Name                 string                `json:"name" form:"name" gorm:"column:name;comment:'字典名（中）'"`
-	Type                 string                `json:"type" form:"type" gorm:"column:type;comment:'字典名（英）'"`
-	Status               *bool                 `json:"status" form:"status" gorm:"column:status;comment:'状态'"`
-	Desc                 string                `json:"desc" form:"desc" gorm:"column:desc;comment:'描述'"`
+	Name                 string                `json:"name" form:"name" gorm:"column:name;comment:字典名（中）"`
+	Type                 string                `json:"type" form:"type" gorm:"column:type;comment:字典名（英）"`
+	Status               *bool                 `json:"status" form:"status" gorm:"column:status;comment:状态"`
+	Desc                 string                `json:"desc" form:"desc" gorm:"column:desc;comment:描述"`
 	SysDictionaryDetails []SysDictionaryDetail `json:"sysDictionaryDetails" form:"sysDictionaryDetails"`
 }
-
-func SysDictionaryData() []SysDictionary {
-	status := new(bool)
-	*status = true
-	return []SysDictionary{
-		{Model: gorm.Model{ID: 1, CreatedAt: time.Now(), UpdatedAt: time.Now()}, Name: "性别", Type: "sex", Status: status, Desc: "性别字典"},
-		{Model: gorm.Model{ID: 2, CreatedAt: time.Now(), UpdatedAt: time.Now()}, Name: "数据库int类型", Type: "int", Status: status, Desc: "int类型对应的数据库类型"},
-		{Model: gorm.Model{ID: 3, CreatedAt: time.Now(), UpdatedAt: time.Now()}, Name: "数据库时间日期类型", Type: "time.Time", Status: status, Desc: "数据库时间日期类型"},
-		{Model: gorm.Model{ID: 4, CreatedAt: time.Now(), UpdatedAt: time.Now()}, Name: "数据库浮点型", Type: "float64", Status: status, Desc: "数据库浮点型"},
-		{Model: gorm.Model{ID: 5, CreatedAt: time.Now(), UpdatedAt: time.Now()}, Name: "数据库字符串", Type: "string", Status: status, Desc: "数据库字符串"},
-		{Model: gorm.Model{ID: 6, CreatedAt: time.Now(), UpdatedAt: time.Now()}, Name: "数据库bool类型", Type: "bool", Status: status, Desc: "数据库bool类型"},
-	}
-}
\ No newline at end of file

server/model/sys_dictionary_detail.go

@@ -3,45 +3,14 @@ package model
 
 import (
 	"gorm.io/gorm"
-	"time"
 )
 
 // 如果含有time.Time 请自行import time包
 type SysDictionaryDetail struct {
 	gorm.Model
-	Label           string `json:"label" form:"label" gorm:"column:label;comment:'展示值'"`
-	Value           int    `json:"value" form:"value" gorm:"column:value;comment:'字典值'"`
-	Status          *bool  `json:"status" form:"status" gorm:"column:status;comment:'启用状态'"`
-	Sort            int    `json:"sort" form:"sort" gorm:"column:sort;comment:'排序标记'"`
-	SysDictionaryID int    `json:"sysDictionaryID" form:"sysDictionaryID" gorm:"column:sys_dictionary_id;comment:'关联标记'"`
+	Label           string `json:"label" form:"label" gorm:"column:label;comment:展示值"`
+	Value           int    `json:"value" form:"value" gorm:"column:value;comment:字典值"`
+	Status          *bool  `json:"status" form:"status" gorm:"column:status;comment:启用状态"`
+	Sort            int    `json:"sort" form:"sort" gorm:"column:sort;comment:排序标记"`
+	SysDictionaryID int    `json:"sysDictionaryID" form:"sysDictionaryID" gorm:"column:sys_dictionary_id;comment:关联标记"`
 }
-
-func SysDictionaryDetailData() []SysDictionaryDetail {
-	status := new(bool)
-	*status = true
-	return []SysDictionaryDetail{
-		{gorm.Model{ID: 1, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "smallint", 1, status, 1, 2},
-		{gorm.Model{ID: 2, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "mediumint", 2, status, 2, 2},
-		{gorm.Model{ID: 3, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "int", 3, status, 3, 2},
-		{gorm.Model{ID: 4, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "bigint", 4, status, 4, 2},
-		{gorm.Model{ID: 5, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "data", 0, status, 0, 3},
-		{gorm.Model{ID: 6, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "time", 1, status, 1, 3},
-		{gorm.Model{ID: 7, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "year", 2, status, 2, 3},
-		{gorm.Model{ID: 8, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "datetime", 3, status, 3, 3},
-		{gorm.Model{ID: 9, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "timestamp", 5, status, 5, 3},
-		{gorm.Model{ID: 10, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "float", 0, status, 0, 4},
-		{gorm.Model{ID: 11, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "double", 1, status, 1, 4},
-		{gorm.Model{ID: 12, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "decimal", 2, status, 2, 4},
-		{gorm.Model{ID: 13, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "char", 0, status, 0, 5},
-		{gorm.Model{ID: 14, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "varchar", 1, status, 1, 5},
-		{gorm.Model{ID: 15, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "tinyblob", 2, status, 2, 5},
-		{gorm.Model{ID: 16, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "tinytext", 3, status, 3, 5},
-		{gorm.Model{ID: 17, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "text", 4, status, 4, 5},
-		{gorm.Model{ID: 18, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "blob", 5, status, 5, 5},
-		{gorm.Model{ID: 19, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "mediumblob", 6, status, 6, 5},
-		{gorm.Model{ID: 20, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "mediumtext", 7, status, 7, 5},
-		{gorm.Model{ID: 21, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "longblob", 8, status, 8, 5},
-		{gorm.Model{ID: 22, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "longtext", 9, status, 9, 5},
-		{gorm.Model{ID: 23, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "tinyint", 0, status, 0, 6},
-	}
-}
\ No newline at end of file

server/model/sys_jwt_blacklist.go

@@ -6,5 +6,5 @@ import (
 
 type JwtBlacklist struct {
 	gorm.Model
-	Jwt string `gorm:"type:text;comment:'jwt'"`
+	Jwt string `gorm:"type:text;comment:jwt"`
 }

server/model/sys_operation_record.go

@@ -9,15 +9,15 @@ import (
 // 如果含有time.Time 请自行import time包
 type SysOperationRecord struct {
 	gorm.Model
-	Ip           string        `json:"ip" form:"ip" gorm:"column:ip;comment:'请求ip'"`
-	Method       string        `json:"method" form:"method" gorm:"column:method;comment:''"`
-	Path         string        `json:"path" form:"path" gorm:"column:path;comment:''"`
-	Status       int           `json:"status" form:"status" gorm:"column:status;comment:''"`
-	Latency      time.Duration `json:"latency" form:"latency" gorm:"column:latency;comment:''"`
-	Agent        string        `json:"agent" form:"agent" gorm:"column:agent;comment:''"`
-	ErrorMessage string        `json:"error_message" form:"error_message" gorm:"column:error_message;comment:''"`
-	Body         string        `json:"body" form:"body" gorm:"column:body;comment:'请求Body'"`
-	Resp         string        `json:"resp" form:"resp" gorm:"type:longtext;column:resp;comment:'响应Body'"`
-	UserID       int           `json:"user_id" form:"user_id" gorm:"column:user_id;comment:''"`
+	Ip           string        `json:"ip" form:"ip" gorm:"column:ip;comment:请求ip"`
+	Method       string        `json:"method" form:"method" gorm:"column:method;comment:请求方法"`
+	Path         string        `json:"path" form:"path" gorm:"column:path;comment:请求路径"`
+	Status       int           `json:"status" form:"status" gorm:"column:status;comment:请求状态"`
+	Latency      time.Duration `json:"latency" form:"latency" gorm:"column:latency;comment:延迟"`
+	Agent        string        `json:"agent" form:"agent" gorm:"column:agent;comment:代理"`
+	ErrorMessage string        `json:"error_message" form:"error_message" gorm:"column:error_message;comment:错误信息"`
+	Body         string        `json:"body" form:"body" gorm:"column:body;comment:请求Body"`
+	Resp         string        `json:"resp" form:"resp" gorm:"type:longtext;column:resp;comment:响应Body"`
+	UserID       int           `json:"user_id" form:"user_id" gorm:"column:user_id;comment:用户id"`
 	User         SysUser       `json:"user"`
 }

server/model/sys_user.go

@@ -3,23 +3,15 @@ package model
 import (
 	"github.com/satori/go.uuid"
 	"gorm.io/gorm"
-	"time"
 )
 
 type SysUser struct {
 	gorm.Model
-	UUID        uuid.UUID    `json:"uuid" gorm:"comment:'用户UUID'"`
-	Username    string       `json:"userName" gorm:"comment:'用户登录名'"`
-	Password    string       `json:"-"  gorm:"comment:'用户登录密码'"`
-	NickName    string       `json:"nickName" gorm:"default:'系统用户';comment:'用户昵称'" `
-	HeaderImg   string       `json:"headerImg" gorm:"default:'http://qmplusimg.henrongyi.top/head.png';comment:'用户头像'"`
-	Authority   SysAuthority `json:"authority" gorm:"foreignKey:AuthorityId;references:AuthorityId;comment:'用户角色'"`
-	AuthorityId string       `json:"authorityId" gorm:"default:888;comment:'用户角色ID'"`
-}
-
-func SysUserData() []SysUser {
-	return []SysUser{
-		{Model: gorm.Model{ID: 1, CreatedAt: time.Now(), UpdatedAt: time.Now()}, UUID: uuid.NewV4(), Username: "admin", Password: "e10adc3949ba59abbe56e057f20f883e", NickName: "超级管理员", HeaderImg: "http://qmplusimg.henrongyi.top/1571627762timg.jpg", AuthorityId: "888"},
-		{Model: gorm.Model{ID: 2, CreatedAt: time.Now(), UpdatedAt: time.Now()}, UUID: uuid.NewV4(), Username: "a303176530", Password: "3ec063004a6f31642261936a379fde3d", NickName: "QMPlusUser", HeaderImg: "http://qmplusimg.henrongyi.top/1572075907logo.png", AuthorityId: "9528"},
-	}
+	UUID        uuid.UUID    `json:"uuid" gorm:"comment:用户UUID"`
+	Username    string       `json:"userName" gorm:"comment:用户登录名"`
+	Password    string       `json:"-"  gorm:"comment:用户登录密码"`
+	NickName    string       `json:"nickName" gorm:"default:系统用户;comment:用户昵称" `
+	HeaderImg   string       `json:"headerImg" gorm:"default:http://qmplusimg.henrongyi.top/head.png;comment:用户头像"`
+	Authority   SysAuthority `json:"authority" gorm:"foreignKey:AuthorityId;references:AuthorityId;comment:用户角色"`
+	AuthorityId string       `json:"authorityId" gorm:"default:888;comment:用户角色ID"`
 }

server/model/sys_workflow.go

@@ -7,19 +7,19 @@ import (
 // 工作流属性表
 type SysWorkflow struct {
 	gorm.Model
-	WorkflowNickName    string                `json:"workflowNickName" gorm:"comment:'工作流中文名称'"`  // 工作流名称
-	WorkflowName        string                `json:"workflowName" gorm:"comment:'工作流英文名称'"`      // 工作流英文id
-	WorkflowDescription string                `json:"workflowDescription" gorm:"comment:'工作流描述'"` // 工作流描述
-	WorkflowStepInfo    []SysWorkflowStepInfo `json:"workflowStep" gorm:"comment:'工作流步骤'"`        // 工作流步骤
+	WorkflowNickName    string                `json:"workflowNickName" gorm:"comment:工作流中文名称"`  // 工作流名称
+	WorkflowName        string                `json:"workflowName" gorm:"comment:工作流英文名称"`      // 工作流英文id
+	WorkflowDescription string                `json:"workflowDescription" gorm:"comment:工作流描述"` // 工作流描述
+	WorkflowStepInfo    []SysWorkflowStepInfo `json:"workflowStep" gorm:"comment:工作流步骤"`        // 工作流步骤
 }
 
 // 工作流状态表
 type SysWorkflowStepInfo struct {
 	gorm.Model
-	SysWorkflowID   uint    `json:"workflowID" gorm:"comment:'所属工作流ID'"`      // 所属工作流ID
-	IsStrat         bool    `json:"isStrat" gorm:"comment:'是否是开始流节点'"`        // 是否是开始流节点
-	StepName        string  `json:"stepName" gorm:"comment:'工作流节点名称'"`        // 工作流名称
-	StepNo          float64 `json:"stepNo" gorm:"comment:'步骤id （第几步）'"`       // 步骤id （第几步）
-	StepAuthorityID string  `json:"stepAuthorityID" gorm:"comment:'操作者级别id'"` // 操作者级别id
-	IsEnd           bool    `json:"isEnd" gorm:"comment:'是否是完结流节点'"`          // 是否是完结流节点
+	SysWorkflowID   uint    `json:"workflowID" gorm:"comment:所属工作流ID"`      // 所属工作流ID
+	IsStart         bool    `json:"isStart" gorm:"comment:是否是开始流节点"`        // 是否是开始流节点
+	StepName        string  `json:"stepName" gorm:"comment:工作流节点名称"`        // 工作流名称
+	StepNo          float64 `json:"stepNo" gorm:"comment:步骤id （第几步）"`       // 步骤id （第几步）
+	StepAuthorityID string  `json:"stepAuthorityID" gorm:"comment:操作者级别id"` // 操作者级别id
+	IsEnd           bool    `json:"isEnd" gorm:"comment:是否是完结流节点"`          // 是否是完结流节点
 }

server/model/sys_workflow_process.go

@@ -5,10 +5,10 @@ import "gorm.io/gorm"
 // 工作流流转表
 type SysWorkFlowProcess struct {
 	gorm.Model
-	ApplicationID  uint   `json:"applicationID" gorm:"comment:'当前工作流所属申请的ID'"` // 当前工作流所属申请的ID
-	CurrentNode    string `json:"currentNode" gorm:"comment:'当前进度节点'"`         // 当前进度节点
-	HistoricalNode string `json:"historicalNode" gorm:"comment:'上一个进度节点'"`     // 上一个进度节点
-	CurrentUser    string `json:"currentUser" gorm:"comment:'当前进度操作人'"`        // 当前进度操作人
-	HistoricalUser string `json:"historicalUser" gorm:"comment:'上一个进度的操作人'"`   // 上一个进度的操作人
-	State          bool   `json:"state" gorm:"comment:'状态 是否是正在进行的状态'"`        // 状态 是否是正在进行的状态
+	ApplicationID  uint   `json:"applicationID" gorm:"comment:当前工作流所属申请的ID"` // 当前工作流所属申请的ID
+	CurrentNode    string `json:"currentNode" gorm:"comment:当前进度节点"`         // 当前进度节点
+	HistoricalNode string `json:"historicalNode" gorm:"comment:上一个进度节点"`     // 上一个进度节点
+	CurrentUser    string `json:"currentUser" gorm:"comment:当前进度操作人"`        // 当前进度操作人
+	HistoricalUser string `json:"historicalUser" gorm:"comment:上一个进度的操作人"`   // 上一个进度的操作人
+	State          bool   `json:"state" gorm:"comment:是否是正在进行的状态"`           // 状态 是否是正在进行的状态
 }

server/resource/template/te/model.go.tpl

@@ -9,9 +9,9 @@ import (
 type {{.StructName}} struct {
       gorm.Model {{- range .Fields}}
             {{- if eq .FieldType "bool" }}
-      {{.FieldName}}  *{{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"column:{{.ColumnName}};comment:'{{.Comment}}'{{- if .DataType -}};type:{{.DataType}}{{- if .DataTypeLong -}}({{.DataTypeLong}}){{- end -}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}{{- end -}}"`
+      {{.FieldName}}  *{{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"column:{{.ColumnName}};comment:{{.Comment}}{{- if .DataType -}};type:{{.DataType}}{{- if .DataTypeLong -}}({{.DataTypeLong}}){{- end -}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}{{- end -}}"`
             {{- else }}
-      {{.FieldName}}  {{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"column:{{.ColumnName}};comment:'{{.Comment}}'{{- if .DataType -}};type:{{.DataType}}{{- if .DataTypeLong -}}({{.DataTypeLong}}){{- end -}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}{{- end -}}"`
+      {{.FieldName}}  {{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"column:{{.ColumnName}};comment:{{.Comment}}{{- if .DataType -}};type:{{.DataType}}{{- if .DataTypeLong -}}({{.DataTypeLong}}){{- end -}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}{{- end -}}"`
             {{- end }}  {{- end }} 
 }
 

server/router/sys_email.go

+package router
+
+import (
+	"gin-vue-admin/api/v1"
+	"gin-vue-admin/middleware"
+	"github.com/gin-gonic/gin"
+)
+
+func InitEmailRouter(Router *gin.RouterGroup) {
+	UserRouter := Router.Group("email").Use(middleware.JWTAuth()).Use(middleware.CasbinHandler())
+	{
+		UserRouter.POST("emailTest", v1.EmailTest) // 发送测试邮件
+	}
+}

server/service/sys_db_initialize.go

-package service
-
-import (
-	"gin-vue-admin/global"
-	"gin-vue-admin/model"
-	gormadapter "github.com/casbin/gorm-adapter/v3"
-)
-
-type SysAuthorityMenus struct {
-	SysAuthorityAuthorityId string
-	SysBaseMenuId           uint
-}
-
-type SysDataAuthorityId struct {
-	SysAuthorityAuthorityId    string
-	DataAuthorityIdAuthorityId string
-}
-
-func InitSysApi() (err error) {
-	tx := global.GVA_DB.Begin() // 开始事务
-	insert := model.SysApiData()
-	if tx.Create(&insert).Error != nil { // 遇到错误时回滚事务
-		tx.Rollback()
-	}
-	return tx.Commit().Error
-}
-
-func InitSysUser() (err error) {
-	tx := global.GVA_DB.Begin() // 开始事务
-	insert := model.SysUserData()
-	if tx.Create(&insert).Error != nil { // 遇到错误时回滚事务
-		tx.Rollback()
-	}
-	return tx.Commit().Error
-}
-
-func InitExaCustomer() (err error) {
-	tx := global.GVA_DB.Begin() // 开始事务
-	insert := model.ExaCustomerData()
-	if tx.Create(&insert).Error != nil { // 遇到错误时回滚事务
-		tx.Rollback()
-	}
-	return tx.Commit().Error
-}
-
-func InitCasbinModel() (err error) {
-	if !global.GVA_DB.Migrator().HasTable("casbin_rule") {
-		if err := global.GVA_DB.Migrator().CreateTable(&gormadapter.CasbinRule{}); err != nil {
-			return err
-		}
-	}
-	tx := global.GVA_DB.Begin() // 开始事务
-	insert := model.CasbinModelData()
-	if tx.Table("casbin_rule").Create(&insert).Error != nil { // 遇到错误时回滚事务
-		tx.Rollback()
-	}
-	return tx.Commit().Error
-}
-
-func InitSysAuthority() (err error) {
-	tx := global.GVA_DB.Begin() // 开始事务
-	insert := model.SysAuthorityData()
-	if tx.Create(&insert).Error != nil { // 遇到错误时回滚事务
-		tx.Rollback()
-	}
-	return tx.Commit().Error
-}
-
-func InitSysBaseMenus() (err error) {
-	tx := global.GVA_DB.Begin() // 开始事务
-	insert := model.SysBaseMenusData()
-	if tx.Create(&insert).Error != nil { // 遇到错误时回滚事务
-		tx.Rollback()
-	}
-	return tx.Commit().Error
-}
-
-func InitAuthorityMenu() (err error) {
-	return global.GVA_DB.Exec("CREATE ALGORITHM = UNDEFINED SQL SECURITY DEFINER VIEW `authority_menu` AS select `sys_base_menus`.`id` AS `id`,`sys_base_menus`.`created_at` AS `created_at`, `sys_base_menus`.`updated_at` AS `updated_at`, `sys_base_menus`.`deleted_at` AS `deleted_at`, `sys_base_menus`.`menu_level` AS `menu_level`,`sys_base_menus`.`parent_id` AS `parent_id`,`sys_base_menus`.`path` AS `path`,`sys_base_menus`.`name` AS `name`,`sys_base_menus`.`hidden` AS `hidden`,`sys_base_menus`.`component` AS `component`, `sys_base_menus`.`title`  AS `title`,`sys_base_menus`.`icon` AS `icon`,`sys_base_menus`.`sort` AS `sort`,`sys_authority_menus`.`sys_authority_authority_id` AS `authority_id`,`sys_authority_menus`.`sys_base_menu_id` AS `menu_id`,`sys_base_menus`.`keep_alive` AS `keep_alive`,`sys_base_menus`.`default_menu` AS `default_menu` from (`sys_authority_menus` join `sys_base_menus` on ((`sys_authority_menus`.`sys_base_menu_id` = `sys_base_menus`.`id`)))").Error
-}
-
-func InitSysDictionary() (err error) {
-	tx := global.GVA_DB.Begin() // 开始事务
-	insert := model.SysDictionaryData()
-	if tx.Create(&insert).Error != nil { // 遇到错误时回滚事务
-		tx.Rollback()
-	}
-	return tx.Commit().Error
-}
-
-func InitSysAuthorityMenus() (err error) {
-	tx := global.GVA_DB.Begin() // 开始事务
-	insert := []SysAuthorityMenus{
-		{"888", 1},
-		{"888", 2},
-		{"888", 3},
-		{"888", 4},
-		{"888", 5},
-		{"888", 6},
-		{"888", 7},
-		{"888", 8},
-		{"888", 9},
-		{"888", 10},
-		{"888", 11},
-		{"888", 12},
-		{"888", 13},
-		{"888", 14},
-		{"888", 15},
-		{"888", 16},
-		{"888", 17},
-		{"888", 18},
-		{"888", 19},
-		{"888", 20},
-		{"888", 21},
-		{"888", 22},
-		{"888", 23},
-		{"888", 24},
-		{"888", 25},
-		{"888", 26},
-		{"8881", 1},
-		{"8881", 2},
-		{"8881", 8},
-		{"8881", 17},
-		{"8881", 18},
-		{"8881", 19},
-		{"8881", 20},
-		{"9528", 1},
-		{"9528", 2},
-		{"9528", 3},
-		{"9528", 4},
-		{"9528", 5},
-		{"9528", 6},
-		{"9528", 7},
-		{"9528", 8},
-		{"9528", 9},
-		{"9528", 10},
-		{"9528", 11},
-		{"9528", 12},
-		{"9528", 13},
-		{"9528", 14},
-		{"9528", 15},
-		{"9528", 17},
-		{"9528", 18},
-		{"9528", 19},
-		{"9528", 20},
-	}
-	if tx.Table("sys_authority_menus").Create(&insert).Error != nil { // 遇到错误时回滚事务
-		tx.Rollback()
-	}
-	return tx.Commit().Error
-}
-
-func InitSysDataAuthorityId() (err error) {
-	tx := global.GVA_DB.Begin() // 开始事务
-	insert := []SysDataAuthorityId{
-		{"888", "888"},
-		{"888", "8881"},
-		{"888", "9528"},
-		{"9528", "8881"},
-		{"9528", "9528"},
-	}
-	if tx.Table("sys_data_authority_ids").Create(&insert).Error != nil { // 遇到错误时回滚事务
-		tx.Rollback()
-	}
-	return tx.Commit().Error
-}
-
-func InitSysDictionaryDetail() (err error) {
-	tx := global.GVA_DB.Begin() // 开始事务
-	insert := model.SysDictionaryDetailData()
-	if tx.Create(&insert).Error != nil { // 遇到错误时回滚事务
-		tx.Rollback()
-	}
-	return tx.Commit().Error
-}
-
-func InitExaFileUploadAndDownload() (err error) {
-	tx := global.GVA_DB.Begin() // 开始事务
-	insert := model.ExaFileUploadAndDownloadData()
-	if tx.Create(&insert).Error != nil { // 遇到错误时回滚事务
-		tx.Rollback()
-	}
-	return tx.Commit().Error
-}

server/service/sys_email.go

+package service
+
+import (
+	"gin-vue-admin/utils"
+)
+
+// @title    EmailTest
+// @description   发送邮件测试
+// @auth                    （2020/09/08  13:58
+// @return    err            error
+
+func EmailTest() (err error) {
+	subject := "test"
+	body := "test"
+	err = utils.EmailTest(subject, body)
+	return err
+}

server/utils/array_to_string.go

-package utils
-
-import (
-	"fmt"
-	"strings"
-)
-
-func ArrayToString(array []interface{}) string {
-	return strings.Replace(strings.Trim(fmt.Sprint(array), "[]"), " ", ",", -1)
-}

server/utils/des.go

-package utils
-
-import (
-	"bytes"
-	"crypto/cipher"
-	"crypto/des"
-)
-
-func padding(src []byte, blocksize int) []byte {
-	n := len(src)
-	padnum := blocksize - n%blocksize
-	pad := bytes.Repeat([]byte{byte(padnum)}, padnum)
-	dst := append(src, pad...)
-	return dst
-}
-
-func unpadding(src []byte) []byte {
-	n := len(src)
-	unpadnum := int(src[n-1])
-	dst := src[:n-unpadnum]
-	return dst
-}
-
-func EncryptDES(src []byte) []byte {
-	key := []byte("qimiao66")
-	block, _ := des.NewCipher(key)
-	src = padding(src, block.BlockSize())
-	blockmode := cipher.NewCBCEncrypter(block, key)
-	blockmode.CryptBlocks(src, src)
-	return src
-}
-
-func DecryptDES(src []byte) []byte {
-	key := []byte("qimiao66")
-	block, _ := des.NewCipher(key)
-	blockmode := cipher.NewCBCDecrypter(block, key)
-	blockmode.CryptBlocks(src, src)
-	src = unpadding(src)
-	return src
-}

web/.env.production

 ENV = 'production'
-VUE_APP_BASE_API = '/v1'
\ No newline at end of file
+VUE_APP_BASE_API = '/api'
\ No newline at end of file

web/babel.config.js

 module.exports = {
   presets: [
-    '@vue/app'
+    '@vue/cli-plugin-babel/preset'
   ]
 }