dugulp
/
goweb-gin-demo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

过滤删除的用户信息

master
ymm 2022-02-14 22:42:40 +08:00
parent ef775d84e9
commit 3af73b9dbc
20 changed files with 248 additions and 318 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -15,4 +15,4 @@
# vendor/
.idea
.DS_Store
node_modules/

8
server/api/system/sys_authority.go
View File

@ -21,7 +21,7 @@ type AuthorityApi struct {
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body web.SysAuthority true "权限id, 权限名, 父角色id"
// @Param data body system.SysAuthority true "权限id, 权限名, 父角色id"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"创建成功"}"
// @Router /authority/createAuthority [post]
func (a *AuthorityApi) CreateAuthority(c *gin.Context) {
@ -73,7 +73,7 @@ func (a *AuthorityApi) CopyAuthority(c *gin.Context) {
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body web.SysAuthority true "删除角色"
// @Param data body system.SysAuthority true "删除角色"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
// @Router /authority/deleteAuthority [post]
func (a *AuthorityApi) DeleteAuthority(c *gin.Context) {
@ -96,7 +96,7 @@ func (a *AuthorityApi) DeleteAuthority(c *gin.Context) {
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body web.SysAuthority true "权限id, 权限名, 父角色id"
// @Param data body system.SysAuthority true "权限id, 权限名, 父角色id"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"更新成功"}"
// @Router /authority/updateAuthority [post]
func (a *AuthorityApi) UpdateAuthority(c *gin.Context) {
@ -147,7 +147,7 @@ func (a *AuthorityApi) GetAuthorityList(c *gin.Context) {
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body web.SysAuthority true "设置角色资源权限"
// @Param data body system.SysAuthority true "设置角色资源权限"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"设置成功"}"
// @Router /authority/setDataAuthority [post]
func (a *AuthorityApi) SetDataAuthority(c *gin.Context) {

2
server/api/system/sys_file_upload_download.go
View File

@ -73,7 +73,7 @@ func (u *FileUploadAndDownloadApi) DownloadFile(c *gin.Context) {
// @Summary 删除文件
// @Security ApiKeyAuth
// @Produce application/json
// @Param data body web.FileUploadAndDownload true "传入文件里面id即可"
// @Param data body system.FileUploadAndDownload true "传入文件里面id即可"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
// @Router /fileUploadAndDownload/deleteFile [post]
func (u *FileUploadAndDownloadApi) DeleteFile(c *gin.Context) {

4
server/api/system/sys_menu.go
View File

@ -102,7 +102,7 @@ func (a *AuthorityMenuApi) GetMenuAuthority(c *gin.Context) {
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body web.SysBaseMenu true "路由path, 父菜单ID, 路由name, 对应前端文件路径, 排序标记"
// @Param data body system.SysBaseMenu true "路由path, 父菜单ID, 路由name, 对应前端文件路径, 排序标记"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"添加成功"}"
// @Router /menu/addBaseMenu [post]
func (a *AuthorityMenuApi) AddBaseMenu(c *gin.Context) {
@ -153,7 +153,7 @@ func (a *AuthorityMenuApi) DeleteBaseMenu(c *gin.Context) {
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body web.SysBaseMenu true "路由path, 父菜单ID, 路由name, 对应前端文件路径, 排序标记"
// @Param data body system.SysBaseMenu true "路由path, 父菜单ID, 路由name, 对应前端文件路径, 排序标记"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"更新成功"}"
// @Router /menu/updateBaseMenu [post]
func (a *AuthorityMenuApi) UpdateBaseMenu(c *gin.Context) {

2
server/api/system/sys_system.go
View File

@ -33,7 +33,7 @@ func (s *SystemApi) GetSystemConfig(c *gin.Context) {
// @Summary 设置配置文件内容
// @Security ApiKeyAuth
// @Produce application/json
// @Param data body web.System true "设置配置文件内容"
// @Param data body system.System true "设置配置文件内容"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"设置成功"}"
// @Router /system/setSystemConfig [post]
func (s *SystemApi) SetSystemConfig(c *gin.Context) {

176
server/docs/docs.go
View File

@ -2,16 +2,9 @@
// This file was generated by swaggo/swag
package docs
import (
"bytes"
"encoding/json"
"strings"
"text/template"
import "github.com/swaggo/swag"
"github.com/swaggo/swag"
)
var doc = `{
const docTemplate_swagger = `{
"schemes": {{ marshal .Schemes }},
"swagger": "2.0",
"info": {
@ -85,7 +78,7 @@ var doc = `{
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/web.SysAuthority"
"$ref": "#/definitions/system.SysAuthority"
}
}
],
@ -123,7 +116,7 @@ var doc = `{
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/web.SysAuthority"
"$ref": "#/definitions/system.SysAuthority"
}
}
],
@ -199,7 +192,7 @@ var doc = `{
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/web.SysAuthority"
"$ref": "#/definitions/system.SysAuthority"
}
}
],
@ -237,7 +230,7 @@ var doc = `{
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/web.SysAuthority"
"$ref": "#/definitions/system.SysAuthority"
}
}
],
@ -401,7 +394,7 @@ var doc = `{
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/web.FileUploadAndDownload"
"$ref": "#/definitions/system.FileUploadAndDownload"
}
}
],
@ -648,7 +641,7 @@ var doc = `{
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/web.SysBaseMenu"
"$ref": "#/definitions/system.SysBaseMenu"
}
}
],
@ -946,7 +939,7 @@ var doc = `{
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/web.SysBaseMenu"
"$ref": "#/definitions/system.SysBaseMenu"
}
}
],
@ -1053,7 +1046,7 @@ var doc = `{
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/web.System"
"$ref": "#/definitions/system.System"
}
}
],
@ -1483,12 +1476,6 @@ var doc = `{
"name": "comment",
"in": "query"
},
{
"type": "string",
"description": "创建时间",
"name": "createdAt",
"in": "query"
},
{
"type": "integer",
"description": "主键ID",
@ -1512,12 +1499,6 @@ var doc = `{
"name": "reportId",
"in": "query"
},
{
"type": "string",
"description": "更新时间",
"name": "updatedAt",
"in": "query"
},
{
"type": "string",
"name": "userName",
@ -1999,12 +1980,6 @@ var doc = `{
],
"summary": "分页获取统计规则列表",
"parameters": [
{
"type": "string",
"description": "创建时间",
"name": "createdAt",
"in": "query"
},
{
"type": "integer",
"name": "endHour",
@ -2048,12 +2023,6 @@ var doc = `{
"name": "startWeek",
"in": "query"
},
{
"type": "string",
"description": "更新时间",
"name": "updatedAt",
"in": "query"
},
{
"type": "integer",
"name": "userId",
@ -2247,12 +2216,6 @@ var doc = `{
"name": "contents",
"in": "query"
},
{
"type": "string",
"description": "创建时间",
"name": "createdAt",
"in": "query"
},
{
"type": "string",
"name": "header",
@ -2286,12 +2249,6 @@ var doc = `{
"name": "sendTo",
"in": "query"
},
{
"type": "string",
"description": "更新时间",
"name": "updatedAt",
"in": "query"
},
{
"type": "integer",
"name": "userId",
@ -2745,6 +2702,14 @@ var doc = `{
}
}
},
"global.FormatTime": {
"type": "object",
"properties": {
"time.Time": {
"type": "string"
}
}
},
"request.AddMenuAuthorityInfo": {
"type": "object",
"properties": {
@ -2755,7 +2720,7 @@ var doc = `{
"menus": {
"type": "array",
"items": {
"$ref": "#/definitions/web.SysBaseMenu"
"$ref": "#/definitions/system.SysBaseMenu"
}
}
}
@ -3011,7 +2976,7 @@ var doc = `{
"type": "object",
"properties": {
"authority": {
"$ref": "#/definitions/web.SysAuthority"
"$ref": "#/definitions/system.SysAuthority"
},
"oldAuthorityId": {
"description": "旧角色ID",
@ -3019,12 +2984,12 @@ var doc = `{
}
}
},
"web.FileUploadAndDownload": {
"system.FileUploadAndDownload": {
"type": "object",
"properties": {
"createdAt": {
"description": "创建时间",
"type": "string"
"$ref": "#/definitions/global.FormatTime"
},
"id": {
"description": "主键ID",
@ -3044,7 +3009,7 @@ var doc = `{
},
"updatedAt": {
"description": "更新时间",
"type": "string"
"$ref": "#/definitions/global.FormatTime"
},
"url": {
"description": "文件地址",
@ -3052,7 +3017,7 @@ var doc = `{
}
}
},
"web.SysAuthority": {
"system.SysAuthority": {
"type": "object",
"properties": {
"authorityId": {
@ -3066,7 +3031,7 @@ var doc = `{
"children": {
"type": "array",
"items": {
"$ref": "#/definitions/web.SysAuthority"
"$ref": "#/definitions/system.SysAuthority"
}
},
"createdAt": {
@ -3076,7 +3041,7 @@ var doc = `{
"dataAuthorityId": {
"type": "array",
"items": {
"$ref": "#/definitions/web.SysAuthority"
"$ref": "#/definitions/system.SysAuthority"
}
},
"defaultRouter": {
@ -3089,7 +3054,7 @@ var doc = `{
"menus": {
"type": "array",
"items": {
"$ref": "#/definitions/web.SysBaseMenu"
"$ref": "#/definitions/system.SysBaseMenu"
}
},
"parentId": {
@ -3102,19 +3067,19 @@ var doc = `{
}
}
},
"web.SysBaseMenu": {
"system.SysBaseMenu": {
"type": "object",
"properties": {
"authoritys": {
"type": "array",
"items": {
"$ref": "#/definitions/web.SysAuthority"
"$ref": "#/definitions/system.SysAuthority"
}
},
"children": {
"type": "array",
"items": {
"$ref": "#/definitions/web.SysBaseMenu"
"$ref": "#/definitions/system.SysBaseMenu"
}
},
"closeTab": {
@ -3127,7 +3092,7 @@ var doc = `{
},
"createdAt": {
"description": "创建时间",
"type": "string"
"$ref": "#/definitions/global.FormatTime"
},
"defaultMenu": {
"description": "是否是基础路由（开发中）",
@ -3156,7 +3121,7 @@ var doc = `{
"parameters": {
"type": "array",
"items": {
"$ref": "#/definitions/web.SysBaseMenuParameter"
"$ref": "#/definitions/system.SysBaseMenuParameter"
}
},
"parentId": {
@ -3177,16 +3142,16 @@ var doc = `{
},
"updatedAt": {
"description": "更新时间",
"type": "string"
"$ref": "#/definitions/global.FormatTime"
}
}
},
"web.SysBaseMenuParameter": {
"system.SysBaseMenuParameter": {
"type": "object",
"properties": {
"createdAt": {
"description": "创建时间",
"type": "string"
"$ref": "#/definitions/global.FormatTime"
},
"id": {
"description": "主键ID",
@ -3205,7 +3170,7 @@ var doc = `{
},
"updatedAt": {
"description": "更新时间",
"type": "string"
"$ref": "#/definitions/global.FormatTime"
},
"value": {
"description": "地址栏携带参数的值",
@ -3213,7 +3178,7 @@ var doc = `{
}
}
},
"web.System": {
"system.System": {
"type": "object",
"properties": {
"config": {
@ -3251,7 +3216,7 @@ var doc = `{
},
"createdAt": {
"description": "创建时间",
"type": "string"
"$ref": "#/definitions/global.FormatTime"
},
"id": {
"description": "主键ID",
@ -3262,66 +3227,35 @@ var doc = `{
},
"updatedAt": {
"description": "更新时间",
"type": "string"
"$ref": "#/definitions/global.FormatTime"
},
"userName": {
"type": "string"
}
}
}
},
"securityDefinitions": {
"ApiKeyAuth": {
"type": "apiKey",
"name": "x-token",
"in": "header"
}
}
}`
type swaggerInfo struct {
Version string
Host string
BasePath string
Schemes []string
Title string
Description string
}
// SwaggerInfo holds exported Swagger Info so clients can modify it
var SwaggerInfo = swaggerInfo{
Version: "",
// SwaggerInfo_swagger holds exported Swagger Info so clients can modify it
var SwaggerInfo_swagger = &swag.Spec{
Version: "0.0.1",
Host: "",
BasePath: "",
BasePath: "/",
Schemes: []string{},
Title: "",
Description: "",
}
type s struct{}
func (s *s) ReadDoc() string {
sInfo := SwaggerInfo
sInfo.Description = strings.Replace(sInfo.Description, "\n", "\\n", -1)
t, err := template.New("swagger_info").Funcs(template.FuncMap{
"marshal": func(v interface{}) string {
a, _ := json.Marshal(v)
return string(a)
},
"escape": func(v interface{}) string {
// escape tabs
str := strings.Replace(v.(string), "\t", "\\t", -1)
// replace " with \", and if that results in \\", replace that with \\\"
str = strings.Replace(str, "\"", "\\\"", -1)
return strings.Replace(str, "\\\\\"", "\\\\\\\"", -1)
},
}).Parse(doc)
if err != nil {
return doc
}
var tpl bytes.Buffer
if err := t.Execute(&tpl, sInfo); err != nil {
return doc
}
return tpl.String()
Title: "Swagger Example API",
Description: "This is a sample Server pets",
InfoInstanceName: "swagger",
SwaggerTemplate: docTemplate_swagger,
}
func init() {
swag.Register("swagger", &s{})
swag.Register(SwaggerInfo_swagger.InstanceName(), SwaggerInfo_swagger)
}

115
server/docs/swagger.json
View File

@ -1,8 +1,12 @@
{
"swagger": "2.0",
"info": {
"contact": {}
"description": "This is a sample Server pets",
"title": "Swagger Example API",
"contact": {},
"version": "0.0.1"
},
"basePath": "/",
"paths": {
"/authority/copyAuthority": {
"post": {
@ -66,7 +70,7 @@
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/web.SysAuthority"
"$ref": "#/definitions/system.SysAuthority"
}
}
],
@ -104,7 +108,7 @@
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/web.SysAuthority"
"$ref": "#/definitions/system.SysAuthority"
}
}
],
@ -180,7 +184,7 @@
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/web.SysAuthority"
"$ref": "#/definitions/system.SysAuthority"
}
}
],
@ -218,7 +222,7 @@
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/web.SysAuthority"
"$ref": "#/definitions/system.SysAuthority"
}
}
],
@ -382,7 +386,7 @@
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/web.FileUploadAndDownload"
"$ref": "#/definitions/system.FileUploadAndDownload"
}
}
],
@ -629,7 +633,7 @@
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/web.SysBaseMenu"
"$ref": "#/definitions/system.SysBaseMenu"
}
}
],
@ -927,7 +931,7 @@
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/web.SysBaseMenu"
"$ref": "#/definitions/system.SysBaseMenu"
}
}
],
@ -1034,7 +1038,7 @@
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/web.System"
"$ref": "#/definitions/system.System"
}
}
],
@ -1464,12 +1468,6 @@
"name": "comment",
"in": "query"
},
{
"type": "string",
"description": "创建时间",
"name": "createdAt",
"in": "query"
},
{
"type": "integer",
"description": "主键ID",
@ -1493,12 +1491,6 @@
"name": "reportId",
"in": "query"
},
{
"type": "string",
"description": "更新时间",
"name": "updatedAt",
"in": "query"
},
{
"type": "string",
"name": "userName",
@ -1980,12 +1972,6 @@
],
"summary": "分页获取统计规则列表",
"parameters": [
{
"type": "string",
"description": "创建时间",
"name": "createdAt",
"in": "query"
},
{
"type": "integer",
"name": "endHour",
@ -2029,12 +2015,6 @@
"name": "startWeek",
"in": "query"
},
{
"type": "string",
"description": "更新时间",
"name": "updatedAt",
"in": "query"
},
{
"type": "integer",
"name": "userId",
@ -2228,12 +2208,6 @@
"name": "contents",
"in": "query"
},
{
"type": "string",
"description": "创建时间",
"name": "createdAt",
"in": "query"
},
{
"type": "string",
"name": "header",
@ -2267,12 +2241,6 @@
"name": "sendTo",
"in": "query"
},
{
"type": "string",
"description": "更新时间",
"name": "updatedAt",
"in": "query"
},
{
"type": "integer",
"name": "userId",
@ -2726,6 +2694,14 @@
}
}
},
"global.FormatTime": {
"type": "object",
"properties": {
"time.Time": {
"type": "string"
}
}
},
"request.AddMenuAuthorityInfo": {
"type": "object",
"properties": {
@ -2736,7 +2712,7 @@
"menus": {
"type": "array",
"items": {
"$ref": "#/definitions/web.SysBaseMenu"
"$ref": "#/definitions/system.SysBaseMenu"
}
}
}
@ -2992,7 +2968,7 @@
"type": "object",
"properties": {
"authority": {
"$ref": "#/definitions/web.SysAuthority"
"$ref": "#/definitions/system.SysAuthority"
},
"oldAuthorityId": {
"description": "旧角色ID",
@ -3000,12 +2976,12 @@
}
}
},
"web.FileUploadAndDownload": {
"system.FileUploadAndDownload": {
"type": "object",
"properties": {
"createdAt": {
"description": "创建时间",
"type": "string"
"$ref": "#/definitions/global.FormatTime"
},
"id": {
"description": "主键ID",
@ -3025,7 +3001,7 @@
},
"updatedAt": {
"description": "更新时间",
"type": "string"
"$ref": "#/definitions/global.FormatTime"
},
"url": {
"description": "文件地址",
@ -3033,7 +3009,7 @@
}
}
},
"web.SysAuthority": {
"system.SysAuthority": {
"type": "object",
"properties": {
"authorityId": {
@ -3047,7 +3023,7 @@
"children": {
"type": "array",
"items": {
"$ref": "#/definitions/web.SysAuthority"
"$ref": "#/definitions/system.SysAuthority"
}
},
"createdAt": {
@ -3057,7 +3033,7 @@
"dataAuthorityId": {
"type": "array",
"items": {
"$ref": "#/definitions/web.SysAuthority"
"$ref": "#/definitions/system.SysAuthority"
}
},
"defaultRouter": {
@ -3070,7 +3046,7 @@
"menus": {
"type": "array",
"items": {
"$ref": "#/definitions/web.SysBaseMenu"
"$ref": "#/definitions/system.SysBaseMenu"
}
},
"parentId": {
@ -3083,19 +3059,19 @@
}
}
},
"web.SysBaseMenu": {
"system.SysBaseMenu": {
"type": "object",
"properties": {
"authoritys": {
"type": "array",
"items": {
"$ref": "#/definitions/web.SysAuthority"
"$ref": "#/definitions/system.SysAuthority"
}
},
"children": {
"type": "array",
"items": {
"$ref": "#/definitions/web.SysBaseMenu"
"$ref": "#/definitions/system.SysBaseMenu"
}
},
"closeTab": {
@ -3108,7 +3084,7 @@
},
"createdAt": {
"description": "创建时间",
"type": "string"
"$ref": "#/definitions/global.FormatTime"
},
"defaultMenu": {
"description": "是否是基础路由（开发中）",
@ -3137,7 +3113,7 @@
"parameters": {
"type": "array",
"items": {
"$ref": "#/definitions/web.SysBaseMenuParameter"
"$ref": "#/definitions/system.SysBaseMenuParameter"
}
},
"parentId": {
@ -3158,16 +3134,16 @@
},
"updatedAt": {
"description": "更新时间",
"type": "string"
"$ref": "#/definitions/global.FormatTime"
}
}
},
"web.SysBaseMenuParameter": {
"system.SysBaseMenuParameter": {
"type": "object",
"properties": {
"createdAt": {
"description": "创建时间",
"type": "string"
"$ref": "#/definitions/global.FormatTime"
},
"id": {
"description": "主键ID",
@ -3186,7 +3162,7 @@
},
"updatedAt": {
"description": "更新时间",
"type": "string"
"$ref": "#/definitions/global.FormatTime"
},
"value": {
"description": "地址栏携带参数的值",
@ -3194,7 +3170,7 @@
}
}
},
"web.System": {
"system.System": {
"type": "object",
"properties": {
"config": {
@ -3232,7 +3208,7 @@
},
"createdAt": {
"description": "创建时间",
"type": "string"
"$ref": "#/definitions/global.FormatTime"
},
"id": {
"description": "主键ID",
@ -3243,12 +3219,19 @@
},
"updatedAt": {
"description": "更新时间",
"type": "string"
"$ref": "#/definitions/global.FormatTime"
},
"userName": {
"type": "string"
}
}
}
},
"securityDefinitions": {
"ApiKeyAuth": {
"type": "apiKey",
"name": "x-token",
"in": "header"
}
}
}

96
server/docs/swagger.yaml
View File

@ -1,3 +1,4 @@
basePath: /
definitions:
common.UserInfo:
properties:
@ -273,6 +274,11 @@ definitions:
description: 栈名
type: string
type: object
global.FormatTime:
properties:
time.Time:
type: string
type: object
request.AddMenuAuthorityInfo:
properties:
authorityId:
@ -280,7 +286,7 @@ definitions:
type: string
menus:
items:
$ref: '#/definitions/web.SysBaseMenu'
$ref: '#/definitions/system.SysBaseMenu'
type: array
type: object
request.ChangePasswordStruct:
@ -452,16 +458,16 @@ definitions:
response.SysAuthorityCopyResponse:
properties:
authority:
$ref: '#/definitions/web.SysAuthority'
$ref: '#/definitions/system.SysAuthority'
oldAuthorityId:
description: 旧角色ID
type: string
type: object
web.FileUploadAndDownload:
system.FileUploadAndDownload:
properties:
createdAt:
$ref: '#/definitions/global.FormatTime'
description: 创建时间
type: string
id:
description: 主键ID
type: integer
@ -475,13 +481,13 @@ definitions:
description: 文件标签
type: string
updatedAt:
$ref: '#/definitions/global.FormatTime'
description: 更新时间
type: string
url:
description: 文件地址
type: string
type: object
web.SysAuthority:
system.SysAuthority:
properties:
authorityId:
description: 角色ID
@ -491,14 +497,14 @@ definitions:
type: string
children:
items:
$ref: '#/definitions/web.SysAuthority'
$ref: '#/definitions/system.SysAuthority'
type: array
createdAt:
description: 创建时间
type: string
dataAuthorityId:
items:
$ref: '#/definitions/web.SysAuthority'
$ref: '#/definitions/system.SysAuthority'
type: array
defaultRouter:
description: 默认菜单(默认dashboard)
@ -507,7 +513,7 @@ definitions:
type: string
menus:
items:
$ref: '#/definitions/web.SysBaseMenu'
$ref: '#/definitions/system.SysBaseMenu'
type: array
parentId:
description: 父角色ID
@ -516,15 +522,15 @@ definitions:
description: 更新时间
type: string
type: object
web.SysBaseMenu:
system.SysBaseMenu:
properties:
authoritys:
items:
$ref: '#/definitions/web.SysAuthority'
$ref: '#/definitions/system.SysAuthority'
type: array
children:
items:
$ref: '#/definitions/web.SysBaseMenu'
$ref: '#/definitions/system.SysBaseMenu'
type: array
closeTab:
description: 自动关闭tab
@ -533,8 +539,8 @@ definitions:
description: 对应前端文件路径
type: string
createdAt:
$ref: '#/definitions/global.FormatTime'
description: 创建时间
type: string
defaultMenu:
description: 是否是基础路由（开发中）
type: boolean
@ -555,7 +561,7 @@ definitions:
type: string
parameters:
items:
$ref: '#/definitions/web.SysBaseMenuParameter'
$ref: '#/definitions/system.SysBaseMenuParameter'
type: array
parentId:
description: 父菜单ID
@ -570,14 +576,14 @@ definitions:
description: 菜单名
type: string
updatedAt:
$ref: '#/definitions/global.FormatTime'
description: 更新时间
type: string
type: object
web.SysBaseMenuParameter:
system.SysBaseMenuParameter:
properties:
createdAt:
$ref: '#/definitions/global.FormatTime'
description: 创建时间
type: string
id:
description: 主键ID
type: integer
@ -590,13 +596,13 @@ definitions:
description: 地址栏携带参数为params还是query
type: string
updatedAt:
$ref: '#/definitions/global.FormatTime'
description: 更新时间
type: string
value:
description: 地址栏携带参数的值
type: string
type: object
web.System:
system.System:
properties:
config:
$ref: '#/definitions/config.Server'
@ -620,21 +626,24 @@ definitions:
comment:
type: string
createdAt:
$ref: '#/definitions/global.FormatTime'
description: 创建时间
type: string
id:
description: 主键ID
type: integer
reportId:
type: integer
updatedAt:
$ref: '#/definitions/global.FormatTime'
description: 更新时间
type: string
userName:
type: string
type: object
info:
contact: {}
description: This is a sample Server pets
title: Swagger Example API
version: 0.0.1
paths:
/authority/copyAuthority:
post:
@ -669,7 +678,7 @@ paths:
name: data
required: true
schema:
$ref: '#/definitions/web.SysAuthority'
$ref: '#/definitions/system.SysAuthority'
produces:
- application/json
responses:
@ -692,7 +701,7 @@ paths:
name: data
required: true
schema:
$ref: '#/definitions/web.SysAuthority'
$ref: '#/definitions/system.SysAuthority'
produces:
- application/json
responses:
@ -738,7 +747,7 @@ paths:
name: data
required: true
schema:
$ref: '#/definitions/web.SysAuthority'
$ref: '#/definitions/system.SysAuthority'
produces:
- application/json
responses:
@ -761,7 +770,7 @@ paths:
name: data
required: true
schema:
$ref: '#/definitions/web.SysAuthority'
$ref: '#/definitions/system.SysAuthority'
produces:
- application/json
responses:
@ -861,7 +870,7 @@ paths:
name: data
required: true
schema:
$ref: '#/definitions/web.FileUploadAndDownload'
$ref: '#/definitions/system.FileUploadAndDownload'
produces:
- application/json
responses:
@ -1011,7 +1020,7 @@ paths:
name: data
required: true
schema:
$ref: '#/definitions/web.SysBaseMenu'
$ref: '#/definitions/system.SysBaseMenu'
produces:
- application/json
responses:
@ -1191,7 +1200,7 @@ paths:
name: data
required: true
schema:
$ref: '#/definitions/web.SysBaseMenu'
$ref: '#/definitions/system.SysBaseMenu'
produces:
- application/json
responses:
@ -1254,7 +1263,7 @@ paths:
name: data
required: true
schema:
$ref: '#/definitions/web.System'
$ref: '#/definitions/system.System'
produces:
- application/json
responses:
@ -1513,10 +1522,6 @@ paths:
- in: query
name: comment
type: string
- description: 创建时间
in: query
name: createdAt
type: string
- description: 主键ID
in: query
name: id
@ -1532,10 +1537,6 @@ paths:
- in: query
name: reportId
type: integer
- description: 更新时间
in: query
name: updatedAt
type: string
- in: query
name: userName
type: string
@ -1826,10 +1827,6 @@ paths:
consumes:
- application/json
parameters:
- description: 创建时间
in: query
name: createdAt
type: string
- in: query
name: endHour
type: integer
@ -1857,10 +1854,6 @@ paths:
- in: query
name: startWeek
type: integer
- description: 更新时间
in: query
name: updatedAt
type: string
- in: query
name: userId
type: integer
@ -1977,10 +1970,6 @@ paths:
- in: query
name: contents
type: string
- description: 创建时间
in: query
name: createdAt
type: string
- in: query
name: header
type: string
@ -2002,10 +1991,6 @@ paths:
- in: query
name: sendTo
type: string
- description: 更新时间
in: query
name: updatedAt
type: string
- in: query
name: userId
type: integer
@ -2047,4 +2032,9 @@ paths:
summary: 更新周报模板
tags:
- WtTemplate
securityDefinitions:
ApiKeyAuth:
in: header
name: x-token
type: apiKey
swagger: "2.0"

2
server/go.mod
View File

@ -28,7 +28,7 @@ require (
github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect
github.com/stretchr/testify v1.7.0
github.com/swaggo/gin-swagger v1.3.2
github.com/swaggo/swag v1.7.4
github.com/swaggo/swag v1.7.9
github.com/tencentyun/cos-go-sdk-v5 v0.7.31
github.com/xuri/excelize/v2 v2.4.1
go.uber.org/zap v1.16.0

18
server/go.sum
View File

@ -28,6 +28,7 @@ github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mo
github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d h1:G0m3OIz70MZUWq3EgK3CesDbo8upS2Vm9/P3FtgI+Jk=
github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
github.com/agiledragon/gomonkey/v2 v2.3.1/go.mod h1:ap1AmDzcVOAz1YpeJ3TCzIgstoaWLA6jbbgxfB4w2iY=
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
github.com/aliyun/aliyun-oss-go-sdk v2.1.10+incompatible h1:D3gwOr9qUUmyyBRDbpnATqu+EkqqmigFd3Od6xO1QUU=
@ -88,13 +89,16 @@ github.com/fvbock/endless v0.0.0-20170109170031-447134032cb6/go.mod h1:YxOVT5+yH
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/gin-contrib/gzip v0.0.1 h1:ezvKOL6jH+jlzdHNE4h9h8q8uMpDQjyl0NN0Jd7jozc=
github.com/gin-contrib/gzip v0.0.1/go.mod h1:fGBJBCdt6qCZuCAOwWuFhBB4OOq9EFqlo5dEaFhhu5w=
github.com/gin-contrib/gzip v0.0.3/go.mod h1:YxxswVZIqOvcHEQpsSn+QF5guQtO1dCfy0shBPy4jFc=
github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s=
github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
github.com/gin-gonic/gin v1.3.0/go.mod h1:7cKuhb5qV2ggCFctp2fJQ+ErvciLZrIeoOSOm6mUr7Y=
github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
github.com/gin-gonic/gin v1.7.0/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY=
github.com/gin-gonic/gin v1.7.4 h1:QmUZXrvJ9qZ3GfWvQ+2wnW/1ePrTEJqPKMYEU3lD/DM=
github.com/gin-gonic/gin v1.7.4/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY=
github.com/gin-gonic/gin v1.7.7/go.mod h1:axIBovoeJpVj8S3BwE0uPMTeReE4+AfFtqpqaZ1qq1U=
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
@ -125,6 +129,7 @@ github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8c
github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE=
github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
github.com/go-redis/redis/v8 v8.11.0 h1:O1Td0mQ8UFChQ3N9zFQqo6kTU2cJ+/it88gDB+zg0wo=
@ -365,6 +370,11 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
github.com/onsi/gomega v1.10.5 h1:7n6FEkpFmfCoo2t+YYqXH0evK+a9ICQz0xcAy9dYcaQ=
github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48=
github.com/otiai10/copy v1.7.0/go.mod h1:rmRl6QPdJj6EiUqXQ/4Nn2lLXoNQjFCQbbNrxgc/t3U=
github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE=
github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs=
github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo=
github.com/otiai10/mint v1.3.3/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc=
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
@ -446,11 +456,16 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
github.com/swaggo/files v0.0.0-20190704085106-630677cd5c14/go.mod h1:gxQT6pBGRuIGunNf/+tSOB5OHvguWi8Tbt82WOkf35E=
github.com/swaggo/files v0.0.0-20210815190702-a29dd2bc99b2/go.mod h1:lKJPbtWzJ9JhsTN1k1gZgleJWY/cqq0psdoMmaThG3w=
github.com/swaggo/gin-swagger v1.3.2 h1:v4x39WgGCpJh9smvidElXep42uFZEiSU7hHfmCAB5+I=
github.com/swaggo/gin-swagger v1.3.2/go.mod h1:8GN8KIlwgjawtEvE+B8sx3q9SPJuX/ZPxyuoFVrl6gM=
github.com/swaggo/gin-swagger v1.4.1 h1:F2vJndw+Q+ZBOlsC6CaodqXJV3ZOf6hpg/4Y6MEx5BM=
github.com/swaggo/gin-swagger v1.4.1/go.mod h1:hmJ1vPn+XjUvnbzjCdUAxVqgraxELxk8x5zAsjCE5mg=
github.com/swaggo/swag v1.5.1/go.mod h1:1Bl9F/ZBpVWh22nY0zmYyASPO1lI/zIwRDrpZU+tv8Y=
github.com/swaggo/swag v1.7.4 h1:up+ixy8yOqJKiFcuhMgkuYuF4xnevuhnFAXXF8OSfNg=
github.com/swaggo/swag v1.7.4/go.mod h1:zD8h6h4SPv7t3l+4BKdRquqW1ASWjKZgT6Qv9z3kNqI=
github.com/swaggo/swag v1.7.9 h1:6vCG5mm43ebDzGlZPMGYrYI4zKFfOr5kicQX8qjeDwc=
github.com/swaggo/swag v1.7.9/go.mod h1:gZ+TJ2w/Ve1RwQsA2IRoSOTidHz6DX+PIG8GWvbnoLU=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.194/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/kms v1.0.194/go.mod h1:yrBKWhChnDqNz1xuXdSbWXG56XawEq0G5j1lg4VwBD4=
github.com/tencentyun/cos-go-sdk-v5 v0.7.31 h1:NujkkOKMJ3IFs1+trCwXOKRCIPQ8qI5Lxul9JkhTg6M=
@ -558,6 +573,7 @@ golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qx
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20211020060615-d418f374d309 h1:A0lJIi+hcTR6aajJH4YqKWwohY4aW9RO7oRMcdv+HKI=
golang.org/x/net v0.0.0-20211020060615-d418f374d309/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@ -607,7 +623,9 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359 h1:2B5p2L5IfGiD7+b9BOoRMC6DgObAVZV+Fsp050NqXik=
golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=

2
server/latest_log
View File

@ -1 +1 @@
log/2021-12-22.log
log/2022-02-14.log

7
server/log/2021-11-15.log
View File

@ -1,7 +0,0 @@
[goweb-demo]2021/11/15 - 20:49:32.896 info /Users/zero/work/mygithub/goweb-gin-demo/server/initialize/router.go:49 router register success
[goweb-demo]2021/11/15 - 20:49:32.897 info /Users/zero/work/mygithub/goweb-gin-demo/server/core/server.go:31 server run success on {"address": ":8888"}
[goweb-demo]2021/11/15 - 20:49:55.544 error /Users/zero/work/mygithub/goweb-gin-demo/server/core/server.go:38 accept tcp [::]:8888: use of closed network connection
[goweb-demo]2021/11/15 - 14:18:29.534 info /usr/local/weekly_report/initialize/router.go:49 router register success
[goweb-demo]2021/11/15 - 14:18:29.564 info /usr/local/weekly_report/core/server.go:31 server run success on {"address": ":8888"}
[goweb-demo]2021/11/15 - 14:21:49.964 info /usr/local/weekly_report/initialize/router.go:49 router register success
[goweb-demo]2021/11/15 - 14:21:49.984 info /usr/local/weekly_report/core/server.go:31 server run success on {"address": ":8888"}

25
server/log/2021-11-16.log
View File

@ -1,25 +0,0 @@
[goweb-demo]2021/11/16 - 03:51:53.523 info /usr/local/weekly_report/initialize/router.go:49 router register success
[goweb-demo]2021/11/16 - 03:51:53.546 info /usr/local/weekly_report/core/server.go:31 server run success on {"address": ":8888"}
[goweb-demo]2021/11/16 - 05:04:56.337 info /usr/local/weekly_report/initialize/router.go:49 router register success
[goweb-demo]2021/11/16 - 05:04:56.352 info /usr/local/weekly_report/core/server.go:31 server run success on {"address": ":8888"}
[goweb-demo]2021/11/16 - 05:08:29.734 info /usr/local/weekly_report/initialize/router.go:49 router register success
[goweb-demo]2021/11/16 - 05:08:29.769 info /usr/local/weekly_report/core/server.go:31 server run success on {"address": ":8888"}
[goweb-demo]2021/11/16 - 05:12:33.710 info /usr/local/weekly_report/initialize/router.go:49 router register success
[goweb-demo]2021/11/16 - 05:12:33.732 info /usr/local/weekly_report/core/server.go:31 server run success on {"address": ":8888"}
[goweb-demo]2021/11/16 - 06:05:42.273 info /usr/local/weekly_report/initialize/router.go:49 router register success
[goweb-demo]2021/11/16 - 06:05:42.351 info /usr/local/weekly_report/core/server.go:31 server run success on {"address": ":8888"}
[goweb-demo]2021/11/16 - 06:08:07.064 info /usr/local/weekly_report/initialize/router.go:49 router register success
[goweb-demo]2021/11/16 - 06:08:07.085 info /usr/local/weekly_report/core/server.go:31 server run success on {"address": ":8888"}
[goweb-demo]2021/11/16 - 06:27:45.950 info /usr/local/weekly_report/initialize/router.go:49 router register success
[goweb-demo]2021/11/16 - 06:27:45.973 info /usr/local/weekly_report/core/server.go:31 server run success on {"address": ":8981"}
[goweb-demo]2021/11/16 - 06:29:10.017 info /usr/local/weekly_report/initialize/router.go:49 router register success
[goweb-demo]2021/11/16 - 06:29:10.051 info /usr/local/weekly_report/core/server.go:31 server run success on {"address": ":8981"}
[goweb-demo]2021/11/16 - 06:31:27.880 info /usr/local/weekly_report/initialize/router.go:49 router register success
[goweb-demo]2021/11/16 - 06:31:27.908 info /usr/local/weekly_report/core/server.go:31 server run success on {"address": ":8981"}
[goweb-demo]2021/11/16 - 06:31:47.987 error /usr/local/weekly_report/api/system/sys_user.go:36 登陆失败! 用户名不存在或者密码错误! {"err": "record not found"}
[goweb-demo]2021/11/16 - 06:38:11.518 info /usr/local/weekly_report/initialize/router.go:49 router register success
[goweb-demo]2021/11/16 - 06:38:11.546 info /usr/local/weekly_report/core/server.go:31 server run success on {"address": ":8981"}
[goweb-demo]2021/11/16 - 06:39:03.560 error /usr/local/weekly_report/api/system/sys_user.go:36 登陆失败! 用户名不存在或者密码错误! {"err": "record not found"}
[goweb-demo]2021/11/16 - 07:16:08.828 info /usr/local/weekly_report/initialize/router.go:49 router register success
[goweb-demo]2021/11/16 - 07:16:08.838 info /usr/local/weekly_report/core/server.go:31 server run success on {"address": ":8981"}
[goweb-demo]2021/11/16 - 12:44:19.513 error /usr/local/weekly_report/core/server.go:38 accept tcp [::]:8981: use of closed network connection

26
server/log/2021-11-17.log
View File

@ -1,26 +0,0 @@
[goweb-demo]2021/11/17 - 19:04:58.202 info /Users/zero/work/mygithub/goweb-gin-demo/server/initialize/router.go:49 router register success
[goweb-demo]2021/11/17 - 19:04:58.204 info /Users/zero/work/mygithub/goweb-gin-demo/server/core/server.go:31 server run success on {"address": ":8981"}
[goweb-demo]2021/11/17 - 19:06:31.795 info /Users/zero/work/mygithub/goweb-gin-demo/server/initialize/router.go:49 router register success
[goweb-demo]2021/11/17 - 19:06:31.797 info /Users/zero/work/mygithub/goweb-gin-demo/server/core/server.go:31 server run success on {"address": ":8981"}
[goweb-demo]2021/11/17 - 19:08:06.649 info /Users/zero/work/mygithub/goweb-gin-demo/server/initialize/router.go:49 router register success
[goweb-demo]2021/11/17 - 19:08:06.651 info /Users/zero/work/mygithub/goweb-gin-demo/server/core/server.go:31 server run success on {"address": ":8981"}
[goweb-demo]2021/11/17 - 19:18:12.530 info /Users/zero/work/mygithub/goweb-gin-demo/server/initialize/router.go:49 router register success
[goweb-demo]2021/11/17 - 19:18:12.533 info /Users/zero/work/mygithub/goweb-gin-demo/server/core/server.go:31 server run success on {"address": ":8981"}
[goweb-demo]2021/11/17 - 19:18:59.866 error /Users/zero/work/mygithub/goweb-gin-demo/server/api/wt/wt_comments.go:111 获取失败! {"err": "Error 1054: Unknown column 'wt_comments.nick_name' in 'field list'"}
[goweb-demo]2021/11/17 - 19:21:11.202 info /Users/zero/work/mygithub/goweb-gin-demo/server/initialize/router.go:49 router register success
[goweb-demo]2021/11/17 - 19:21:11.203 info /Users/zero/work/mygithub/goweb-gin-demo/server/core/server.go:31 server run success on {"address": ":8981"}
[goweb-demo]2021/11/17 - 19:28:53.830 info /Users/zero/work/mygithub/goweb-gin-demo/server/initialize/router.go:49 router register success
[goweb-demo]2021/11/17 - 19:28:53.833 info /Users/zero/work/mygithub/goweb-gin-demo/server/core/server.go:31 server run success on {"address": ":8981"}
[goweb-demo]2021/11/17 - 19:31:46.870 info /Users/zero/work/mygithub/goweb-gin-demo/server/initialize/router.go:49 router register success
[goweb-demo]2021/11/17 - 19:31:46.871 info /Users/zero/work/mygithub/goweb-gin-demo/server/core/server.go:31 server run success on {"address": ":8981"}
[goweb-demo]2021/11/17 - 19:32:08.254 error /Users/zero/work/mygithub/goweb-gin-demo/server/api/wt/wt_comments.go:111 获取失败! {"err": "Error 1054: Unknown column 'wt_comments.nick_name' in 'field list'"}
[goweb-demo]2021/11/17 - 19:34:29.681 info /Users/zero/work/mygithub/goweb-gin-demo/server/initialize/router.go:49 router register success
[goweb-demo]2021/11/17 - 19:34:29.682 info /Users/zero/work/mygithub/goweb-gin-demo/server/core/server.go:31 server run success on {"address": ":8981"}
[goweb-demo]2021/11/17 - 21:24:08.831 info /Users/zero/work/mygithub/goweb-gin-demo/server/initialize/router.go:49 router register success
[goweb-demo]2021/11/17 - 21:24:08.832 info /Users/zero/work/mygithub/goweb-gin-demo/server/core/server.go:31 server run success on {"address": ":8981"}
[goweb-demo]2021/11/17 - 13:25:22.345 info /usr/local/weekly_report/initialize/router.go:49 router register success
[goweb-demo]2021/11/17 - 13:25:22.362 info /usr/local/weekly_report/core/server.go:31 server run success on {"address": ":8981"}
[goweb-demo]2021/11/17 - 21:26:18.705 error /Users/zero/work/mygithub/goweb-gin-demo/server/core/server.go:38 accept tcp [::]:8981: use of closed network connection
[goweb-demo]2021/11/17 - 21:26:27.431 info /Users/zero/work/mygithub/goweb-gin-demo/server/initialize/router.go:49 router register success
[goweb-demo]2021/11/17 - 21:26:27.434 info /Users/zero/work/mygithub/goweb-gin-demo/server/core/server.go:31 server run success on {"address": ":8981"}
[goweb-demo]2021/11/17 - 21:26:59.880 error /Users/zero/work/mygithub/goweb-gin-demo/server/core/server.go:38 accept tcp [::]:8981: use of closed network connection

3
server/log/2021-12-22.log
View File

@ -1,3 +0,0 @@
[goweb-demo]2021/12/22 - 10:56:24.790 info /Users/ymm/work/mygithub/goweb-gin-demo/server/initialize/router.go:49 router register success
[goweb-demo]2021/12/22 - 10:56:24.791 info /Users/ymm/work/mygithub/goweb-gin-demo/server/core/server.go:31 server run success on {"address": ":8981"}
[goweb-demo]2021/12/22 - 10:58:09.632 error /Users/ymm/work/mygithub/goweb-gin-demo/server/core/server.go:38 accept tcp [::]:8981: use of closed network connection

3
server/log/2022-02-10.log Normal file
View File

@ -0,0 +1,3 @@
[goweb-demo]2022/02/10 - 14:05:02.170 info /Users/ymm/work/mygithub/goweb-gin-demo/server/initialize/router.go:49 router register success
[goweb-demo]2022/02/10 - 14:05:02.172 info /Users/ymm/work/mygithub/goweb-gin-demo/server/core/server.go:30 server run success on {"address": ":8981"}
[goweb-demo]2022/02/10 - 16:00:13.220 error /Users/ymm/work/mygithub/goweb-gin-demo/server/core/server.go:37 accept tcp [::]:8981: use of closed network connection

36
server/log/2022-02-14.log Normal file
View File

@ -0,0 +1,36 @@
[goweb-demo]2022/02/14 - 16:52:53.197 info /Users/ymm/work/mygithub/goweb-gin-demo/server/initialize/router.go:49 router register success
[goweb-demo]2022/02/14 - 16:52:53.199 info /Users/ymm/work/mygithub/goweb-gin-demo/server/core/server.go:30 server run success on {"address": ":8981"}
[goweb-demo]2022/02/14 - 16:53:13.378 error /Users/ymm/work/mygithub/goweb-gin-demo/server/core/server.go:37 accept tcp [::]:8981: use of closed network connection
[goweb-demo]2022/02/14 - 17:09:06.827 info /Users/ymm/work/mygithub/goweb-gin-demo/server/initialize/router.go:49 router register success
[goweb-demo]2022/02/14 - 17:09:06.828 info /Users/ymm/work/mygithub/goweb-gin-demo/server/core/server.go:30 server run success on {"address": ":8981"}
[goweb-demo]2022/02/14 - 17:22:15.273 error /Users/ymm/work/mygithub/goweb-gin-demo/server/core/server.go:37 accept tcp [::]:8981: use of closed network connection
[goweb-demo]2022/02/14 - 17:22:42.489 info /Users/ymm/work/mygithub/goweb-gin-demo/server/initialize/router.go:49 router register success
[goweb-demo]2022/02/14 - 17:22:42.491 info /Users/ymm/work/mygithub/goweb-gin-demo/server/core/server.go:30 server run success on {"address": ":8981"}
[goweb-demo]2022/02/14 - 17:49:06.930 info /Users/ymm/work/mygithub/goweb-gin-demo/server/initialize/router.go:49 router register success
[goweb-demo]2022/02/14 - 17:49:06.933 info /Users/ymm/work/mygithub/goweb-gin-demo/server/core/server.go:30 server run success on {"address": ":8981"}
[goweb-demo]2022/02/14 - 17:50:22.068 info /Users/ymm/work/mygithub/goweb-gin-demo/server/initialize/router.go:49 router register success
[goweb-demo]2022/02/14 - 17:50:22.071 info /Users/ymm/work/mygithub/goweb-gin-demo/server/core/server.go:30 server run success on {"address": ":8981"}
[goweb-demo]2022/02/14 - 17:57:31.417 info /Users/ymm/work/mygithub/goweb-gin-demo/server/initialize/router.go:49 router register success
[goweb-demo]2022/02/14 - 17:57:31.419 info /Users/ymm/work/mygithub/goweb-gin-demo/server/core/server.go:30 server run success on {"address": ":8981"}
[goweb-demo]2022/02/14 - 18:15:32.210 info /Users/ymm/work/mygithub/goweb-gin-demo/server/initialize/router.go:49 router register success
[goweb-demo]2022/02/14 - 18:15:32.213 info /Users/ymm/work/mygithub/goweb-gin-demo/server/core/server.go:30 server run success on {"address": ":8981"}
[goweb-demo]2022/02/14 - 18:24:19.720 info /Users/ymm/work/mygithub/goweb-gin-demo/server/initialize/router.go:49 router register success
[goweb-demo]2022/02/14 - 18:24:19.721 info /Users/ymm/work/mygithub/goweb-gin-demo/server/core/server.go:30 server run success on {"address": ":8981"}
[goweb-demo]2022/02/14 - 18:26:52.764 info /Users/ymm/work/mygithub/goweb-gin-demo/server/initialize/router.go:49 router register success
[goweb-demo]2022/02/14 - 18:26:52.770 info /Users/ymm/work/mygithub/goweb-gin-demo/server/core/server.go:30 server run success on {"address": ":8981"}
[goweb-demo]2022/02/14 - 20:20:26.075 info /Users/ymm/work/mygithub/goweb-gin-demo/server/initialize/router.go:49 router register success
[goweb-demo]2022/02/14 - 20:20:26.077 info /Users/ymm/work/mygithub/goweb-gin-demo/server/core/server.go:30 server run success on {"address": ":8981"}
[goweb-demo]2022/02/14 - 20:29:22.179 info /Users/ymm/work/mygithub/goweb-gin-demo/server/initialize/router.go:49 router register success
[goweb-demo]2022/02/14 - 20:29:22.184 info /Users/ymm/work/mygithub/goweb-gin-demo/server/core/server.go:30 server run success on {"address": ":8981"}
[goweb-demo]2022/02/14 - 20:30:37.483 info /Users/ymm/work/mygithub/goweb-gin-demo/server/initialize/router.go:49 router register success
[goweb-demo]2022/02/14 - 20:30:37.484 info /Users/ymm/work/mygithub/goweb-gin-demo/server/core/server.go:30 server run success on {"address": ":8981"}
[goweb-demo]2022/02/14 - 20:38:34.569 info /Users/ymm/work/mygithub/goweb-gin-demo/server/initialize/router.go:49 router register success
[goweb-demo]2022/02/14 - 20:38:34.574 info /Users/ymm/work/mygithub/goweb-gin-demo/server/core/server.go:30 server run success on {"address": ":8981"}
[goweb-demo]2022/02/14 - 20:46:46.397 info /Users/ymm/work/mygithub/goweb-gin-demo/server/initialize/router.go:49 router register success
[goweb-demo]2022/02/14 - 20:46:46.400 info /Users/ymm/work/mygithub/goweb-gin-demo/server/core/server.go:30 server run success on {"address": ":8981"}
[goweb-demo]2022/02/14 - 20:49:03.595 info /Users/ymm/work/mygithub/goweb-gin-demo/server/initialize/router.go:49 router register success
[goweb-demo]2022/02/14 - 20:49:03.597 info /Users/ymm/work/mygithub/goweb-gin-demo/server/core/server.go:30 server run success on {"address": ":8981"}
[goweb-demo]2022/02/14 - 20:49:18.199 info /Users/ymm/work/mygithub/goweb-gin-demo/server/initialize/router.go:49 router register success
[goweb-demo]2022/02/14 - 20:49:18.201 info /Users/ymm/work/mygithub/goweb-gin-demo/server/core/server.go:30 server run success on {"address": ":8981"}
[goweb-demo]2022/02/14 - 20:53:40.553 info /Users/ymm/work/mygithub/goweb-gin-demo/server/initialize/router.go:49 router register success
[goweb-demo]2022/02/14 - 20:53:40.560 info /Users/ymm/work/mygithub/goweb-gin-demo/server/core/server.go:30 server run success on {"address": ":8981"}

7
server/main.go
View File

@ -7,6 +7,13 @@ import (
"goweb-gin-demo/initialize"
)
// @title Swagger Example API
// @version 0.0.1
// @description This is a sample Server pets
// @securityDefinitions.apikey ApiKeyAuth
// @in header
// @name x-token
// @BasePath /
func main() {
global.GLOBAL_VP = core.Viper() // 初始化Viper
global.GLOBAL_LOG = core.Zap() // 初始化zap日志库

20
server/service/wt/wt_output.go
View File

@ -9,6 +9,7 @@ import (
"goweb-gin-demo/model/wt"
wtReq "goweb-gin-demo/model/wt/request"
wtRes "goweb-gin-demo/model/wt/response"
"goweb-gin-demo/service/system"
"goweb-gin-demo/utils"
"jaytaylor.com/html2text"
)
@ -26,7 +27,6 @@ func (wtOutputService *WtOutputService) GetStatResult(idInfo request.GetByUserID
return err, wtRes.StatResult{}
}
//计算起始时间 起始时间是 5-0900 7-1000
startTime := utils.GetTimeFromWeek(ruleResult.StartWeek, ruleResult.StartHour)
@ -56,6 +56,8 @@ func (wtOutputService *WtOutputService) GetStatResult(idInfo request.GetByUserID
var commitedList []common.UserInfo
var uncommitedList []common.UserInfo
existUserFilter(&reports)
// 比较那些人提交了，那些人没有提交
for _, needCommitPeoples := range reports {
isCommit := false
@ -81,6 +83,20 @@ func (wtOutputService *WtOutputService) GetStatResult(idInfo request.GetByUserID
return err, statResult
}
func existUserFilter(users *[]common.UserInfo) {
var sysServiceGroup system.SystemServiceGroup
// 已删除用户不显示
var existReports []common.UserInfo
for _, report := range *users {
id := report.ID
err, _ := sysServiceGroup.FindUserById(int(id))
if err == nil { // record not found
existReports = append(existReports, report)
}
}
*users = existReports
}
func (wtOutputService *WtOutputService) ExportReportToExcel(info wt.StatDataSearch, excelPath string) (err error) {
var WtServiceGroup WtServiceGroup
err, reportResultList := WtServiceGroup.WtReportsService.getWtReportListForExcel(info)
@ -115,7 +131,7 @@ func (wtOutputService *WtOutputService) ExportReportToExcel(info wt.StatDataSear
axis := fmt.Sprintf("A%d", i+2)
var excelContent []interface{}
excelContent = append(excelContent, i + 1)
excelContent = append(excelContent, i+1)
excelContent = append(excelContent, report.Header)
excelContent = append(excelContent, report.UserName)

6
server/service/wt/wt_rules.go
View File

@ -14,6 +14,7 @@ type WtRuleService struct {
// CreateWtRule 创建WtRule记录
func (wtRuleService *WtRuleService) CreateWtRule(ruleRes wtReq.WtRuleRes) (err error) {
existUserFilter(&ruleRes.Reporters)
rule := voToRule(ruleRes)
err = global.GLOBAL_DB.Create(&rule).Error
return err
@ -27,7 +28,7 @@ func (wtRuleService *WtRuleService) DeleteWtRuleByIds(ids request.IdsReq) (err e
// UpdateWtRule 更新WtRule记录
func (wtRuleService *WtRuleService) UpdateWtRule(ruleRes wtReq.WtRuleRes) (err error) {
ruleRes.ID = 7
existUserFilter(&ruleRes.Reporters)
rule := voToRule(ruleRes)
err = global.GLOBAL_DB.Omit("created_at").Save(&rule).Error
return err
@ -71,6 +72,9 @@ func (wtRuleService *WtRuleService) GetWtRuleInfoList(info wtReq.WtRuleSearch) (
}
ruleResults := rulesToVOs(wtRules)
if err == nil && len(ruleResults) >= 1 {
existUserFilter(&(ruleResults[0].Reporters))
}
return err, ruleResults, total
}