Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
易企天创
zendata
提交
ac81c03d
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 搜索 >>
提交
ac81c03d
编写于
7月 13, 2020
作者:
aaronchen2k2k
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
new features for 1.1
上级
8b22902c
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
25 addition
and
21 deletion
+25
-21
src/action/generator.go
src/action/generator.go
+2
-5
src/gen/res.go
src/gen/res.go
+10
-7
src/utils/config/config.go
src/utils/config/config.go
+0
-4
src/utils/file/file.go
src/utils/file/file.go
+2
-2
src/utils/vari/var.go
src/utils/vari/var.go
+0
-1
src/zd.go
src/zd.go
+11
-2
未找到文件。
src/action/generator.go
浏览文件 @
ac81c03d
...
...
@@ -47,16 +47,13 @@ func Generate(deflt string, yml string, total int, fieldsToExportStr string, out
WriteToFile
(
out
,
content
)
}
if
vari
.
Ip
!=
""
||
vari
.
Port
!=
0
||
vari
.
Root
!=
""
{
if
vari
.
Ip
!=
""
||
vari
.
Port
!=
0
{
if
vari
.
Ip
==
""
{
vari
.
Ip
=
commonUtils
.
GetIp
()
}
if
vari
.
Port
==
0
{
vari
.
Port
=
constant
.
DefaultPort
}
if
vari
.
Root
==
""
{
vari
.
Root
=
constant
.
DefaultRoot
}
logUtils
.
PrintToWithColor
(
i118Utils
.
I118Prt
.
Sprintf
(
"start_server"
),
color
.
FgCyan
)
...
...
@@ -127,7 +124,7 @@ func Print(rows [][]string, format string, table string, colTypes []bool, fields
}
respJson
:=
"[]"
if
format
==
constant
.
FormatJson
||
vari
.
HttpService
{
if
format
==
constant
.
FormatJson
||
vari
.
Ip
!=
""
||
vari
.
Port
!=
0
{
if
vari
.
WithHead
{
mapArr
:=
RowsToMap
(
rows
,
fields
)
jsonObj
,
_
:=
json
.
Marshal
(
mapArr
)
...
...
src/gen/res.go
浏览文件 @
ac81c03d
...
...
@@ -39,7 +39,7 @@ func loadResField(field *model.DefField, res *map[string]map[string][]string) {
}
}
func
getResProp
(
from
string
)
(
string
,
string
)
{
func
getResProp
(
from
string
)
(
string
,
string
)
{
// from resource
resFile
:=
""
resType
:=
""
...
...
@@ -62,14 +62,17 @@ func getResProp(from string) (string, string) {
resType
=
"excel"
}
if
strings
.
Index
(
resFile
,
"system"
)
==
-
1
{
// no system cls
resFile
=
vari
.
InputDir
+
resFile
if
strings
.
Index
(
resFile
,
"system"
)
==
-
1
{
// no system resource
resFile
=
vari
.
WorkDir
+
resFile
if
!
fileUtils
.
FileExist
(
resFile
)
{
// not in work dir
resFile
=
vari
.
InputDir
+
resFile
if
!
fileUtils
.
FileExist
(
resFile
)
{
// not in input dir
resFile
=
vari
.
ExeDir
+
resFile
if
!
fileUtils
.
FileExist
(
resFile
)
{
// not in input dir (same dir as yaml file in)
resFile
=
vari
.
ExeDir
+
resFile
if
!
fileUtils
.
FileExist
(
resFile
)
{
// not in exe dir
resFile
=
""
if
!
fileUtils
.
FileExist
(
resFile
)
{
// not in exe dir
resFile
=
""
}
}
}
}
else
{
...
...
src/utils/config/config.go
浏览文件 @
ac81c03d
...
...
@@ -2,15 +2,11 @@ package configUtils
import
(
"github.com/easysoft/zendata/src/utils/display"
fileUtils
"github.com/easysoft/zendata/src/utils/file"
"github.com/easysoft/zendata/src/utils/i118"
"github.com/easysoft/zendata/src/utils/vari"
)
func
InitConfig
()
{
vari
.
ExeDir
=
fileUtils
.
GetExeDir
()
vari
.
WorkDir
=
fileUtils
.
GetWorkDir
()
InitScreenSize
()
i118Utils
.
InitI118
(
vari
.
Config
.
Language
)
...
...
src/utils/file/file.go
浏览文件 @
ac81c03d
...
...
@@ -133,7 +133,7 @@ func ReadResData(path string) string {
return
jsonStr
}
func
GetExeDir
()
string
{
// where z
tf command
in
func
GetExeDir
()
string
{
// where z
d.exe file
in
var
dir
string
arg1
:=
strings
.
ToLower
(
os
.
Args
[
0
])
...
...
@@ -154,7 +154,7 @@ func GetExeDir() string { // where ztf command in
return
dir
}
func
GetWorkDir
()
string
{
// where
ztf
command in
func
GetWorkDir
()
string
{
// where
run
command in
dir
,
_
:=
os
.
Getwd
()
dir
,
_
=
filepath
.
Abs
(
dir
)
dir
=
UpdateDir
(
dir
)
...
...
src/utils/vari/var.go
浏览文件 @
ac81c03d
...
...
@@ -32,5 +32,4 @@ var (
JsonResp
string
=
"[]"
Ip
string
Port
int
Root
string
)
src/zd.go
浏览文件 @
ac81c03d
...
...
@@ -5,6 +5,7 @@ import (
"github.com/easysoft/zendata/src/action"
configUtils
"github.com/easysoft/zendata/src/utils/config"
constant
"github.com/easysoft/zendata/src/utils/const"
fileUtils
"github.com/easysoft/zendata/src/utils/file"
logUtils
"github.com/easysoft/zendata/src/utils/log"
stringUtils
"github.com/easysoft/zendata/src/utils/string"
"github.com/easysoft/zendata/src/utils/vari"
...
...
@@ -23,6 +24,7 @@ var (
count
int
fields
string
root
string
input
string
output
string
table
string
...
...
@@ -86,8 +88,8 @@ func main() {
flagSet
.
StringVar
(
&
vari
.
Ip
,
"bind"
,
""
,
""
)
flagSet
.
IntVar
(
&
vari
.
Port
,
"p"
,
0
,
""
)
flagSet
.
IntVar
(
&
vari
.
Port
,
"port"
,
0
,
""
)
flagSet
.
StringVar
(
&
vari
.
R
oot
,
"r"
,
""
,
""
)
flagSet
.
StringVar
(
&
vari
.
R
oot
,
"root"
,
""
,
""
)
flagSet
.
StringVar
(
&
r
oot
,
"r"
,
""
,
""
)
flagSet
.
StringVar
(
&
r
oot
,
"root"
,
""
,
""
)
flagSet
.
BoolVar
(
&
example
,
"e"
,
false
,
""
)
flagSet
.
BoolVar
(
&
example
,
"example"
,
false
,
""
)
...
...
@@ -120,6 +122,13 @@ func main() {
func
gen
(
args
[]
string
)
{
flagSet
.
SetOutput
(
ioutil
.
Discard
)
if
err
:=
flagSet
.
Parse
(
args
[
2
:
]);
err
==
nil
{
vari
.
ExeDir
=
fileUtils
.
GetExeDir
()
vari
.
WorkDir
=
fileUtils
.
GetWorkDir
()
if
root
!=
""
{
vari
.
WorkDir
=
root
}
// vari.InputDir will init for different gen type
if
vari
.
HeadSep
!=
""
{
vari
.
WithHead
=
true
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录