Merge remote-tracking branch 'origin/main'

Author: piexlmax

README-en.md

@@ -3,11 +3,11 @@
 <img src="http://qmplusimg.henrongyi.top/gvalogo.jpg" width=300" height="300" />
 </div>
 <div align=center>
-<img src="https://img.shields.io/badge/golang-1.14-blue"/>
+<img src="https://img.shields.io/badge/golang-1.16-blue"/>
 <img src="https://img.shields.io/badge/gin-1.7.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.20.7-red"/>
+<img src="https://img.shields.io/badge/vue-3.2.25-brightgreen"/>
+<img src="https://img.shields.io/badge/element--plus-2.0.1-green"/>
+<img src="https://img.shields.io/badge/gorm-1.22.5-red"/>
 </div>
 
 English | [简体中文](./README.md)

README.md

@@ -5,9 +5,9 @@
 <div align=center>
 <img src="https://img.shields.io/badge/golang-1.16-blue"/>
 <img src="https://img.shields.io/badge/gin-1.7.0-lightBlue"/>
-<img src="https://img.shields.io/badge/vue-3.0.0-brightgreen"/>
-<img src="https://img.shields.io/badge/element--plus-1.1.0beta8-green"/>
-<img src="https://img.shields.io/badge/gorm-1.20.7-red"/>
+<img src="https://img.shields.io/badge/vue-3.2.25-brightgreen"/>
+<img src="https://img.shields.io/badge/element--plus-2.0.1-green"/>
+<img src="https://img.shields.io/badge/gorm-1.22.5-red"/>
 </div>
 
 [English](./README-en.md) | 简体中文

server/config.yaml

@@ -84,24 +84,20 @@ pgsql:
   log-mode: ""
   log-zap: false
 
-db-list: [
-  {
-    disabled: true, # 是否启用
-    type: "", # 数据库的类型,目前支持mysql、pgsql
-    alias-name: "", # 数据库的名称,注意: alias-name 需要在db-list中唯一
-    path: '',
-    port: '',
-    config: '',
-    db-name: '',
-    username: '',
-    password: '',
-    max-idle-conns: 10,
-    max-open-conns: 100,
-    log-mode: "",
-    log-zap: false,
-  }
-]
-
+db-list:
+  - disabled: true # 是否启用
+    type: "" # 数据库的类型,目前支持mysql、pgsql
+    alias-name: "" # 数据库的名称,注意: alias-name 需要在db-list中唯一
+    path: ''
+    port: ''
+    config: ''
+    db-name: ''
+    username: ''
+    password: ''
+    max-idle-conns: 10
+    max-open-conns: 100
+    log-mode: ""
+    log-zap: false
 
 
 # local configuration
@@ -179,15 +175,13 @@ excel:
 Timer:
   start: true
   spec: "@daily"  # 定时任务详细配置参考 https://pkg.go.dev/github.com/robfig/cron/v3
-  detail: [
-    # tableName: 需要清理的表名
-    # compareField: 需要比较时间的字段
-    # interval: 时间间隔, 具体配置详看 time.ParseDuration() 中字符串表示 且不能为负数
-    # 2160h = 24 * 30 * 3 -> 三个月
-    { tableName: "sys_operation_records" , compareField: "created_at", interval: "2160h" },
-    { tableName: "jwt_blacklists" , compareField: "created_at", interval: "168h" }
-    #{ tableName: "log2" , compareField: "created_at", interval: "2160h" }
-  ]
+  detail:
+    - tableName: "sys_operation_records"
+      compareField: "created_at"
+      interval: "2160h"
+    - tableName: "jwt_blacklists"
+      compareField: "created_at"
+      interval: "168h"
 
 # 跨域配置
 # 需要配合 server/initialize/router.go#L32 使用

server/middleware/operation.go

@@ -2,9 +2,12 @@ package middleware
 
 import (
 	"bytes"
+	"encoding/json"
 	"io/ioutil"
 	"net/http"
+	"net/url"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/flipped-aurora/gin-vue-admin/server/utils"
@@ -30,6 +33,18 @@ func OperationRecord() gin.HandlerFunc {
 			} else {
 				c.Request.Body = ioutil.NopCloser(bytes.NewBuffer(body))
 			}
+		} else {
+			query := c.Request.URL.RawQuery
+			query, _ = url.QueryUnescape(query)
+			split := strings.Split(query, "&")
+			m := make(map[string]string)
+			for _, v := range split {
+				kv := strings.Split(v, "=")
+				if len(kv) == 2 {
+					m[kv[0]] = kv[1]
+				}
+			}
+			body, _ = json.Marshal(&m)
 		}
 		claims, _ := utils.GetClaims(c)
 		if claims.ID != 0 {

server/model/common/request/common.go

@@ -8,7 +8,7 @@ type PageInfo struct {
 
 // GetById Find by id structure
 type GetById struct {
-	ID float64 `json:"id" form:"id"` // 主键ID
+	ID int `json:"id" form:"id"` // 主键ID
 }
 
 func (r *GetById) Uint() uint {

server/service/system/sys_api.go

@@ -115,7 +115,7 @@ func (apiService *ApiService) GetAllApis() (err error, apis []system.SysApi) {
 //@param: id float64
 //@return: err error, api model.SysApi
 
-func (apiService *ApiService) GetApiById(id float64) (err error, api system.SysApi) {
+func (apiService *ApiService) GetApiById(id int) (err error, api system.SysApi) {
 	err = global.GVA_DB.Where("id = ?", id).First(&api).Error
 	return
 }

server/service/system/sys_authority.go

@@ -57,6 +57,23 @@ func (authorityService *AuthorityService) CopyAuthority(copyInfo response.SysAut
 	if err != nil {
 		return
 	}
+
+	var btns []system.SysAuthorityBtn
+
+	err = global.GVA_DB.Find(&btns, "authority_id = ?", copyInfo.OldAuthorityId).Error
+	if err != nil {
+		return
+	}
+	if len(btns) > 0 {
+		for i := range btns {
+			btns[i].AuthorityId = copyInfo.Authority.AuthorityId
+		}
+		err = global.GVA_DB.Create(&btns).Error
+
+		if err != nil {
+			return
+		}
+	}
 	paths := CasbinServiceApp.GetPolicyPathByAuthorityId(copyInfo.OldAuthorityId)
 	err = CasbinServiceApp.UpdateCasbin(copyInfo.Authority.AuthorityId, paths)
 	if err != nil {
@@ -113,6 +130,7 @@ func (authorityService *AuthorityService) DeleteAuthority(auth *system.SysAuthor
 		}
 	}
 	err = global.GVA_DB.Delete(&[]system.SysUseAuthority{}, "sys_authority_authority_id = ?", auth.AuthorityId).Error
+	err = global.GVA_DB.Delete(&[]system.SysAuthorityBtn{}, "authority_id = ?", auth.AuthorityId).Error
 	CasbinServiceApp.ClearCasbin(0, auth.AuthorityId)
 	return err
 }

server/service/system/sys_base_menu.go

@@ -16,12 +16,14 @@ type BaseMenuService struct{}
 //@param: id float64
 //@return: err error
 
-func (baseMenuService *BaseMenuService) DeleteBaseMenu(id float64) (err error) {
+func (baseMenuService *BaseMenuService) DeleteBaseMenu(id int) (err error) {
 	err = global.GVA_DB.Preload("MenuBtn").Preload("Parameters").Where("parent_id = ?", id).First(&system.SysBaseMenu{}).Error
 	if err != nil {
 		var menu system.SysBaseMenu
 		db := global.GVA_DB.Preload("SysAuthoritys").Where("id = ?", id).First(&menu).Delete(&menu)
 		err = global.GVA_DB.Delete(&system.SysBaseMenuParameter{}, "sys_base_menu_id = ?", id).Error
+		err = global.GVA_DB.Delete(&system.SysBaseMenuBtn{}, "sys_base_menu_id = ?", id).Error
+		err = global.GVA_DB.Delete(&system.SysAuthorityBtn{}, "sys_menu_id = ?", id).Error
 		if err != nil {
 			return err
 		}
@@ -116,7 +118,7 @@ func (baseMenuService *BaseMenuService) UpdateBaseMenu(menu system.SysBaseMenu)
 //@param: id float64
 //@return: err error, menu model.SysBaseMenu
 
-func (baseMenuService *BaseMenuService) GetBaseMenuById(id float64) (err error, menu system.SysBaseMenu) {
+func (baseMenuService *BaseMenuService) GetBaseMenuById(id int) (err error, menu system.SysBaseMenu) {
 	err = global.GVA_DB.Preload("MenuBtn").Preload("Parameters").Where("id = ?", id).First(&menu).Error
 	return
 }

server/service/system/sys_user.go

@@ -140,7 +140,7 @@ func (userService *UserService) SetUserAuthorities(id uint, authorityIds []strin
 //@param: id float64
 //@return: err error
 
-func (userService *UserService) DeleteUser(id float64) (err error) {
+func (userService *UserService) DeleteUser(id int) (err error) {
 	var user system.SysUser
 	err = global.GVA_DB.Where("id = ?", id).Delete(&user).Error
 	if err != nil {

web/package.json

@@ -45,7 +45,7 @@
         "eslint-plugin-vue": "^7.0.0",
         "sass": "^1.26.5",
         "sass-loader": "^8.0.2",
-        "vite": "2.5.10",
+        "vite": "^2.8.0",
         "vite-plugin-banner": "^0.1.3",
         "vite-plugin-importer": "^0.2.5"
     }