estel/gva
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Beta:发布v2.7.5测试版本 (#1896)

Browse Source 
* 生产环境时移除console

* 更新第三方库道最新版本，修正导致的兼容问题

* feat: 版本号变更，修复自动化历史的结构体描述

* feat: 放弃element的按需引用，增加自定义表单组件,替换原始的iframe引入模式。

* feat: 放开表单生成器的key输入

* feat: 自动化代码关联属性支持跨数据库关联

* fixed: 修复跨库关联模板

* feat: 允许清空跨数据关联的业务库选项

* feat: 增加用户搜索功能

* feat: 允许单条API同步
---------

Co-authored-by: task <121913992@qq.com>
Co-authored-by: task <ms.yangdan@gmail.com>
This commit is contained in:
PiexlMax(奇淼
2024-09-30 21:27:16 +08:00
committed by GitHub
parent 2086a73557
commit 86cffba4aa
36 changed files with 637 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/service/system/auto_code_plugin.go
View File

@@ -115,7 +115,7 @@ func installation(path string, formPath string, toPath string) error {
func filterFile(paths []string) []string {
np := make([]string, 0, len(paths))
for _, path := range paths {
if ok, _ := skipMacSpecialDocument(path); ok {
if ok, _ := skipMacSpecialDocument(nil, path, ""); ok {
continue
}
np = append(np, path)
@@ -123,7 +123,7 @@ func filterFile(paths []string) []string {
return np
}
func skipMacSpecialDocument(src string) (bool, error) {
func skipMacSpecialDocument(_ os.FileInfo, src, _ string) (bool, error) {
if strings.Contains(src, ".DS_Store") || strings.Contains(src, "__MACOSX") {
return true, nil
}

2
server/service/system/sys_casbin.go
View File

@@ -104,7 +104,7 @@ func (casbinService *CasbinService) UpdateCasbinApi(oldPath string, newPath stri
func (casbinService *CasbinService) GetPolicyPathByAuthorityId(AuthorityID uint) (pathMaps []request.CasbinInfo) {
e := casbinService.Casbin()
authorityId := strconv.Itoa(int(AuthorityID))
list := e.GetFilteredPolicy(0, authorityId)
list, _ := e.GetFilteredPolicy(0, authorityId)
for _, v := range list {
pathMaps = append(pathMaps, request.CasbinInfo{
Path: v[1],

18
server/service/system/sys_user.go
View File

@@ -4,10 +4,10 @@ import (
"errors"
"fmt"
"github.com/flipped-aurora/gin-vue-admin/server/model/common"
systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
"time"
"github.com/flipped-aurora/gin-vue-admin/server/global"
"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
"github.com/flipped-aurora/gin-vue-admin/server/model/system"
"github.com/flipped-aurora/gin-vue-admin/server/utils"
"github.com/gofrs/uuid/v5"
@@ -85,11 +85,25 @@ func (userService *UserService) ChangePassword(u *system.SysUser, newPassword st
//@param: info request.PageInfo
//@return: err error, list interface{}, total int64
func (userService *UserService) GetUserInfoList(info request.PageInfo) (list interface{}, total int64, err error) {
func (userService *UserService) GetUserInfoList(info systemReq.GetUserList) (list interface{}, total int64, err error) {
limit := info.PageSize
offset := info.PageSize * (info.Page - 1)
db := global.GVA_DB.Model(&system.SysUser{})
var userList []system.SysUser
if info.NickName != "" {
db = db.Where("nick_name LIKE ?", "%"+info.NickName+"%")
}
if info.Phone != "" {
db = db.Where("phone LIKE ?", "%"+info.Phone+"%")
}
if info.Username != "" {
db = db.Where("username LIKE ?", "%"+info.Username+"%")
}
if info.Email != "" {
db = db.Where("email LIKE ?", "%"+info.Email+"%")
}
err = db.Count(&total).Error
if err != nil {
return