Merge pull request #417 from go-admin-team/1.3.x

1.3.x
This commit is contained in:
wenjianzhang authored and GitHub committed 2021-05-10 16:45:12 +08:00
commit d91ddf265d
5 files changed
+30 -5

No files matched your search

+23 -2
View File
@@ -156,14 +156,35 @@ vi ./config/setting.yml
# 2. 确认log路径
```
:::tip ⚠️注意 在windows环境如果没有安装中CGO,会出现这个问题;
```bash
E:\go-admin>go build
# github.com/mattn/go-sqlite3
cgo: exec /missing-cc: exec: "/missing-cc": file does not exist
```
or
```bash
D:\Code\go-admin>go build
# github.com/mattn/go-sqlite3
cgo: exec gcc: exec: "gcc": executable file not found in %PATH%
```
[解决cgo问题进入](https://doc.go-admin.dev/guide/other/faq.html#_5-cgo-exec-missing-cc-exec-missing-cc-file-does-not-exist)
:::
#### 初始化数据库,以及服务启动
``` bash
# 首次配置需要初始化数据库资源信息
# macOS or linux 下使用
$ ./go-admin migrate -c=config/settings.dev.yml
# ⚠️注意:windows 下使用
$ ./go-admin.exe migrate -c=config/settings.dev.yml
$ go-admin.exe migrate -c=config/settings.dev.yml
# 启动项目,也可以用IDE进行调试
@@ -172,7 +193,7 @@ $ ./go-admin server -c config/settings.yml
# ⚠️注意:windows 下使用
$ ./go-admin.exe server -c config/settings.yml
$ go-admin.exe server -c config/settings.yml
```
#### 使用docker 编译启动
+2
View File
@@ -66,6 +66,7 @@ func (e *SysColumns) GetList(tx *gorm.DB) ([]SysColumns, error) {
func (e *SysColumns) Create(tx *gorm.DB) (SysColumns, error) {
var doc SysColumns
e.CreateBy = "1"
result := tx.Table("sys_columns").Create(&e)
if result.Error != nil {
err := result.Error
@@ -82,6 +83,7 @@ func (e *SysColumns) Update(tx *gorm.DB) (update SysColumns, err error) {
//参数1:是要修改的数据
//参数2:是修改的数据
e.UpdateBy = "1"
if err = tx.Table("sys_columns").Model(&update).Updates(&e).Error; err != nil {
return
}
+2
View File
@@ -134,6 +134,7 @@ func (e *SysTables) GetTree(tx *gorm.DB) ([]SysTables, error) {
func (e *SysTables) Create(tx *gorm.DB) (SysTables, error) {
var doc SysTables
e.CreateBy = "1"
result := tx.Table("sys_tables").Create(&e)
if result.Error != nil {
err := result.Error
@@ -156,6 +157,7 @@ func (e *SysTables) Update(tx *gorm.DB) (update SysTables, err error) {
//参数1:是要修改的数据
//参数2:是修改的数据
e.UpdateBy="1"
if err = tx.Table("sys_tables").Where("table_id = ?", e.TableId).Updates(&e).Error; err != nil {
return
}
+1 -1
View File
@@ -17,7 +17,7 @@ type Api struct {
Logger *logger.Logger
}
func (e Api) SetContext(c *gin.Context) {
func (e *Api) SetContext(c *gin.Context) {
e.Context = c
}
+2 -2
View File
@@ -9,8 +9,8 @@ require (
github.com/bytedance/go-tagexpr/v2 v2.7.10
github.com/casbin/casbin/v2 v2.25.1
github.com/gin-gonic/gin v1.6.3
github.com/go-admin-team/go-admin-core v1.3.5-rc.0.0.20210423072631-e3580b68ee26
github.com/go-admin-team/go-admin-core/sdk v1.3.0-rc.3.0.20210427015751-b42693c49c6c
github.com/go-admin-team/go-admin-core v1.3.5-rc.1
github.com/go-admin-team/go-admin-core/sdk v1.3.5-rc.1
github.com/google/uuid v1.2.0
github.com/mssola/user_agent v0.5.2
github.com/opentracing/opentracing-go v1.1.0