Skip to content

Commit

Permalink
Merge pull request #371 from go-admin-team/dev
Browse files Browse the repository at this point in the history
1.3.0rc.0
  • Loading branch information
wenjianzhang authored Mar 11, 2021
2 parents 7599a22 + 3a570e5 commit 263355d
Show file tree
Hide file tree
Showing 24 changed files with 123 additions and 1,580 deletions.
14 changes: 11 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,15 @@ npm run dev
</tr>
</table>

## 💎 主要成员

<a href="https://github.com/wenjianzhang"> <img src="https://avatars.githubusercontent.com/u/3890175?s=460&u=20eac63daef81588fbac611da676b99859319251&v=4" width="80px"></a>
<a href="https://github.com/lwnmengjing"> <img src="https://avatars.githubusercontent.com/u/12806223?s=400&u=a89272dce50100b77b4c0d5c81c718bf78ebb580&v=4" width="80px"></a>
<a href="https://github.com/chengxiao"> <img src="https://avatars.githubusercontent.com/u/1379545?s=460&u=557da5503d0ac4a8628df6b4075b17853d5edcd9&v=4" width="80px"></a>
<a href="https://github.com/bing127"> <img src="https://avatars.githubusercontent.com/u/31166183?s=460&u=c085bff88df10bb7676c8c0351ba9dcd031d1fb3&v=4" width="80px"></a>



## JetBrains 开源证书支持

`go-admin` 项目一直以来都是在 JetBrains 公司旗下的 GoLand 集成开发环境中进行开发,基于 **free JetBrains Open Source license(s)** 正版免费授权,在此表达我的谢意。
Expand Down Expand Up @@ -262,12 +271,11 @@ npm run dev
zhuqiyun LLL狐 星星之火 cjj770 Sam 唐*i 晓聪 aLong *渊 海马 魏镇坪 + 111 *哥 我的宇哥哥 **

## 🤝友情链接
## 🤝 链接
[Go开发者成长线路图](http://www.golangroadmap.com/)

## 🔑 License

[MIT](https://github.com/go-admin-team/go-admin/blob/master/LICENSE.md)

Copyright (c) 2020 wenjianzhang

Copyright (c) 2020 wenjianzhang
193 changes: 0 additions & 193 deletions app/admin/apis/process/wf_classify.go

This file was deleted.

7 changes: 6 additions & 1 deletion app/admin/apis/tools/gen.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ func Preview(c *gin.Context) {
pkg.HasError(err, "", -1)
t6, err := template.ParseFiles("template/v4/dto.go.template")
pkg.HasError(err, "", -1)
t7, err := template.ParseFiles("template/v4/no_actions/service.go.template")
pkg.HasError(err, "", -1)

db, err := pkg.GetOrm(c)
if err != nil {
Expand All @@ -54,6 +56,8 @@ func Preview(c *gin.Context) {
err = t5.Execute(&b5, tab)
var b6 bytes.Buffer
err = t6.Execute(&b6, tab)
var b7 bytes.Buffer
err = t7.Execute(&b7, tab)

mp := make(map[string]interface{})
mp["template/model.go.template"] = b1.String()
Expand All @@ -62,6 +66,7 @@ func Preview(c *gin.Context) {
mp["template/vue.go.template"] = b4.String()
mp["template/router.go.template"] = b5.String()
mp["template/dto.go.template"] = b6.String()
mp["template/service.go.template"] = b7.String()
var res app.Response
res.Data = mp

Expand Down Expand Up @@ -433,4 +438,4 @@ func GenMenuAndApi(c *gin.Context) {
ADelete.MenuId, err = ADelete.Create(db)

app.OK(c, "", "数据生成成功!")
}
}
27 changes: 0 additions & 27 deletions app/admin/models/wf_classify.go

This file was deleted.

25 changes: 0 additions & 25 deletions app/admin/router/wf_classify.go

This file was deleted.

Loading

0 comments on commit 263355d

Please sign in to comment.