Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
易企天创
zendata
提交
59b21d69
Z
zendata
项目概览
易企天创
/
zendata
9 个月 前同步成功
通知
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 搜索 >>
提交
59b21d69
编写于
9月 09, 2020
作者:
aaronchen2k2k
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix bugs on github
上级
9804834a
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
25 addition
and
22 deletion
+25
-22
demo/test.yaml
demo/test.yaml
+4
-0
src/action/upgrade.go
src/action/upgrade.go
+2
-2
src/gen/definition.go
src/gen/definition.go
+10
-8
src/gen/excel.go
src/gen/excel.go
+5
-5
src/gen/sql.go
src/gen/sql.go
+0
-5
src/utils/const/const.go
src/utils/const/const.go
+4
-2
未找到文件。
demo/test.yaml
浏览文件 @
59b21d69
...
...
@@ -6,6 +6,10 @@ version: 1.0
from
:
jenkins.ip.private.yaml
fields
:
-
field
:
field_use_ranges
prefix
:
"
"
postfix
:
"
]"
-
field
:
field_use_instance
prefix
:
"
"
postfix
:
"
]"
...
...
src/action/upgrade.go
浏览文件 @
59b21d69
...
...
@@ -17,10 +17,10 @@ func Upgrade() {
// TODO: update date from remote server
// read data from db
db
,
err
:=
sql
.
Open
(
constant
.
SqliteDriver
,
constant
.
Sqlite
Source
)
db
,
err
:=
sql
.
Open
(
constant
.
SqliteDriver
,
constant
.
Sqlite
Data
)
defer
db
.
Close
()
if
err
!=
nil
{
logUtils
.
PrintTo
(
i118Utils
.
I118Prt
.
Sprintf
(
"fail_to_connect_sqlite"
,
constant
.
Sqlite
Source
,
err
.
Error
()))
logUtils
.
PrintTo
(
i118Utils
.
I118Prt
.
Sprintf
(
"fail_to_connect_sqlite"
,
constant
.
Sqlite
Data
,
err
.
Error
()))
return
}
...
...
src/gen/definition.go
浏览文件 @
59b21d69
...
...
@@ -178,21 +178,23 @@ func CopyField(child model.DefField, parent *model.DefField) {
if
child
.
Range
!=
""
{
(
*
parent
)
.
Range
=
child
.
Range
}
if
child
.
Prefix
!=
""
{
//if child.Prefix != "" {
(
*
parent
)
.
Prefix
=
child
.
Prefix
}
if
child
.
Postfix
!=
""
{
//
}
//
if child.Postfix != "" {
(
*
parent
)
.
Postfix
=
child
.
Postfix
}
//}
if
child
.
Loop
!=
""
{
(
*
parent
)
.
Loop
=
child
.
Loop
}
if
child
.
Loopfix
!=
""
{
//
if child.Loopfix != "" {
(
*
parent
)
.
Loopfix
=
child
.
Loopfix
}
if
child
.
Format
!=
""
{
//
}
//
if child.Format != "" {
(
*
parent
)
.
Format
=
child
.
Format
}
//
}
if
child
.
From
!=
""
{
(
*
parent
)
.
From
=
child
.
From
...
...
src/gen/excel.go
浏览文件 @
59b21d69
...
...
@@ -136,7 +136,7 @@ func ConvertExcelToSQLiteIfNeeded(dbName string, path string) (firstSheet string
ddl
:=
fmt
.
Sprintf
(
ddlTemplate
,
tableName
,
colDefine
)
insertSql
:=
fmt
.
Sprintf
(
insertTemplate
,
tableName
,
colList
,
valList
)
db
,
err
:=
sql
.
Open
(
"sqlite3"
,
constant
.
Sqlite
Source
)
db
,
err
:=
sql
.
Open
(
"sqlite3"
,
constant
.
Sqlite
Data
)
defer
db
.
Close
()
_
,
err
=
db
.
Exec
(
dropSql
)
if
err
!=
nil
{
...
...
@@ -163,10 +163,10 @@ func ConvertExcelToSQLiteIfNeeded(dbName string, path string) (firstSheet string
func
ReadDataFromSQLite
(
field
model
.
DefField
,
dbName
string
,
tableName
string
)
([]
string
,
string
)
{
list
:=
make
([]
string
,
0
)
db
,
err
:=
sql
.
Open
(
constant
.
SqliteDriver
,
constant
.
Sqlite
Source
)
db
,
err
:=
sql
.
Open
(
constant
.
SqliteDriver
,
constant
.
Sqlite
Data
)
defer
db
.
Close
()
if
err
!=
nil
{
logUtils
.
PrintTo
(
i118Utils
.
I118Prt
.
Sprintf
(
"fail_to_connect_sqlite"
,
constant
.
Sqlite
Source
,
err
.
Error
()))
logUtils
.
PrintTo
(
i118Utils
.
I118Prt
.
Sprintf
(
"fail_to_connect_sqlite"
,
constant
.
Sqlite
Data
,
err
.
Error
()))
return
list
,
""
}
...
...
@@ -241,10 +241,10 @@ func ReadDataFromSQLite(field model.DefField, dbName string, tableName string) (
}
func
isExcelChanged
(
path
string
)
bool
{
db
,
err
:=
sql
.
Open
(
constant
.
SqliteDriver
,
constant
.
Sqlite
Source
)
db
,
err
:=
sql
.
Open
(
constant
.
SqliteDriver
,
constant
.
Sqlite
Data
)
defer
db
.
Close
()
if
err
!=
nil
{
logUtils
.
PrintTo
(
i118Utils
.
I118Prt
.
Sprintf
(
"fail_to_connect_sqlite"
,
constant
.
Sqlite
Source
,
err
.
Error
()))
logUtils
.
PrintTo
(
i118Utils
.
I118Prt
.
Sprintf
(
"fail_to_connect_sqlite"
,
constant
.
Sqlite
Data
,
err
.
Error
()))
return
true
}
...
...
src/gen/sql.go
已删除
100644 → 0
浏览文件 @
9804834a
package
gen
func
ParseSql
(
defFile
string
,
out
string
)
{
}
\ No newline at end of file
src/utils/const/const.go
浏览文件 @
59b21d69
...
...
@@ -60,8 +60,10 @@ var (
TmpDir
=
"tmp/"
SqliteDriver
=
"sqlite3"
SqliteSource
=
"file:"
+
TmpDir
+
"cache/.data.db"
SqliteDriver
=
"sqlite3"
SqliteData
=
"file:"
+
TmpDir
+
"cache/.data.db"
SqliteWords
=
"file:"
+
TmpDir
+
"cache/.words.db"
SqliteTrackTable
=
"excel_update"
ExcelBorder
=
`{"border": [{"type":"left","color":"999999","style":1}, {"type":"top","color":"999999","style":1},
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录