将gorm适配器调整至本地避免windows没有gcc的情况导致系统无法启动

pixel · pixel · commit db81460c3513 · 2021-04-06T17:12:51.000+08:00
diff --git a/server/go.mod b/server/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/aliyun/aliyun-oss-go-sdk v2.1.6+incompatible
 	github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect
 	github.com/casbin/casbin/v2 v2.25.6
-	github.com/casbin/gorm-adapter/v3 v3.2.5
+	//github.com/casbin/gorm-adapter/v3 v3.2.5
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239 // indirect
 	github.com/fsnotify/fsnotify v1.4.9
@@ -23,6 +23,7 @@ require (
 	github.com/go-sql-driver/mysql v1.5.0
 	github.com/golang/protobuf v1.4.2 // indirect
 	github.com/gookit/color v1.3.1
+	github.com/jackc/pgconn v1.8.1
 	github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 // indirect
 	github.com/jordan-wright/email v0.0.0-20200824153738-3f5bafa1cd84
 	github.com/json-iterator/go v1.1.10 // indirect
@@ -49,11 +50,12 @@ require (
 	github.com/tencentyun/cos-go-sdk-v5 v0.7.19
 	github.com/unrolled/secure v1.0.7
 	go.uber.org/zap v1.10.0
-	golang.org/x/net v0.0.0-20201224014010-6772e930b67b // indirect
 	golang.org/x/tools v0.0.0-20200324003944-a576cf524670 // indirect
 	google.golang.org/protobuf v1.24.0 // indirect
 	gopkg.in/ini.v1 v1.55.0 // indirect
 	gopkg.in/yaml.v2 v2.3.0 // indirect
 	gorm.io/driver/mysql v1.0.1
-	gorm.io/gorm v1.20.9
+	gorm.io/driver/postgres v1.0.8
+	gorm.io/driver/sqlserver v1.0.7
+	gorm.io/gorm v1.21.4
 )
diff --git a/server/service/sys_casbin.go b/server/service/sys_casbin.go
@@ -7,9 +7,9 @@ import (
 	"gin-vue-admin/model/request"
 	"strings"
 
+	"gin-vue-admin/utils/gormadapter"
 	"github.com/casbin/casbin/v2"
 	"github.com/casbin/casbin/v2/util"
-	gormadapter "github.com/casbin/gorm-adapter/v3"
 	_ "github.com/go-sql-driver/mysql"
 )
 
diff --git a/server/source/casbin.go b/server/source/casbin.go
@@ -3,7 +3,7 @@ package source
 import (
 	"gin-vue-admin/global"
 
-	gormadapter "github.com/casbin/gorm-adapter/v3"
+	"gin-vue-admin/utils/gormadapter"
 	"github.com/gookit/color"
 	"gorm.io/gorm"
 )
diff --git a/server/utils/gormadapter/adapter.go b/server/utils/gormadapter/adapter.go

Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@ import (`
`7`	`7`	`"gin-vue-admin/model/request"`
`8`	`8`	`"strings"`
`9`	`9`
	`10`	`+ "gin-vue-admin/utils/gormadapter"`
`10`	`11`	`"github.com/casbin/casbin/v2"`
`11`	`12`	`"github.com/casbin/casbin/v2/util"`
`12`		`- gormadapter "github.com/casbin/gorm-adapter/v3"`
`13`	`13`	`_ "github.com/go-sql-driver/mysql"`
`14`	`14`	`)`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package source`
`3`	`3`	`import (`
`4`	`4`	`"gin-vue-admin/global"`
`5`	`5`
`6`		`- gormadapter "github.com/casbin/gorm-adapter/v3"`
	`6`	`+ "gin-vue-admin/utils/gormadapter"`
`7`	`7`	`"github.com/gookit/color"`
`8`	`8`	`"gorm.io/gorm"`
`9`	`9`	`)`