From ba1c7f61931b434cce84e6a2fd5bc557df7f2576 Mon Sep 17 00:00:00 2001
From: zhangwenjian
Date: Sun, 26 Apr 2020 22:12:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE=E6=9D=83?=
=?UTF-8?q?=E9=99=90bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 20 +++++++++++++++-----
cmd/cobra.go | 2 +-
cmd/migrate/server.go | 2 +-
models/roledept.go | 2 +-
4 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/README.md b/README.md
index 7cbae6d9..d4e0ea39 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-
+
@@ -16,7 +16,7 @@
- [English](./README.en.md) | 简体中文
+ [English](https://github.com/wenjianzhang/go-admin/blob/master/README.en.md) | 简体中文
##### 基于Gin + Vue + Element UI的前后端分离权限管理系统
@@ -45,6 +45,8 @@
- 表单构建工具
+- 多命令模式
+
- TODO: 单元测试
@@ -132,8 +134,7 @@ vi ./config/setting.yml (更改isinit和数据库连接)
# 启动项目,也可以用IDE进行调试
-./go-admin server -c=config/settings.yml -p=8000 -m=dev
-c
+./go-admin server -c config/settings.yml -p 8000 -m dev
```
[在线文档](https://wenjianzhang.github.io/go-admin-site)
@@ -166,6 +167,15 @@ env GOOS=linux GOARCH=amd64 go build main.go
## 📈 版本
+### 2020-04-23 新功能及优化
+
+1. 添加单服务命令
+2. 添加单数据库数据化命令
+3. 调整项目结构
+3. 部分代码优化
+3. 添加根接口
+4. 其他已知bug的修复
+
### 2020-04-13 新功能及优化
1. 数据库初始化方式改为gorm 迁移方式
@@ -211,7 +221,7 @@ env GOOS=linux GOARCH=amd64 go build main.go
| 微信 |
- 已满 |
+ 此群已满 |
 |
diff --git a/cmd/cobra.go b/cmd/cobra.go
index b6c5f88b..5e487a98 100644
--- a/cmd/cobra.go
+++ b/cmd/cobra.go
@@ -23,7 +23,7 @@ var rootCmd = &cobra.Command{
},
PersistentPreRunE: func(*cobra.Command, []string) error { return nil },
Run: func(cmd *cobra.Command, args []string) {
- usageStr := `go-admin 0.0.1`
+ usageStr := `go-admin 1.0.0 欢迎使用,可以是用 -h 查看命令`
log.Printf("%s\n", usageStr)
},
}
diff --git a/cmd/migrate/server.go b/cmd/migrate/server.go
index db9511ad..75a4b6ba 100644
--- a/cmd/migrate/server.go
+++ b/cmd/migrate/server.go
@@ -27,7 +27,7 @@ var (
)
func init() {
- StartCmd.PersistentFlags().StringVarP(&config, "config", "c", "config/app.yml", "Start server with provided configuration file")
+ StartCmd.PersistentFlags().StringVarP(&config, "config", "c", "config/settings.yml", "Start server with provided configuration file")
StartCmd.PersistentFlags().StringVarP(&mode, "mode", "m", "dev", "server mode ; eg:dev,test,prod")
}
diff --git a/models/roledept.go b/models/roledept.go
index cdcc202c..3c00da39 100644
--- a/models/roledept.go
+++ b/models/roledept.go
@@ -37,7 +37,7 @@ func (rm *SysRoleDept) DeleteRoleDept(roleId int) (bool, error) {
return false, err
}
var role SysRole
- if err := orm.Eloquent.Table("sys_role").Where("id = ?", roleId).First(&role).Error; err != nil {
+ if err := orm.Eloquent.Table("sys_role").Where("role_id = ?", roleId).First(&role).Error; err != nil {
return false, err
}