From 014a23aac39b3be9e9797b1dd68d94b129db9181 Mon Sep 17 00:00:00 2001 From: lif <1835304752@qq.com> Date: Thu, 14 Sep 2023 16:35:41 +0800 Subject: [PATCH 1/2] [BugFix] Fix pgsql error with --- app/admin/service/sys_api.go | 8 +++++++- go.mod | 9 +++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/app/admin/service/sys_api.go b/app/admin/service/sys_api.go index d8d6c350..cb4d895b 100644 --- a/app/admin/service/sys_api.go +++ b/app/admin/service/sys_api.go @@ -12,6 +12,7 @@ import ( "go-admin/app/admin/service/dto" "go-admin/common/actions" cDto "go-admin/common/dto" + "go-admin/common/global" ) type SysApi struct { @@ -34,7 +35,12 @@ func (e *SysApi) GetPage(c *dto.SysApiGetPageReq, p *actions.DataPermission, lis if qType == "暂无" { qType = "" } - orm = orm.Where("`type` = ?", qType) + if global.Driver == "postgres" { + orm = orm.Where("type = ?", qType) + } else { + orm = orm.Where("`type` = ?", qType) + } + } err = orm.Find(list).Limit(-1).Offset(-1). Count(count).Error diff --git a/go.mod b/go.mod index 2a363392..64a4dd13 100644 --- a/go.mod +++ b/go.mod @@ -43,15 +43,18 @@ require ( github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bsm/redislock v0.5.0 // indirect + github.com/bytedance/sonic v1.9.1 // indirect github.com/casbin/redis-watcher/v2 v2.0.0-20220614104201-0e70bf2be930 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/chanxuehong/rand v0.0.0-20201110082127-2f19a1bdd973 // indirect github.com/chanxuehong/wechat v0.0.0-20201110083048-0180211b69fd // indirect + github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect github.com/denisenkom/go-mssqldb v0.12.0 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/fatih/color v1.9.0 // indirect github.com/fsnotify/fsnotify v1.4.9 // indirect + github.com/gabriel-vasile/mimetype v1.4.2 // indirect github.com/ghodss/yaml v1.0.0 // indirect github.com/gin-contrib/sse v0.1.0 // indirect github.com/git-chglog/git-chglog v0.0.0-20190611050339-63a4e637021f // indirect @@ -68,6 +71,7 @@ require ( github.com/go-redis/redis/v7 v7.4.0 // indirect github.com/go-redis/redis/v8 v8.11.5 // indirect github.com/go-sql-driver/mysql v1.6.0 // indirect + github.com/goccy/go-json v0.10.2 // indirect github.com/golang-jwt/jwt/v4 v4.4.2 // indirect github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect github.com/golang-sql/sqlexp v0.0.0-20170517235910-f1bb20e5a188 // indirect @@ -92,6 +96,7 @@ require ( github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect + github.com/klauspost/cpuid/v2 v2.2.4 // indirect github.com/leodido/go-urn v1.2.4 // indirect github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect github.com/mailru/easyjson v0.7.6 // indirect @@ -106,6 +111,7 @@ require ( github.com/mojocn/base64Captcha v1.3.1 // indirect github.com/nsqio/go-nsq v1.0.8 // indirect github.com/nyaruka/phonenumbers v1.0.55 // indirect + github.com/pelletier/go-toml/v2 v2.0.8 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/prometheus/client_model v0.2.0 // indirect github.com/prometheus/common v0.26.0 // indirect @@ -119,12 +125,14 @@ require ( github.com/tklauser/go-sysconf v0.3.9 // indirect github.com/tklauser/numcpus v0.3.0 // indirect github.com/tsuyoshiwada/go-gitcmd v0.0.0-20180205145712-5f1f5f9475df // indirect + github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.11 // indirect github.com/urfave/cli v1.22.1 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.uber.org/atomic v1.6.0 // indirect go.uber.org/multierr v1.5.0 // indirect go.uber.org/zap v1.15.0 // indirect + golang.org/x/arch v0.3.0 // indirect golang.org/x/image v0.1.0 // indirect golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect golang.org/x/net v0.10.0 // indirect @@ -137,6 +145,7 @@ require ( gopkg.in/AlecAivazis/survey.v1 v1.8.5 // indirect gopkg.in/kyokomi/emoji.v1 v1.5.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect gorm.io/plugin/dbresolver v1.2.2 // indirect ) From e49e47c7a198e35cc2ff904b85d3374326deab72 Mon Sep 17 00:00:00 2001 From: lif <1835304752@qq.com> Date: Fri, 22 Sep 2023 14:02:38 +0800 Subject: [PATCH 2/2] Delete go.mod --- go.mod | 155 --------------------------------------------------------- 1 file changed, 155 deletions(-) delete mode 100644 go.mod diff --git a/go.mod b/go.mod deleted file mode 100644 index 64a4dd13..00000000 --- a/go.mod +++ /dev/null @@ -1,155 +0,0 @@ -module go-admin - -go 1.18 - -require ( - github.com/alibaba/sentinel-golang v1.0.4 - github.com/alibaba/sentinel-golang/pkg/adapters/gin v0.0.0-20220808015021-c5f1f1d055c5 - github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5 - github.com/bitly/go-simplejson v0.5.0 - github.com/bytedance/go-tagexpr/v2 v2.7.12 - github.com/casbin/casbin/v2 v2.51.2 - github.com/gin-gonic/gin v1.9.1 - github.com/go-admin-team/go-admin-core v1.4.1-0.20220809101213-21187928f7d9 - github.com/go-admin-team/go-admin-core/sdk v1.4.1-0.20220809101213-21187928f7d9 - github.com/google/uuid v1.3.0 - github.com/huaweicloud/huaweicloud-sdk-go-obs v3.21.12+incompatible - github.com/mssola/user_agent v0.5.2 - github.com/opentracing/opentracing-go v1.1.0 - github.com/pkg/errors v0.9.1 - github.com/prometheus/client_golang v1.11.1 - github.com/qiniu/go-sdk/v7 v7.11.1 - github.com/robfig/cron/v3 v3.0.1 - github.com/shirou/gopsutil/v3 v3.22.1 - github.com/spf13/cobra v1.0.0 - github.com/swaggo/files v0.0.0-20220728132757-551d4a08d97a - github.com/swaggo/gin-swagger v1.5.0 - github.com/swaggo/swag v1.8.3 - github.com/unrolled/secure v1.0.8 - golang.org/x/crypto v0.9.0 - gorm.io/driver/mysql v1.3.5 - gorm.io/driver/postgres v1.3.8 - gorm.io/driver/sqlite v1.3.6 - gorm.io/driver/sqlserver v1.3.2 - gorm.io/gorm v1.23.8 -) - -require ( - github.com/BurntSushi/toml v0.3.1 // indirect - github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible // indirect - github.com/KyleBanks/depth v1.2.1 // indirect - github.com/PuerkitoBio/purell v1.1.1 // indirect - github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect - github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect - github.com/beorn7/perks v1.0.1 // indirect - github.com/bsm/redislock v0.5.0 // indirect - github.com/bytedance/sonic v1.9.1 // indirect - github.com/casbin/redis-watcher/v2 v2.0.0-20220614104201-0e70bf2be930 // indirect - github.com/cespare/xxhash/v2 v2.1.2 // indirect - github.com/chanxuehong/rand v0.0.0-20201110082127-2f19a1bdd973 // indirect - github.com/chanxuehong/wechat v0.0.0-20201110083048-0180211b69fd // indirect - github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect - github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect - github.com/denisenkom/go-mssqldb v0.12.0 // indirect - github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect - github.com/fatih/color v1.9.0 // indirect - github.com/fsnotify/fsnotify v1.4.9 // indirect - github.com/gabriel-vasile/mimetype v1.4.2 // indirect - github.com/ghodss/yaml v1.0.0 // indirect - github.com/gin-contrib/sse v0.1.0 // indirect - github.com/git-chglog/git-chglog v0.0.0-20190611050339-63a4e637021f // indirect - github.com/go-admin-team/go-admin-core/plugins/logger/zap v0.0.0-20210610020726-2db73adb505d // indirect - github.com/go-admin-team/gorm-adapter/v3 v3.7.8-0.20220809100335-eaf9f67b3d21 // indirect - github.com/go-ole/go-ole v1.2.6 // indirect - github.com/go-openapi/jsonpointer v0.19.5 // indirect - github.com/go-openapi/jsonreference v0.19.6 // indirect - github.com/go-openapi/spec v0.20.4 // indirect - github.com/go-openapi/swag v0.19.15 // indirect - github.com/go-playground/locales v0.14.1 // indirect - github.com/go-playground/universal-translator v0.18.1 // indirect - github.com/go-playground/validator/v10 v10.14.0 // indirect - github.com/go-redis/redis/v7 v7.4.0 // indirect - github.com/go-redis/redis/v8 v8.11.5 // indirect - github.com/go-sql-driver/mysql v1.6.0 // indirect - github.com/goccy/go-json v0.10.2 // indirect - github.com/golang-jwt/jwt/v4 v4.4.2 // indirect - github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect - github.com/golang-sql/sqlexp v0.0.0-20170517235910-f1bb20e5a188 // indirect - github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect - github.com/golang/protobuf v1.5.0 // indirect - github.com/golang/snappy v0.0.1 // indirect - github.com/gorilla/websocket v1.4.2 // indirect - github.com/henrylee2cn/ameda v1.4.10 // indirect - github.com/henrylee2cn/goutil v0.0.0-20210127050712-89660552f6f8 // indirect - github.com/imdario/mergo v0.3.9 // indirect - github.com/inconshreveable/mousetrap v1.0.0 // indirect - github.com/jackc/chunkreader/v2 v2.0.1 // indirect - github.com/jackc/pgconn v1.12.1 // indirect - github.com/jackc/pgio v1.0.0 // indirect - github.com/jackc/pgpassfile v1.0.0 // indirect - github.com/jackc/pgproto3/v2 v2.3.0 // indirect - github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect - github.com/jackc/pgtype v1.11.0 // indirect - github.com/jackc/pgx/v4 v4.16.1 // indirect - github.com/jinzhu/inflection v1.0.0 // indirect - github.com/jinzhu/now v1.1.5 // indirect - github.com/josharian/intern v1.0.0 // indirect - github.com/json-iterator/go v1.1.12 // indirect - github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect - github.com/klauspost/cpuid/v2 v2.2.4 // indirect - github.com/leodido/go-urn v1.2.4 // indirect - github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect - github.com/mailru/easyjson v0.7.6 // indirect - github.com/mattn/go-colorable v0.1.7 // indirect - github.com/mattn/go-isatty v0.0.19 // indirect - github.com/mattn/go-sqlite3 v1.14.12 // indirect - github.com/mattn/goveralls v0.0.2 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect - github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect - github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect - github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/mojocn/base64Captcha v1.3.1 // indirect - github.com/nsqio/go-nsq v1.0.8 // indirect - github.com/nyaruka/phonenumbers v1.0.55 // indirect - github.com/pelletier/go-toml/v2 v2.0.8 // indirect - github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect - github.com/prometheus/client_model v0.2.0 // indirect - github.com/prometheus/common v0.26.0 // indirect - github.com/prometheus/procfs v0.6.0 // indirect - github.com/robinjoseph08/redisqueue/v2 v2.1.0 // indirect - github.com/russross/blackfriday/v2 v2.0.1 // indirect - github.com/shamsher31/goimgext v1.0.0 // indirect - github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect - github.com/spf13/cast v1.3.1 // indirect - github.com/spf13/pflag v1.0.3 // indirect - github.com/tklauser/go-sysconf v0.3.9 // indirect - github.com/tklauser/numcpus v0.3.0 // indirect - github.com/tsuyoshiwada/go-gitcmd v0.0.0-20180205145712-5f1f5f9475df // indirect - github.com/twitchyliquid64/golang-asm v0.15.1 // indirect - github.com/ugorji/go/codec v1.2.11 // indirect - github.com/urfave/cli v1.22.1 // indirect - github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.uber.org/atomic v1.6.0 // indirect - go.uber.org/multierr v1.5.0 // indirect - go.uber.org/zap v1.15.0 // indirect - golang.org/x/arch v0.3.0 // indirect - golang.org/x/image v0.1.0 // indirect - golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect - golang.org/x/net v0.10.0 // indirect - golang.org/x/sync v0.1.0 // indirect - golang.org/x/sys v0.8.0 // indirect - golang.org/x/text v0.9.0 // indirect - golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect - golang.org/x/tools v0.6.0 // indirect - google.golang.org/protobuf v1.30.0 // indirect - gopkg.in/AlecAivazis/survey.v1 v1.8.5 // indirect - gopkg.in/kyokomi/emoji.v1 v1.5.1 // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect - gorm.io/plugin/dbresolver v1.2.2 // indirect -) - -//replace ( -// github.com/go-admin-team/go-admin-core v1.4.0 => ../../go-admin-core -// github.com/go-admin-team/go-admin-core/sdk v1.4.0 => ../../go-admin-core/sdk -//)