Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions server/api/v1/system/sys_user.go
Original file line number Diff line number Diff line change
Expand Up @@ -200,11 +200,11 @@ func (b *BaseApi) ChangePassword(c *gin.Context) {
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body request.PageInfo true "页码, 每页大小"
// @Param data body systemReq.GetUserList true "页码, 每页大小"
// @Success 200 {object} response.Response{data=response.PageResult,msg=string} "分页获取用户列表,返回包括列表,总数,页码,每页数量"
// @Router /user/getUserList [post]
func (b *BaseApi) GetUserList(c *gin.Context) {
var pageInfo request.PageInfo
var pageInfo systemReq.GetUserList
err := c.ShouldBindJSON(&pageInfo)
if err != nil {
response.FailWithMessage(err.Error(), c)
Expand Down
3 changes: 1 addition & 2 deletions server/core/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ func RunWindowsServer() {
}

Router := initialize.Routers()
Router.Static("/form-generator", "./resource/page")

address := fmt.Sprintf(":%d", global.GVA_CONFIG.System.Addr)
s := initServer(address, Router)
Expand All @@ -41,7 +40,7 @@ func RunWindowsServer() {

fmt.Printf(`
%s gin-vue-admin
%s:v2.7.4
%s:v2.7.5
加群方式:微信号:shouzi_1994 QQ群:470239250
项目地址:https://github.com/flipped-aurora/gin-vue-admin
插件市场:https://plugin.gin-vue-admin.com
Expand Down
2 changes: 1 addition & 1 deletion server/docs/docs.go
Original file line number Diff line number Diff line change
Expand Up @@ -8087,7 +8087,7 @@ const docTemplate = `{

// SwaggerInfo holds exported Swagger Info so clients can modify it
var SwaggerInfo = &swag.Spec{
Version: "v2.7.4",
Version: "v2.7.5",
Host: "",
BasePath: "",
Schemes: []string{},
Expand Down
2 changes: 1 addition & 1 deletion server/docs/swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "使用gin+vue进行极速开发的全栈开发基础平台",
"title": "Gin-Vue-Admin Swagger API接口文档",
"contact": {},
"version": "v2.7.4"
"version": "v2.7.5"
},
"paths": {
"/api/createApi": {
Expand Down
2 changes: 1 addition & 1 deletion server/docs/swagger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1634,7 +1634,7 @@ info:
contact: {}
description: 使用gin+vue进行极速开发的全栈开发基础平台
title: Gin-Vue-Admin Swagger API接口文档
version: v2.7.4
version: v2.7.5
paths:
/api/createApi:
post:
Expand Down
7 changes: 3 additions & 4 deletions server/main.go
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package main

import (
_ "go.uber.org/automaxprocs"
"go.uber.org/zap"

"github.com/flipped-aurora/gin-vue-admin/server/core"
"github.com/flipped-aurora/gin-vue-admin/server/global"
"github.com/flipped-aurora/gin-vue-admin/server/initialize"
_ "go.uber.org/automaxprocs"
"go.uber.org/zap"
"github.com/flipped-aurora/gin-vue-admin/server/utils/translate"
)

Expand All @@ -16,7 +15,7 @@ import (
//go:generate go mod download

// @title Gin-Vue-Admin Swagger API接口文档
// @version v2.7.4
// @version v2.7.5
// @description 使用gin+vue进行极速开发的全栈开发基础平台
// @securityDefinitions.apikey ApiKeyAuth
// @in header
Expand Down
1 change: 1 addition & 0 deletions server/model/system/request/sys_auto_code.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ type AutoCode struct {
}

type DataSource struct {
DBName string `json:"dbName"`
Table string `json:"table"`
Label string `json:"label"`
Value string `json:"value"`
Expand Down
9 changes: 9 additions & 0 deletions server/model/system/request/sys_user.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package request

import (
common "github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
"github.com/flipped-aurora/gin-vue-admin/server/model/system"
)

Expand Down Expand Up @@ -54,3 +55,11 @@ type ChangeUserInfo struct {
Enable int `json:"enable" gorm:"comment:冻结用户"` //冻结用户
Authorities []system.SysAuthority `json:"-" gorm:"many2many:sys_user_authority;"`
}

type GetUserList struct {
common.PageInfo
Username string `json:"username" form:"username"`
NickName string `json:"nickName" form:"nickName"`
Phone string `json:"phone" form:"phone"`
Email string `json:"email" form:"email"`
}
Loading
Loading