Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
飞鱼0526
gin-vue-admin
提交
c4ab8875
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,发现更多精彩内容 >>
未验证
提交
c4ab8875
编写于
7月 18, 2021
作者:
Mr.奇淼(
提交者:
GitHub
7月 18, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #588 from songzhibin97/gva_gormv2_dev
feat:增加自动注入代码段
上级
79d72f80
a2cad44d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
63 addition
and
19 deletion
+63
-19
server/config.yaml
server/config.yaml
+1
-1
server/service/system/sys_auto_code.go
server/service/system/sys_auto_code.go
+62
-18
未找到文件。
server/config.yaml
浏览文件 @
c4ab8875
...
@@ -73,7 +73,7 @@ local:
...
@@ -73,7 +73,7 @@ local:
autocode
:
autocode
:
transfer-restart
:
true
transfer-restart
:
true
root
:
"
"
root
:
"
"
server
:
/server
/autocode
server
:
/server
server-api
:
/api/v1/autocode
server-api
:
/api/v1/autocode
server-initialize
:
/initialize
server-initialize
:
/initialize
server-model
:
/model/autocode
server-model
:
/model/autocode
...
...
server/service/system/sys_auto_code.go
浏览文件 @
c4ab8875
...
@@ -19,10 +19,56 @@ import (
...
@@ -19,10 +19,56 @@ import (
)
)
const
(
const
(
autoPath
=
"auto
Cod
e/"
autoPath
=
"auto
code_templat
e/"
basePath
=
"resource/template"
basePath
=
"resource/template"
)
)
var
injectionPaths
[]
injectionMeta
func
Init
()
{
if
len
(
injectionPaths
)
!=
0
{
return
}
injectionPaths
=
[]
injectionMeta
{
{
path
:
filepath
.
Join
(
global
.
GVA_CONFIG
.
AutoCode
.
Root
,
global
.
GVA_CONFIG
.
AutoCode
.
Server
,
global
.
GVA_CONFIG
.
AutoCode
.
SInitialize
,
"gorm.go"
),
funcName
:
"MysqlTables"
,
structNameF
:
"autocode.%s{},"
,
},
{
path
:
filepath
.
Join
(
global
.
GVA_CONFIG
.
AutoCode
.
Root
,
global
.
GVA_CONFIG
.
AutoCode
.
Server
,
global
.
GVA_CONFIG
.
AutoCode
.
SInitialize
,
"router.go"
),
funcName
:
"Routers"
,
structNameF
:
"autocodeRouter.Init%sRouter(PrivateGroup)"
,
},
{
path
:
filepath
.
Join
(
global
.
GVA_CONFIG
.
AutoCode
.
Root
,
global
.
GVA_CONFIG
.
AutoCode
.
Server
,
global
.
GVA_CONFIG
.
AutoCode
.
SApi
,
"enter.go"
),
funcName
:
"ApiGroup"
,
structNameF
:
"%sApi"
,
},
{
path
:
filepath
.
Join
(
global
.
GVA_CONFIG
.
AutoCode
.
Root
,
global
.
GVA_CONFIG
.
AutoCode
.
Server
,
global
.
GVA_CONFIG
.
AutoCode
.
SRouter
,
"enter.go"
),
funcName
:
"RouterGroup"
,
structNameF
:
"%sRouter"
,
},
{
path
:
filepath
.
Join
(
global
.
GVA_CONFIG
.
AutoCode
.
Root
,
global
.
GVA_CONFIG
.
AutoCode
.
Server
,
global
.
GVA_CONFIG
.
AutoCode
.
SService
,
"enter.go"
),
funcName
:
"ServiceGroup"
,
structNameF
:
"%sService"
,
},
}
}
type
injectionMeta
struct
{
path
string
funcName
string
structNameF
string
// 带格式化的
}
type
tplData
struct
{
type
tplData
struct
{
template
*
template
.
Template
template
*
template
.
Template
locationPath
string
locationPath
string
...
@@ -142,6 +188,7 @@ func (autoCodeService *AutoCodeService) CreateTemp(autoCode system.AutoCodeStruc
...
@@ -142,6 +188,7 @@ func (autoCodeService *AutoCodeService) CreateTemp(autoCode system.AutoCodeStruc
idBf
.
WriteString
(
";"
)
idBf
.
WriteString
(
";"
)
}
}
if
autoCode
.
AutoMoveFile
{
// 判断是否需要自动转移
if
autoCode
.
AutoMoveFile
{
// 判断是否需要自动转移
Init
()
for
index
:=
range
dataList
{
for
index
:=
range
dataList
{
autoCodeService
.
addAutoMoveFile
(
&
dataList
[
index
])
autoCodeService
.
addAutoMoveFile
(
&
dataList
[
index
])
}
}
...
@@ -150,23 +197,10 @@ func (autoCodeService *AutoCodeService) CreateTemp(autoCode system.AutoCodeStruc
...
@@ -150,23 +197,10 @@ func (autoCodeService *AutoCodeService) CreateTemp(autoCode system.AutoCodeStruc
return
err
return
err
}
}
}
}
initializeGormFilePath
:=
filepath
.
Join
(
global
.
GVA_CONFIG
.
AutoCode
.
Root
,
err
=
injectionCode
(
autoCode
.
StructName
,
&
injectionCodeMeta
)
global
.
GVA_CONFIG
.
AutoCode
.
Server
,
global
.
GVA_CONFIG
.
AutoCode
.
SInitialize
,
"gorm.go"
)
initializeRouterFilePath
:=
filepath
.
Join
(
global
.
GVA_CONFIG
.
AutoCode
.
Root
,
global
.
GVA_CONFIG
.
AutoCode
.
Server
,
global
.
GVA_CONFIG
.
AutoCode
.
SInitialize
,
"router.go"
)
err
=
utils
.
AutoInjectionCode
(
initializeGormFilePath
,
"MysqlTables"
,
"model."
+
autoCode
.
StructName
+
"{},"
)
if
err
!=
nil
{
return
err
}
err
=
utils
.
AutoInjectionCode
(
initializeRouterFilePath
,
"Routers"
,
"router.Init"
+
autoCode
.
StructName
+
"Router(PrivateGroup)"
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
}
}
injectionCodeMeta
.
WriteString
(
fmt
.
Sprintf
(
"%s@%s@%s"
,
initializeGormFilePath
,
"MysqlTables"
,
"model."
+
autoCode
.
StructName
+
"{},"
))
injectionCodeMeta
.
WriteString
(
";"
)
injectionCodeMeta
.
WriteString
(
fmt
.
Sprintf
(
"%s@%s@%s"
,
initializeRouterFilePath
,
"Routers"
,
"router.Init"
+
autoCode
.
StructName
+
"Router(PrivateGroup)"
))
// 保存生成信息
// 保存生成信息
for
_
,
data
:=
range
dataList
{
for
_
,
data
:=
range
dataList
{
if
len
(
data
.
autoMoveFilePath
)
!=
0
{
if
len
(
data
.
autoMoveFilePath
)
!=
0
{
...
@@ -180,7 +214,6 @@ func (autoCodeService *AutoCodeService) CreateTemp(autoCode system.AutoCodeStruc
...
@@ -180,7 +214,6 @@ func (autoCodeService *AutoCodeService) CreateTemp(autoCode system.AutoCodeStruc
_
=
utils
.
Reload
()
_
=
utils
.
Reload
()
}()
}()
}
}
//return errors.New("创建代码成功并移动文件成功")
}
else
{
// 打包
}
else
{
// 打包
if
err
=
utils
.
ZipFiles
(
"./ginvueadmin.zip"
,
fileList
,
"."
,
"."
);
err
!=
nil
{
if
err
=
utils
.
ZipFiles
(
"./ginvueadmin.zip"
,
fileList
,
"."
,
"."
);
err
!=
nil
{
return
err
return
err
...
@@ -414,7 +447,6 @@ func (autoCodeService *AutoCodeService) getNeedList(autoCode *system.AutoCodeStr
...
@@ -414,7 +447,6 @@ func (autoCodeService *AutoCodeService) getNeedList(autoCode *system.AutoCodeStr
// 生成文件路径,填充 autoCodePath 字段,readme.txt.tpl不符合规则,需要特殊处理
// 生成文件路径,填充 autoCodePath 字段,readme.txt.tpl不符合规则,需要特殊处理
// resource/template/web/api.js.tpl -> autoCode/web/autoCode.PackageName/api/autoCode.PackageName.js
// resource/template/web/api.js.tpl -> autoCode/web/autoCode.PackageName/api/autoCode.PackageName.js
// resource/template/readme.txt.tpl -> autoCode/readme.txt
// resource/template/readme.txt.tpl -> autoCode/readme.txt
autoPath
:=
"autoCode/"
for
index
,
value
:=
range
dataList
{
for
index
,
value
:=
range
dataList
{
trimBase
:=
strings
.
TrimPrefix
(
value
.
locationPath
,
basePath
+
"/"
)
trimBase
:=
strings
.
TrimPrefix
(
value
.
locationPath
,
basePath
+
"/"
)
if
trimBase
==
"readme.txt.tpl"
{
if
trimBase
==
"readme.txt.tpl"
{
...
@@ -447,3 +479,15 @@ func (autoCodeService *AutoCodeService) getNeedList(autoCode *system.AutoCodeStr
...
@@ -447,3 +479,15 @@ func (autoCodeService *AutoCodeService) getNeedList(autoCode *system.AutoCodeStr
}
}
return
dataList
,
fileList
,
needMkdir
,
err
return
dataList
,
fileList
,
needMkdir
,
err
}
}
// injectionCode 封装代码注入
func
injectionCode
(
structName
string
,
bf
*
strings
.
Builder
)
error
{
for
_
,
meta
:=
range
injectionPaths
{
code
:=
fmt
.
Sprintf
(
meta
.
structNameF
,
structName
)
if
err
:=
utils
.
AutoInjectionCode
(
meta
.
path
,
meta
.
funcName
,
code
);
err
!=
nil
{
return
err
}
bf
.
WriteString
(
fmt
.
Sprintf
(
"%s@%s@%s;"
,
meta
.
path
,
meta
.
funcName
,
code
))
}
return
nil
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录