Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
飞鱼0526
gin-vue-admin
提交
49e9a4a0
G
gin-vue-admin
项目概览
飞鱼0526
/
gin-vue-admin
与 Fork 源项目一致
Fork自
FLIPPED-AURORA / gin-vue-admin
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gin-vue-admin
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
49e9a4a0
编写于
9月 03, 2021
作者:
Mr.奇淼(
提交者:
GitHub
9月 03, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #667 from flipped-aurora/gva-vue3-2.4.5
修复初始化时跳出的两个bug提示(不影响使用)
上级
46213355
804cc44f
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
89 addition
and
86 deletion
+89
-86
server/api/v1/system/sys_user.go
server/api/v1/system/sys_user.go
+1
-0
server/core/server_other.go
server/core/server_other.go
+1
-0
server/core/server_win.go
server/core/server_win.go
+1
-0
server/middleware/jwt.go
server/middleware/jwt.go
+0
-1
server/packfile/notUsePackFile.go
server/packfile/notUsePackFile.go
+1
-0
server/packfile/usePackFile.go
server/packfile/usePackFile.go
+1
-0
server/source/authority_menu.go
server/source/authority_menu.go
+1
-1
server/source/user_authority.go.go
server/source/user_authority.go.go
+1
-1
server/utils/jwt.go
server/utils/jwt.go
+1
-1
server/utils/plugin/plugin_uinx.go
server/utils/plugin/plugin_uinx.go
+2
-1
web/package-lock.json
web/package-lock.json
+79
-81
未找到文件。
server/api/v1/system/sys_user.go
浏览文件 @
49e9a4a0
...
...
@@ -74,6 +74,7 @@ func (b *BaseApi) tokenNext(c *gin.Context, user system.SysUser) {
},
"登录成功"
,
c
)
return
}
if
err
,
jwtStr
:=
jwtService
.
GetRedisJWT
(
user
.
Username
);
err
==
redis
.
Nil
{
if
err
:=
jwtService
.
SetRedisJWT
(
token
,
user
.
Username
);
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"设置登录状态失败!"
,
zap
.
Any
(
"err"
,
err
))
...
...
server/core/server_other.go
浏览文件 @
49e9a4a0
//go:build !windows
// +build !windows
package
core
...
...
server/core/server_win.go
浏览文件 @
49e9a4a0
//go:build windows
// +build windows
package
core
...
...
server/middleware/jwt.go
浏览文件 @
49e9a4a0
...
...
@@ -70,4 +70,3 @@ func JWTAuth() gin.HandlerFunc {
c
.
Next
()
}
}
server/packfile/notUsePackFile.go
浏览文件 @
49e9a4a0
//go:build !packfile
// +build !packfile
package
packfile
server/packfile/usePackFile.go
浏览文件 @
49e9a4a0
//go:build packfile
// +build packfile
package
packfile
...
...
server/source/authority_menu.go
浏览文件 @
49e9a4a0
...
...
@@ -13,7 +13,7 @@ type authorityMenu struct{}
//@author: [SliverHorn](https://github.com/SliverHorn)
//@description: authority_menu 视图数据初始化
func
(
a
*
authorityMenu
)
Init
()
error
{
if
global
.
GVA_DB
.
Find
(
&
[]
system
.
SysMenu
{})
.
RowsAffected
>
0
{
if
global
.
GVA_DB
.
Migrator
()
.
HasTable
(
"authority_menu"
)
&&
global
.
GVA_DB
.
Find
(
&
[]
system
.
SysMenu
{})
.
RowsAffected
>
0
{
color
.
Danger
.
Println
(
"
\n
[Mysql] --> authority_menu 视图已存在!"
)
return
nil
}
...
...
server/source/user_authority.go.go
浏览文件 @
49e9a4a0
...
...
@@ -21,7 +21,7 @@ var userAuthorityModel = []system.SysUseAuthority{
//@description: user_authority 数据初始化
func
(
a
*
userAuthority
)
Init
()
error
{
return
global
.
GVA_DB
.
Model
(
&
system
.
SysUseAuthority
{})
.
Transaction
(
func
(
tx
*
gorm
.
DB
)
error
{
if
tx
.
Where
(
"sys_user_id IN (1, 2)"
)
.
Find
(
&
[]
AuthorityMenus
{})
.
RowsAffected
==
4
{
if
tx
.
Where
(
"sys_user_id IN (1, 2)"
)
.
Find
(
&
[]
system
.
SysUseAuthority
{})
.
RowsAffected
==
4
{
color
.
Danger
.
Println
(
"
\n
[Mysql] --> sys_user_authority 表的初始数据已存在!"
)
return
nil
}
...
...
server/utils/jwt.go
浏览文件 @
49e9a4a0
...
...
@@ -68,4 +68,4 @@ func (j *JWT) ParseToken(tokenString string) (*request.CustomClaims, error) {
}
}
\ No newline at end of file
}
server/utils/plugin/plugin_uinx.go
浏览文件 @
49e9a4a0
//+build !windows
//go:build !windows
// +build !windows
package
plugin
...
...
web/package-lock.json
浏览文件 @
49e9a4a0
...
...
@@ -1765,6 +1765,63 @@
"integrity"
:
"sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo="
,
"dev"
:
true
},
"ansi-styles"
:
{
"version"
:
"4.3.0"
,
"resolved"
:
"https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"
,
"integrity"
:
"sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"color-convert"
:
"^2.0.1"
}
},
"chalk"
:
{
"version"
:
"4.1.2"
,
"resolved"
:
"https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"
,
"integrity"
:
"sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"ansi-styles"
:
"^4.1.0"
,
"supports-color"
:
"^7.1.0"
}
},
"color-convert"
:
{
"version"
:
"2.0.1"
,
"resolved"
:
"https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"
,
"integrity"
:
"sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"color-name"
:
"~1.1.4"
}
},
"color-name"
:
{
"version"
:
"1.1.4"
,
"resolved"
:
"https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
,
"integrity"
:
"sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
,
"dev"
:
true
,
"optional"
:
true
},
"has-flag"
:
{
"version"
:
"4.0.0"
,
"resolved"
:
"https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
,
"integrity"
:
"sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
,
"dev"
:
true
,
"optional"
:
true
},
"loader-utils"
:
{
"version"
:
"2.0.0"
,
"resolved"
:
"https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz"
,
"integrity"
:
"sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"big.js"
:
"^5.2.2"
,
"emojis-list"
:
"^3.0.0"
,
"json5"
:
"^2.1.2"
}
},
"ssri"
:
{
"version"
:
"8.0.1"
,
"resolved"
:
"https://registry.nlark.com/ssri/download/ssri-8.0.1.tgz"
,
...
...
@@ -1773,6 +1830,28 @@
"requires"
:
{
"minipass"
:
"^3.1.1"
}
},
"supports-color"
:
{
"version"
:
"7.2.0"
,
"resolved"
:
"https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"
,
"integrity"
:
"sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"has-flag"
:
"^4.0.0"
}
},
"vue-loader-v16"
:
{
"version"
:
"npm:vue-loader@16.5.0"
,
"resolved"
:
"https://registry.npmjs.org/vue-loader/-/vue-loader-16.5.0.tgz"
,
"integrity"
:
"sha512-WXh+7AgFxGTgb5QAkQtFeUcHNIEq3PGVQ8WskY5ZiFbWBkOwcCPRs4w/2tVyTbh2q6TVRlO3xfvIukUtjsu62A=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"chalk"
:
"^4.1.0"
,
"hash-sum"
:
"^2.0.0"
,
"loader-utils"
:
"^2.0.0"
}
}
}
},
...
...
@@ -11533,87 +11612,6 @@
}
}
},
"vue-loader-v16"
:
{
"version"
:
"npm:vue-loader@16.5.0"
,
"resolved"
:
"https://registry.npmjs.org/vue-loader/-/vue-loader-16.5.0.tgz"
,
"integrity"
:
"sha512-WXh+7AgFxGTgb5QAkQtFeUcHNIEq3PGVQ8WskY5ZiFbWBkOwcCPRs4w/2tVyTbh2q6TVRlO3xfvIukUtjsu62A=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"chalk"
:
"^4.1.0"
,
"hash-sum"
:
"^2.0.0"
,
"loader-utils"
:
"^2.0.0"
},
"dependencies"
:
{
"ansi-styles"
:
{
"version"
:
"4.3.0"
,
"resolved"
:
"https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"
,
"integrity"
:
"sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"color-convert"
:
"^2.0.1"
}
},
"chalk"
:
{
"version"
:
"4.1.2"
,
"resolved"
:
"https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"
,
"integrity"
:
"sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"ansi-styles"
:
"^4.1.0"
,
"supports-color"
:
"^7.1.0"
}
},
"color-convert"
:
{
"version"
:
"2.0.1"
,
"resolved"
:
"https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"
,
"integrity"
:
"sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"color-name"
:
"~1.1.4"
}
},
"color-name"
:
{
"version"
:
"1.1.4"
,
"resolved"
:
"https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
,
"integrity"
:
"sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
,
"dev"
:
true
,
"optional"
:
true
},
"has-flag"
:
{
"version"
:
"4.0.0"
,
"resolved"
:
"https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
,
"integrity"
:
"sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
,
"dev"
:
true
,
"optional"
:
true
},
"loader-utils"
:
{
"version"
:
"2.0.0"
,
"resolved"
:
"https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz"
,
"integrity"
:
"sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"big.js"
:
"^5.2.2"
,
"emojis-list"
:
"^3.0.0"
,
"json5"
:
"^2.1.2"
}
},
"supports-color"
:
{
"version"
:
"7.2.0"
,
"resolved"
:
"https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"
,
"integrity"
:
"sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"has-flag"
:
"^4.0.0"
}
}
}
},
"vue-particle-line"
:
{
"version"
:
"0.1.4"
,
"resolved"
:
"https://registry.npmjs.org/vue-particle-line/-/vue-particle-line-0.1.4.tgz"
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录