Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
nizhengjia888
gin-vue-admin
提交
439ffe64
G
gin-vue-admin
项目概览
nizhengjia888
/
gin-vue-admin
与 Fork 源项目一致
Fork自
FLIPPED-AURORA / gin-vue-admin
通知
3
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,体验更适合开发者的 AI 搜索 >>
提交
439ffe64
编写于
10月 29, 2020
作者:
m0_50812349
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add err := and delete postgresql initdb
上级
79d0a3ad
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
17 addition
and
104 deletion
+17
-104
server/cmd/datas/apis.go
server/cmd/datas/apis.go
+1
-1
server/cmd/datas/authorities.go
server/cmd/datas/authorities.go
+1
-1
server/cmd/datas/authority_Ids.go
server/cmd/datas/authority_Ids.go
+1
-1
server/cmd/datas/authority_menus.go
server/cmd/datas/authority_menus.go
+1
-1
server/cmd/datas/casbins.go
server/cmd/datas/casbins.go
+1
-6
server/cmd/datas/customers.go
server/cmd/datas/customers.go
+1
-1
server/cmd/datas/dictionaries.go
server/cmd/datas/dictionaries.go
+2
-34
server/cmd/datas/dictionary_details.go
server/cmd/datas/dictionary_details.go
+1
-1
server/cmd/datas/files.go
server/cmd/datas/files.go
+1
-1
server/cmd/datas/init.go
server/cmd/datas/init.go
+4
-52
server/cmd/datas/menus.go
server/cmd/datas/menus.go
+1
-1
server/cmd/datas/users.go
server/cmd/datas/users.go
+1
-1
server/cmd/gva/initdb.go
server/cmd/gva/initdb.go
+1
-3
未找到文件。
server/cmd/datas/apis.go
浏览文件 @
439ffe64
...
...
@@ -84,7 +84,7 @@ func InitSysApi(db *gorm.DB) (err error) {
color
.
Danger
.
Println
(
"sys_apis表的初始数据已存在!"
)
return
nil
}
if
tx
.
Create
(
&
Apis
)
.
Erro
r
!=
nil
{
// 遇到错误时回滚事务
if
err
:=
tx
.
Create
(
&
Apis
)
.
Error
;
er
r
!=
nil
{
// 遇到错误时回滚事务
return
err
}
return
nil
...
...
server/cmd/datas/authorities.go
浏览文件 @
439ffe64
...
...
@@ -20,7 +20,7 @@ func InitSysAuthority(db *gorm.DB) (err error) {
color
.
Danger
.
Println
(
"sys_authorities表的初始数据已存在!"
)
return
nil
}
if
tx
.
Create
(
&
Authorities
)
.
Erro
r
!=
nil
{
// 遇到错误时回滚事务
if
err
:=
tx
.
Create
(
&
Authorities
)
.
Error
;
er
r
!=
nil
{
// 遇到错误时回滚事务
return
err
}
return
nil
...
...
server/cmd/datas/authority_Ids.go
浏览文件 @
439ffe64
...
...
@@ -24,7 +24,7 @@ func InitSysDataAuthorityId(db *gorm.DB) (err error) {
color
.
Danger
.
Println
(
"sys_data_authority_id表的初始数据已存在!"
)
return
nil
}
if
tx
.
Create
(
&
DataAuthorityId
)
.
Erro
r
!=
nil
{
// 遇到错误时回滚事务
if
err
:=
tx
.
Create
(
&
DataAuthorityId
)
.
Error
;
er
r
!=
nil
{
// 遇到错误时回滚事务
return
err
}
return
nil
...
...
server/cmd/datas/authority_menus.go
浏览文件 @
439ffe64
...
...
@@ -72,7 +72,7 @@ func InitSysAuthorityMenus(db *gorm.DB) (err error) {
color
.
Danger
.
Println
(
"sys_authority_menus表的初始数据已存在!"
)
return
nil
}
if
tx
.
Create
(
&
AuthorityMenus
)
.
Erro
r
!=
nil
{
// 遇到错误时回滚事务
if
err
:=
tx
.
Create
(
&
AuthorityMenus
)
.
Error
;
er
r
!=
nil
{
// 遇到错误时回滚事务
return
err
}
return
nil
...
...
server/cmd/datas/casbins.go
浏览文件 @
439ffe64
...
...
@@ -153,16 +153,11 @@ var Carbines = []gormadapter.CasbinRule{
func
InitCasbinModel
(
db
*
gorm
.
DB
)
(
err
error
)
{
return
db
.
Transaction
(
func
(
tx
*
gorm
.
DB
)
error
{
if
!
tx
.
Migrator
()
.
HasTable
(
"casbin_rule"
)
{
if
err
:=
tx
.
Migrator
()
.
CreateTable
(
&
gormadapter
.
CasbinRule
{});
err
!=
nil
{
return
err
}
}
if
tx
.
Where
(
"p_type = ? AND v0 IN ?"
,
"p"
,
[]
string
{
"888"
,
"8881"
,
"9528"
})
.
Find
(
&
[]
gormadapter
.
CasbinRule
{})
.
RowsAffected
==
142
{
color
.
Danger
.
Println
(
"casbin_rule表的初始数据已存在!"
)
return
nil
}
if
tx
.
Create
(
&
Carbines
)
.
Erro
r
!=
nil
{
// 遇到错误时回滚事务
if
err
:=
tx
.
Create
(
&
Carbines
)
.
Error
;
er
r
!=
nil
{
// 遇到错误时回滚事务
return
err
}
return
nil
...
...
server/cmd/datas/customers.go
浏览文件 @
439ffe64
...
...
@@ -19,7 +19,7 @@ func InitExaCustomer(db *gorm.DB) (err error) {
color
.
Danger
.
Println
(
"exa_customers表的初始数据已存在!"
)
return
nil
}
if
tx
.
Create
(
&
Customers
)
.
Erro
r
!=
nil
{
// 遇到错误时回滚事务
if
err
:=
tx
.
Create
(
&
Customers
)
.
Error
;
er
r
!=
nil
{
// 遇到错误时回滚事务
return
err
}
return
nil
...
...
server/cmd/datas/dictionaries.go
浏览文件 @
439ffe64
...
...
@@ -9,15 +9,6 @@ import (
"gorm.io/gorm"
)
type
SysDictionaryToPostgresql
struct
{
global
.
GVA_MODEL
Name
string
`json:"name" form:"name" gorm:"column:name;comment:字典名(中)"`
Type
string
`json:"type" form:"type" gorm:"column:type;comment:字典名(英)"`
Status
*
bool
`json:"status" form:"status" gorm:"column:status;comment:状态"`
Description
string
`json:"description" form:"description" gorm:"column:description;comment:'描述'"`
SysDictionaryDetails
[]
model
.
SysDictionaryDetail
`json:"sysDictionaryDetails" form:"sysDictionaryDetails"`
}
func
InitSysDictionary
(
db
*
gorm
.
DB
)
(
err
error
)
{
var
status
=
new
(
bool
)
*
status
=
true
...
...
@@ -34,32 +25,9 @@ func InitSysDictionary(db *gorm.DB) (err error) {
color
.
Danger
.
Println
(
"sys_dictionaries表的初始数据已存在!"
)
return
nil
}
if
tx
.
Create
(
&
Dictionaries
)
.
Error
!=
nil
{
// 遇到错误时回滚事务
return
err
}
return
nil
})
}
func
InitSysDictionaryToPostgresql
(
db
*
gorm
.
DB
)
(
err
error
)
{
status
:=
new
(
bool
)
*
status
=
true
Dictionaries
:=
[]
SysDictionaryToPostgresql
{
{
GVA_MODEL
:
global
.
GVA_MODEL
{
ID
:
1
,
CreatedAt
:
time
.
Now
(),
UpdatedAt
:
time
.
Now
()},
Name
:
"性别"
,
Type
:
"sex"
,
Status
:
status
,
Description
:
"性别字典"
},
{
GVA_MODEL
:
global
.
GVA_MODEL
{
ID
:
2
,
CreatedAt
:
time
.
Now
(),
UpdatedAt
:
time
.
Now
()},
Name
:
"数据库int类型"
,
Type
:
"int"
,
Status
:
status
,
Description
:
"int类型对应的数据库类型"
},
{
GVA_MODEL
:
global
.
GVA_MODEL
{
ID
:
3
,
CreatedAt
:
time
.
Now
(),
UpdatedAt
:
time
.
Now
()},
Name
:
"数据库时间日期类型"
,
Type
:
"time.Time"
,
Status
:
status
,
Description
:
"数据库时间日期类型"
},
{
GVA_MODEL
:
global
.
GVA_MODEL
{
ID
:
4
,
CreatedAt
:
time
.
Now
(),
UpdatedAt
:
time
.
Now
()},
Name
:
"数据库浮点型"
,
Type
:
"float64"
,
Status
:
status
,
Description
:
"数据库浮点型"
},
{
GVA_MODEL
:
global
.
GVA_MODEL
{
ID
:
5
,
CreatedAt
:
time
.
Now
(),
UpdatedAt
:
time
.
Now
()},
Name
:
"数据库字符串"
,
Type
:
"string"
,
Status
:
status
,
Description
:
"数据库字符串"
},
{
GVA_MODEL
:
global
.
GVA_MODEL
{
ID
:
6
,
CreatedAt
:
time
.
Now
(),
UpdatedAt
:
time
.
Now
()},
Name
:
"数据库bool类型"
,
Type
:
"bool"
,
Status
:
status
,
Description
:
"数据库bool类型"
},
}
return
db
.
Transaction
(
func
(
tx
*
gorm
.
DB
)
error
{
if
tx
.
Where
(
"id IN ?"
,
[]
int
{
1
,
6
})
.
Find
(
&
[]
model
.
SysDictionary
{})
.
RowsAffected
==
2
{
color
.
Danger
.
Println
(
"sys_dictionaries表的初始数据已存在!"
)
return
nil
}
if
tx
.
Create
(
&
Dictionaries
)
.
Error
!=
nil
{
// 遇到错误时回滚事务
if
err
:=
tx
.
Create
(
&
Dictionaries
)
.
Error
;
err
!=
nil
{
// 遇到错误时回滚事务
return
err
}
return
nil
})
}
}
\ No newline at end of file
server/cmd/datas/dictionary_details.go
浏览文件 @
439ffe64
...
...
@@ -42,7 +42,7 @@ func InitSysDictionaryDetail(db *gorm.DB) (err error) {
color
.
Danger
.
Println
(
"sys_dictionary_details表的初始数据已存在!"
)
return
nil
}
if
tx
.
Create
(
&
DictionaryDetail
)
.
Erro
r
!=
nil
{
// 遇到错误时回滚事务
if
err
:=
tx
.
Create
(
&
DictionaryDetail
)
.
Error
;
er
r
!=
nil
{
// 遇到错误时回滚事务
return
err
}
return
nil
...
...
server/cmd/datas/files.go
浏览文件 @
439ffe64
...
...
@@ -20,7 +20,7 @@ func InitExaFileUploadAndDownload(db *gorm.DB) (err error) {
color
.
Danger
.
Println
(
"exa_file_upload_and_downloads表的初始数据已存在!"
)
return
nil
}
if
tx
.
Create
(
&
Files
)
.
Erro
r
!=
nil
{
// 遇到错误时回滚事务
if
err
:=
tx
.
Create
(
&
Files
)
.
Error
;
er
r
!=
nil
{
// 遇到错误时回滚事务
return
err
}
return
nil
...
...
server/cmd/datas/init.go
浏览文件 @
439ffe64
...
...
@@ -30,54 +30,6 @@ func InitMysqlData(db *gorm.DB) {
}
func
InitMysqlTables
(
db
*
gorm
.
DB
)
{
var
err
error
err
=
db
.
AutoMigrate
(
model
.
SysApi
{},
model
.
SysUser
{},
model
.
ExaFile
{},
model
.
ExaCustomer
{},
model
.
SysBaseMenu
{},
model
.
SysWorkflow
{},
model
.
SysAuthority
{},
model
.
JwtBlacklist
{},
model
.
ExaFileChunk
{},
model
.
SysDictionary
{},
model
.
ExaSimpleUploader
{},
model
.
SysOperationRecord
{},
model
.
SysWorkflowStepInfo
{},
model
.
SysDictionaryDetail
{},
model
.
SysBaseMenuParameter
{},
model
.
ExaFileUploadAndDownload
{},
)
if
err
!=
nil
{
color
.
Warn
.
Printf
(
"[Mysql]-->初始化数据表失败,err: %v
\n
"
,
err
)
os
.
Exit
(
0
)
}
color
.
Info
.
Println
(
"[Mysql]-->初始化数据表成功"
)
}
func
InitPostgresqlData
(
db
*
gorm
.
DB
)
{
var
err
error
err
=
InitSysApi
(
db
)
err
=
InitSysUser
(
db
)
err
=
InitExaCustomer
(
db
)
err
=
InitCasbinModel
(
db
)
err
=
InitSysAuthority
(
db
)
err
=
InitSysBaseMenus
(
db
)
err
=
InitAuthorityMenu
(
db
)
err
=
InitSysAuthorityMenus
(
db
)
err
=
InitSysDataAuthorityId
(
db
)
err
=
InitSysDictionaryDetail
(
db
)
err
=
InitExaFileUploadAndDownload
(
db
)
err
=
InitSysDictionaryToPostgresql
(
db
)
if
err
!=
nil
{
color
.
Error
.
Printf
(
"[Postgresql]-->初始化数据失败,err: %v
\n
"
,
err
)
os
.
Exit
(
0
)
}
color
.
Info
.
Println
(
"[Postgresql]-->初始化数据成功"
)
}
func
InitPostgresqlTables
(
db
*
gorm
.
DB
)
{
var
err
error
if
!
db
.
Migrator
()
.
HasTable
(
"casbin_rule"
)
{
err
=
db
.
Migrator
()
.
CreateTable
(
&
gormadapter
.
CasbinRule
{})
...
...
@@ -92,17 +44,17 @@ func InitPostgresqlTables(db *gorm.DB) {
model
.
SysAuthority
{},
model
.
JwtBlacklist
{},
model
.
ExaFileChunk
{},
model
.
SysDictionary
{},
model
.
ExaSimpleUploader
{},
model
.
SysOperationRecord
{},
model
.
SysWorkflowStepInfo
{},
model
.
SysDictionaryDetail
{},
model
.
SysBaseMenuParameter
{},
model
.
ExaFileUploadAndDownload
{},
SysDictionaryToPostgresql
{},
)
if
err
!=
nil
{
color
.
Error
.
Printf
(
"[Postgre
sql]-->初始化数据表失败,err: %v
\n
"
,
err
)
color
.
Warn
.
Printf
(
"[My
sql]-->初始化数据表失败,err: %v
\n
"
,
err
)
os
.
Exit
(
0
)
}
color
.
Info
.
Println
(
"[
Postgre
sql]-->初始化数据表成功"
)
}
color
.
Info
.
Println
(
"[
My
sql]-->初始化数据表成功"
)
}
\ No newline at end of file
server/cmd/datas/menus.go
浏览文件 @
439ffe64
...
...
@@ -45,7 +45,7 @@ func InitSysBaseMenus(db *gorm.DB) (err error) {
color
.
Danger
.
Println
(
"sys_base_menus表的初始数据已存在!"
)
return
nil
}
if
tx
.
Create
(
&
BaseMenus
)
.
Erro
r
!=
nil
{
// 遇到错误时回滚事务
if
err
:=
tx
.
Create
(
&
BaseMenus
)
.
Error
;
er
r
!=
nil
{
// 遇到错误时回滚事务
return
err
}
return
nil
...
...
server/cmd/datas/users.go
浏览文件 @
439ffe64
...
...
@@ -21,7 +21,7 @@ func InitSysUser(db *gorm.DB) (err error) {
color
.
Danger
.
Println
(
"sys_users表的初始数据已存在!"
)
return
nil
}
if
tx
.
Create
(
&
Users
)
.
Erro
r
!=
nil
{
// 遇到错误时回滚事务
if
err
:=
tx
.
Create
(
&
Users
)
.
Error
;
er
r
!=
nil
{
// 遇到错误时回滚事务
return
err
}
return
nil
...
...
server/cmd/gva/initdb.go
浏览文件 @
439ffe64
...
...
@@ -47,8 +47,7 @@ var initdbCmd = &cobra.Command{
datas
.
InitMysqlTables
(
db
)
datas
.
InitMysqlData
(
db
)
case
"postgresql"
:
datas
.
InitPostgresqlTables
(
db
)
datas
.
InitPostgresqlData
(
db
)
color
.
Info
.
Println
(
"postgresql功能开发中"
)
case
"sqlite"
:
color
.
Info
.
Println
(
"sqlite功能开发中"
)
case
"sqlserver"
:
...
...
@@ -56,7 +55,6 @@ var initdbCmd = &cobra.Command{
default
:
datas
.
InitMysqlTables
(
db
)
datas
.
InitMysqlData
(
db
)
color
.
Info
.
Println
(
"sqlserver功能开发中"
)
}
frame
,
_
:=
cmd
.
Flags
()
.
GetString
(
"frame"
)
if
frame
==
"gf"
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录