Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
易企天创
zendata
提交
929f3de7
Z
zendata
项目概览
易企天创
/
zendata
11 个月 前同步成功
通知
17
Star
2
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Z
zendata
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
929f3de7
编写于
11月 19, 2020
作者:
aaronchen2k2k
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
load user data yaml to db
上级
fce1ac53
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
100 addition
and
8 deletion
+100
-8
src/model/model.go
src/model/model.go
+2
-1
src/server/repo/field.go
src/server/repo/field.go
+1
-1
src/server/service/common.go
src/server/service/common.go
+1
-1
src/server/service/config.go
src/server/service/config.go
+1
-0
src/server/service/def.go
src/server/service/def.go
+52
-4
src/server/service/instances.go
src/server/service/instances.go
+3
-1
src/server/service/ranges.go
src/server/service/ranges.go
+4
-0
users/test/_test-def.yaml
users/test/_test-def.yaml
+16
-0
users/test/_test-instacnes.yaml
users/test/_test-instacnes.yaml
+20
-0
未找到文件。
src/model/model.go
浏览文件 @
929f3de7
...
...
@@ -18,6 +18,7 @@ type ZdDef struct {
Desc
string
`gorm:"column:desc" json:"desc"`
Yaml
string
`gorm:"yaml" json:"yaml"`
Folder
string
`gorm:"-" json:"folder" yaml:"-"`
Fields
[]
ZdField
`gorm:"-" json:"fields"`
}
func
(
*
ZdDef
)
TableName
()
string
{
return
constant
.
TablePrefix
+
"def"
...
...
@@ -54,7 +55,7 @@ type ZdField struct {
Limit
int
`gorm:"column:limitCol" json:"limitCol"`
Ord
int
`gorm:"column:ord;default:1" json:"ord"`
Children
[]
*
ZdField
`gorm:"-" json:"children
"`
Fields
[]
*
ZdField
`gorm:"-" json:"fields
"`
Froms
[]
*
ZdField
`gorm:"-" json:"froms"`
// for range edit
...
...
src/server/repo/field.go
浏览文件 @
929f3de7
...
...
@@ -86,7 +86,7 @@ func (r *FieldRepo) Save(field *model.ZdField) (err error) {
func
(
r
*
FieldRepo
)
makeTree
(
Data
[]
*
model
.
ZdField
,
node
*
model
.
ZdField
)
{
//参数为父节点,添加父节点的子节点指针切片
children
,
_
:=
r
.
haveChild
(
Data
,
node
)
//判断节点是否有子节点并返回
if
children
!=
nil
{
node
.
Children
=
append
(
node
.
Children
,
children
[
0
:
]
...
)
//添加子节点
node
.
Fields
=
append
(
node
.
Fields
,
children
[
0
:
]
...
)
//添加子节点
for
_
,
v
:=
range
children
{
//查询子节点的子节点,并添加到子节点
_
,
has
:=
r
.
haveChild
(
Data
,
v
)
if
has
{
...
...
src/server/service/common.go
浏览文件 @
929f3de7
...
...
@@ -5,7 +5,7 @@ import "github.com/easysoft/zendata/src/model"
func
convertToConfModel
(
treeNode
model
.
ZdField
,
field
*
model
.
DefField
)
{
genField
(
treeNode
,
field
)
for
_
,
child
:=
range
treeNode
.
Children
{
for
_
,
child
:=
range
treeNode
.
Fields
{
defField
:=
model
.
DefField
{}
convertToConfModel
(
*
child
,
&
defField
)
...
...
src/server/service/config.go
浏览文件 @
929f3de7
...
...
@@ -67,6 +67,7 @@ func (s *ConfigService) saveResToDB(config []model.ResFile, list []*model.ZdConf
config
.
Path
=
item
.
Path
config
.
Field
=
item
.
Title
config
.
Note
=
item
.
Desc
config
.
Yaml
=
string
(
content
)
s
.
configRepo
.
Save
(
&
config
)
}
...
...
src/server/service/def.go
浏览文件 @
929f3de7
...
...
@@ -5,8 +5,10 @@ import (
"github.com/easysoft/zendata/src/server/repo"
constant
"github.com/easysoft/zendata/src/utils/const"
fileUtils
"github.com/easysoft/zendata/src/utils/file"
stringUtils
"github.com/easysoft/zendata/src/utils/string"
"github.com/jinzhu/gorm"
"gopkg.in/yaml.v3"
"io/ioutil"
"strings"
)
...
...
@@ -14,10 +16,15 @@ type DefService struct {
defRepo
*
serverRepo
.
DefRepo
fieldRepo
*
serverRepo
.
FieldRepo
referRepo
*
serverRepo
.
ReferRepo
resService
*
ResService
}
func
(
s
*
DefService
)
List
()
(
defs
[]
*
model
.
ZdDef
)
{
defs
,
_
=
s
.
defRepo
.
List
()
func
(
s
*
DefService
)
List
()
(
list
[]
*
model
.
ZdDef
)
{
defs
:=
s
.
resService
.
LoadRes
(
"yaml"
)
list
,
_
=
s
.
defRepo
.
List
()
s
.
saveDataToDB
(
defs
,
list
)
list
,
_
=
s
.
defRepo
.
List
()
return
}
...
...
@@ -100,7 +107,7 @@ func (s *DefService) dataToYaml(def *model.ZdDef) (str string) {
defData
:=
model
.
DefData
{}
s
.
defRepo
.
GenDef
(
*
def
,
&
defData
)
for
_
,
child
:=
range
root
.
Children
{
// ignore the root
for
_
,
child
:=
range
root
.
Fields
{
// ignore the root
defField
:=
model
.
DefField
{}
convertToConfModel
(
*
child
,
&
defField
)
...
...
@@ -132,6 +139,47 @@ func (s *DefService) getFolder(pth string) string {
return
pth
[
:
idx
+
1
]
}
func
NewDefService
(
defRepo
*
serverRepo
.
DefRepo
,
fieldRepo
*
serverRepo
.
FieldRepo
,
referRepo
*
serverRepo
.
ReferRepo
)
*
DefService
{
func
(
s
*
DefService
)
saveDataToDB
(
defs
[]
model
.
ResFile
,
list
[]
*
model
.
ZdDef
)
(
err
error
)
{
names
:=
make
([]
string
,
0
)
for
_
,
item
:=
range
list
{
names
=
append
(
names
,
item
.
Path
)
}
for
_
,
def
:=
range
defs
{
if
!
stringUtils
.
FindInArrBool
(
def
.
Path
,
names
)
{
//if strings.Contains(inst.Path, "_test") {
content
,
_
:=
ioutil
.
ReadFile
(
def
.
Path
)
yamlContent
:=
stringUtils
.
ReplaceSpecialChars
(
content
)
defPo
:=
model
.
ZdDef
{}
err
=
yaml
.
Unmarshal
(
yamlContent
,
&
defPo
)
defPo
.
Title
=
def
.
Title
defPo
.
Type
=
def
.
ResType
defPo
.
Desc
=
def
.
Desc
defPo
.
Path
=
def
.
Path
defPo
.
Yaml
=
string
(
content
)
s
.
defRepo
.
Create
(
&
defPo
)
for
_
,
field
:=
range
defPo
.
Fields
{
s
.
saveFieldToDB
(
&
field
,
0
,
defPo
.
ID
)
}
//}
}
}
return
}
func
(
s
*
DefService
)
saveFieldToDB
(
item
*
model
.
ZdField
,
parentID
,
defID
uint
)
{
item
.
DefID
=
defID
item
.
ParentID
=
parentID
s
.
fieldRepo
.
Save
(
item
)
for
_
,
child
:=
range
item
.
Fields
{
s
.
saveFieldToDB
(
child
,
item
.
ID
,
defID
)
}
}
func
NewDefService
(
defRepo
*
serverRepo
.
DefRepo
,
fieldRepo
*
serverRepo
.
FieldRepo
,
referRepo
*
serverRepo
.
ReferRepo
)
*
DefService
{
return
&
DefService
{
defRepo
:
defRepo
,
fieldRepo
:
fieldRepo
,
referRepo
:
referRepo
}
}
src/server/service/instances.go
浏览文件 @
929f3de7
...
...
@@ -104,10 +104,12 @@ func (s *InstancesService) saveResToDB(instances []model.ResFile, list []*model.
instPo
.
Name
=
inst
.
Name
instPo
.
Desc
=
inst
.
Desc
instPo
.
Path
=
inst
.
Path
instPo
.
Yaml
=
string
(
content
)
s
.
instancesRepo
.
Save
(
&
instPo
)
for
_
,
item
:=
range
instPo
.
Instances
{
for
i
,
item
:=
range
instPo
.
Instances
{
item
.
Ord
=
i
+
1
s
.
saveItemToDB
(
&
item
,
0
,
instPo
.
ID
)
}
//}
...
...
src/server/service/ranges.go
浏览文件 @
929f3de7
...
...
@@ -102,13 +102,17 @@ func (s *RangesService) saveResToDB(ranges []model.ResFile, list []*model.ZdRang
ranges
.
Path
=
item
.
Path
ranges
.
Field
=
item
.
Title
ranges
.
Note
=
item
.
Desc
ranges
.
Yaml
=
string
(
content
)
s
.
rangesRepo
.
Save
(
&
ranges
)
i
:=
1
for
k
,
v
:=
range
ranges
.
RangeMap
{
item
:=
model
.
ZdRangesItem
{
Name
:
k
,
Value
:
v
}
item
.
RangesID
=
ranges
.
ID
item
.
Ord
=
i
s
.
rangesRepo
.
SaveItem
(
&
item
)
i
+=
1
}
}
}
...
...
users/test/_test-def.yaml
0 → 100644
浏览文件 @
929f3de7
title
:
测试数据
desc
:
author
:
zentao
version
:
1.0
fields
:
-
field
:
field1
note
:
测试
fields
:
-
field
:
field1-1
range
:
0-9
postfix
:
"
,"
-
field
:
field1-2
range
:
a-z
-
field
:
field2
range
:
A-Z
users/test/_test-instacnes.yaml
0 → 100644
浏览文件 @
929f3de7
title
:
国家数据
desc
:
author
:
zentao
version
:
1.0
field
:
country
instances
:
-
instance
:
instant1
note
:
测试
fields
:
-
field
:
field1
note
:
测试
fields
:
-
field
:
field1-1
range
:
0-9
postfix
:
"
,"
-
field
:
field1-2
range
:
a-z
-
field
:
field2
range
:
A-Z
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录