Procházet zdrojové kódy

fix: xorm配置时间不支持

dcsunny před 1 rokem
rodič
revize
846b7543aa
3 změnil soubory, kde provedl 12 přidání a 8 odebrání
  1. 6 6
      go.mod
  2. 6 0
      go.sum
  3. 0 2
      internal/data/models/init.go

+ 6 - 6
go.mod

@@ -5,24 +5,24 @@ go 1.22
 replace git.ikuban.com/server/wxbot-protobuf => ../wxbot-protobuf
 
 require (
-	git.ikuban.com/server/kratos-nacos v0.0.3-0.20230903092115-1336ceec1a33
-	git.ikuban.com/server/kratos-utils v0.0.0-20240312070215-4376c1cec6cb
+	git.ikuban.com/server/kratos-nacos v0.0.3-0.20240116032932-3978258b8abd
+	git.ikuban.com/server/kratos-utils v0.0.0-20240516092009-15043ba9f479
 	git.ikuban.com/server/wxbot-protobuf v0.0.0-20240308032250-64d40217d9e5
 	git.ikuban.com/server/yaml v0.0.0-20210719032106-8dade6555fff
-	github.com/go-kratos/kratos/v2 v2.7.0
+	github.com/go-kratos/kratos/v2 v2.7.2
 	github.com/go-sql-driver/mysql v1.7.0
 	github.com/google/wire v0.5.0
 	github.com/gorilla/handlers v1.5.1
 	github.com/redis/go-redis/v9 v9.5.1
 	go.mongodb.org/mongo-driver v1.9.0
-	google.golang.org/grpc v1.56.1
+	google.golang.org/grpc v1.56.3
 	google.golang.org/protobuf v1.31.0
 	xorm.io/xorm v1.3.8
 )
 
 require (
 	git.ikuban.com/server/json v0.0.0-20210408053838-50ac5ceda83a // indirect
-	github.com/aliyun/alibaba-cloud-sdk-go v1.61.1704 // indirect
+	github.com/aliyun/alibaba-cloud-sdk-go v1.61.1800 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/buger/jsonparser v1.1.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
@@ -47,7 +47,7 @@ require (
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/nacos-group/nacos-sdk-go/v2 v2.2.3 // indirect
+	github.com/nacos-group/nacos-sdk-go/v2 v2.2.5 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_golang v1.12.2 // indirect

+ 6 - 0
go.sum

@@ -35,9 +35,11 @@ git.ikuban.com/server/json v0.0.0-20210408053838-50ac5ceda83a h1:2OcIUm+cnO7dbUN
 git.ikuban.com/server/json v0.0.0-20210408053838-50ac5ceda83a/go.mod h1:tRbbUpdE5PLoYhhkgt+XjE4RiydCsgm2r/Vjq/LtZic=
 git.ikuban.com/server/kratos-nacos v0.0.3-0.20230903092115-1336ceec1a33 h1:b+0d4e7MgE08+IQQstSLioWZLPEYI5QE58OFuWleDi0=
 git.ikuban.com/server/kratos-nacos v0.0.3-0.20230903092115-1336ceec1a33/go.mod h1:qDEvnthV884eX4nfBGtiis+Kvl231yMKUby4v1x2qqs=
+git.ikuban.com/server/kratos-nacos v0.0.3-0.20240116032932-3978258b8abd/go.mod h1:Qsamk3NJcyVu9wF6Whcmmqgaa2JV+0XpwWGfVRSUUWI=
 git.ikuban.com/server/kratos-utils v0.0.0-20230907062941-d03617343cce h1:eUvDsRx6eI06r67Sj4pwDo+PKcS2p7Bm3hU98S581v8=
 git.ikuban.com/server/kratos-utils v0.0.0-20230907062941-d03617343cce/go.mod h1:CqO5vWbqOIntL/M0KmXQbw4DsC450nahTqTpj67Wv7E=
 git.ikuban.com/server/kratos-utils v0.0.0-20240312070215-4376c1cec6cb/go.mod h1:CqO5vWbqOIntL/M0KmXQbw4DsC450nahTqTpj67Wv7E=
+git.ikuban.com/server/kratos-utils v0.0.0-20240516092009-15043ba9f479/go.mod h1:+PwkaIhdeSBFfeEB6hZmii1iwbUtLXSfZLvTSrtiaH0=
 git.ikuban.com/server/yaml v0.0.0-20210719032106-8dade6555fff h1:xSIp7ZogcAJzz2RX7GR/GnYAYVxcpfJBNYLPPPbfwhM=
 git.ikuban.com/server/yaml v0.0.0-20210719032106-8dade6555fff/go.mod h1:2ZHLT7OIh3MIL6ewDi92rR2exskWTVqufF4l/QPssW0=
 gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:lSA0F4e9A2NcQSqGqTOXqu2aRi/XEQxDCBwM8yJtE6s=
@@ -52,6 +54,7 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRF
 github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
 github.com/aliyun/alibaba-cloud-sdk-go v1.61.1704 h1:PpfENOj/vPfhhy9N2OFRjpue0hjM5XqAp2thFmkXXIk=
 github.com/aliyun/alibaba-cloud-sdk-go v1.61.1704/go.mod h1:RcDobYh8k5VP6TNybz9m++gL3ijVI5wueVr0EM10VsU=
+github.com/aliyun/alibaba-cloud-sdk-go v1.61.1800/go.mod h1:RcDobYh8k5VP6TNybz9m++gL3ijVI5wueVr0EM10VsU=
 github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
@@ -108,6 +111,7 @@ github.com/go-kratos/aegis v0.2.0 h1:dObzCDWn3XVjUkgxyBp6ZeWtx/do0DPZ7LY3yNSJLUQ
 github.com/go-kratos/aegis v0.2.0/go.mod h1:v0R2m73WgEEYB3XYu6aE2WcMwsZkJ/Rzuf5eVccm7bI=
 github.com/go-kratos/kratos/v2 v2.7.0 h1:9DaVgU9YoHPb/BxDVqeVlVCMduRhiSewG3xE+e9ZAZ8=
 github.com/go-kratos/kratos/v2 v2.7.0/go.mod h1:CPn82O93OLHjtnbuyOKhAG5TkSvw+mFnL32c4lZFDwU=
+github.com/go-kratos/kratos/v2 v2.7.2/go.mod h1:rppuc8+pGL2UtXA29bgFHWKqaaF6b6GB2XIYiDvFBRk=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
@@ -248,6 +252,7 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/nacos-group/nacos-sdk-go/v2 v2.2.3 h1:sUQx4f1bXDeeOOEQZjGAitzxYApbYY9fVDbxVCaBW+I=
 github.com/nacos-group/nacos-sdk-go/v2 v2.2.3/go.mod h1:UL4U89WYdnyajgKJUMpuT1Rr6iNmbjrxOO40JRgtA00=
+github.com/nacos-group/nacos-sdk-go/v2 v2.2.5/go.mod h1:OObBon0prVJVPoIbSZxpEkFiBfL0d1LcBtuAMiNn+8c=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -604,6 +609,7 @@ google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM
 google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/grpc v1.56.1 h1:z0dNfjIl0VpaZ9iSVjA6daGatAYwPGstTjt5vkRMFkQ=
 google.golang.org/grpc v1.56.1/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s=
+google.golang.org/grpc v1.56.3/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=

+ 0 - 2
internal/data/models/init.go

@@ -2,7 +2,6 @@ package models
 
 import (
 	"database/sql"
-	"time"
 
 	"xorm.io/xorm/names"
 
@@ -24,7 +23,6 @@ func NewMysql(source string, logger log.Logger) (*Mysql, error) {
 	if err != nil {
 		return nil, err
 	}
-	orm.TZLocation, _ = time.LoadLocation("Asia/Shanghai")
 	orm.SetMapper(names.LintGonicMapper)
 	m := &Mysql{
 		XDB: orm,