Merge pull request #369 from go-admin-team/dev

修复sql问题

.gitignore

@@ -18,3 +18,6 @@ config/settings.b.dev.yml
 cmd/migrate/migration/version-local/*
 !cmd/migrate/migration/version-local/doc.go
 */.DS_Store
+
+# go sum
+go.sum

common/database/initialize.go

@@ -1,21 +1,20 @@
 package database
 
 import (
-	"github.com/go-admin-team/go-admin-core/sdk"
-	"github.com/go-admin-team/go-admin-core/sdk/pkg"
-	"go-admin/common/global"
-	. "log"
 	"time"
 
-	logCore "github.com/go-admin-team/go-admin-core/logger"
+	log "github.com/go-admin-team/go-admin-core/logger"
+	"github.com/go-admin-team/go-admin-core/sdk"
+	toolsConfig "github.com/go-admin-team/go-admin-core/sdk/config"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+	mycasbin "github.com/go-admin-team/go-admin-core/sdk/pkg/casbin"
 	toolsDB "github.com/go-admin-team/go-admin-core/tools/database"
+	. "github.com/go-admin-team/go-admin-core/tools/gorm/logger"
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
 	"gorm.io/gorm/schema"
 
-	log "github.com/go-admin-team/go-admin-core/logger"
-	toolsConfig "github.com/go-admin-team/go-admin-core/sdk/config"
-	mycasbin "github.com/go-admin-team/go-admin-core/sdk/pkg/casbin"
+	"go-admin/common/global"
 )
 
 // Setup 配置数据库
@@ -43,13 +42,12 @@ func setupSimpleDatabase(host string, c *toolsConfig.Database) {
 		NamingStrategy: schema.NamingStrategy{
 			SingularTable: true,
 		},
-		Logger: logger.New(
-			New(logCore.DefaultLogger.Options().Out, "\r\n", LstdFlags),
+		Logger: New(
 			logger.Config{
 				SlowThreshold: time.Second,
 				Colorful:      true,
 				LogLevel: logger.LogLevel(
-					logCore.DefaultLogger.Options().Level.LevelForGorm()),
+					log.DefaultLogger.Options().Level.LevelForGorm()),
 			},
 		),
 	}, opens[c.Driver])

config/db.sql

@@ -124,7 +124,7 @@ INSERT INTO sys_menu VALUES (256, '', '必开接口', '', '', '/0/63/256', 'M',
 INSERT INTO sys_menu VALUES (257, '', '通过key获取参数', 'bug', '/api/v1/configKey/:id', '/0/63/256/257', 'A', 'GET', '', 256, 0, '', '', 1, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL);
 INSERT INTO sys_menu VALUES (258, '', '退出登录', '', '/api/v1/logout', '/0/63/256/258', 'A', 'POST', '', 256, 0, '', '', 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL);
 INSERT INTO sys_menu VALUES (259, '', '头像上传', '', '/api/v1/user/avatar', '/0/63/256/267/259', 'A', 'POST', '', 267, 0, '', '', 0, '1', '1', '1', '0', '2020-04-11 15:52:48', '2020-05-03 20:50:05', NULL);
-INSERT INTO sys_menu VALUES (260, '', '修改密码', '', '/api/v1/user/pwd', '/0/63/256/260', 'A', 'PUT', '', 256, 0, '', '', 0, '1', '1', '', '0', '2020-04-11 15:52:48', NULL, NULL);
+INSERT INTO sys_menu VALUES (260, '', '修改密码', '', '/api/v1/user/pwd', '/0/63/256/260', 'A', 'PUT', '', 256, 0, '', '', 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL);
 INSERT INTO sys_menu VALUES (261, 'Gen', '代码生成', 'code', 'gen', '/0/60/261', 'C', '', '', 60, 0, '', '/tools/gen/index', 2, '0', '1', '1', '0', '2020-04-11 15:52:48', '2020-04-12 11:18:12', NULL);
 INSERT INTO sys_menu VALUES (262, 'EditTable', '代码生成修改', 'build', 'editTable', '/0/60/262', 'C', '', '', 60, 0, '', '/tools/gen/editTable', 100, '1', '1', '1', '0', '2020-04-11 15:52:48', '2020-05-03 20:38:36', NULL);
 INSERT INTO sys_menu VALUES (263, '', '字典类型下拉框【生成功能】', '', '/api/v1/dict/typeoptionselect', '/0/63/256/263', 'A', 'GET', '', 256, 0, '', '', 0, '1', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL);

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/gin-gonic/gin v1.6.3
 	github.com/go-admin-team/go-admin-core v1.3.0-rc.0.0.20210309094332-92435b42cec0
 	github.com/go-admin-team/go-admin-core/plugins/logger/zap v0.0.0-20210309094332-92435b42cec0 // indirect
-	github.com/go-admin-team/go-admin-core/sdk v0.0.0-20210310033039-117243556307
+	github.com/go-admin-team/go-admin-core/sdk v0.0.0-20210310135550-9ca1efa47cbf
 	github.com/google/uuid v1.2.0
 	github.com/mojocn/base64Captcha v1.3.1
 	github.com/mssola/user_agent v0.5.2