fix docker golang version issue

madneal · madneal · commit edcaf84bed12 · 2025-02-24T22:22:48.000+08:00
diff --git a/server/deploy/scan/Dockerfile b/server/deploy/scan/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20 as builder
+FROM golang:1.22 as builder
 
 ENV GSHARK_CONFIG=config.docker.yaml
 WORKDIR /go/src/github.com/madneal/gshark/server
diff --git a/server/deploy/serve/Dockerfile b/server/deploy/serve/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20 as builder
+FROM golang:1.22 as builder
 
 ENV GSHARK_CONFIG=config.docker.yaml
 WORKDIR /go/src/github.com/madneal/gshark/server
diff --git a/server/go.mod b/server/go.mod
@@ -1,8 +1,6 @@
 module github.com/madneal/gshark
 
-go 1.21
-
-toolchain go1.22.5
+go 1.22
 
 require (
 	github.com/casbin/casbin v1.9.1
@@ -17,7 +15,6 @@ require (
 	github.com/google/go-github/v57 v57.0.0
 	github.com/google/uuid v1.6.0
 	github.com/gookit/color v1.3.1
-	github.com/jordan-wright/email v0.0.0-20200824153738-3f5bafa1cd84
 	github.com/lestrrat-go/file-rotatelogs v2.3.0+incompatible
 	github.com/mojocn/base64Captcha v1.3.6
 	github.com/parnurzeal/gorequest v0.2.16
diff --git a/server/go.sum b/server/go.sum
@@ -281,8 +281,6 @@ github.com/jinzhu/now v1.1.1 h1:g39TucaRWyV3dwDO++eEc6qf8TVIQ/Da48WmqjZ3i7E=
 github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
-github.com/jordan-wright/email v0.0.0-20200824153738-3f5bafa1cd84 h1:pS0A6cr4aHYZnYwC7Uw+rwgb39+nzkm2QhwZ+S6Gn5I=
-github.com/jordan-wright/email v0.0.0-20200824153738-3f5bafa1cd84/go.mod h1:1c7szIrayyPPB/987hsnvNzLushdWf4o/79s3P08L8A=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
diff --git a/server/service/ai.go b/server/service/ai.go
@@ -98,6 +98,5 @@ func handleResponse(respBody []byte) (string, error) {
 		return "", fmt.Errorf("no choices found in response")
 	}
 
-	// 返回第一个 choice 的 message content
 	return res.Choices[0].Message.Content, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM golang:1.20 as builder`
	`1`	`+FROM golang:1.22 as builder`
`2`	`2`
`3`	`3`	`ENV GSHARK_CONFIG=config.docker.yaml`
`4`	`4`	`WORKDIR /go/src/github.com/madneal/gshark/server`
-Original file line number
+Diff line change
@@ @@ -1,8 +1,6 @@ @@
 module github.com/madneal/gshark
 -go 1.21
+-
 -toolchain go1.22.5
 +go 1.22
 require (
 	github.com/casbin/casbin v1.9.1
 	github.com/google/go-github/v57 v57.0.0
 	github.com/google/uuid v1.6.0
 	github.com/gookit/color v1.3.1
 -	github.com/jordan-wright/email v0.0.0-20200824153738-3f5bafa1cd84
 	github.com/lestrrat-go/file-rotatelogs v2.3.0+incompatible
 	github.com/mojocn/base64Captcha v1.3.6
 	github.com/parnurzeal/gorequest v0.2.16
Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,5 @@ func handleResponse(respBody []byte) (string, error) {`
`98`	`98`	`return "", fmt.Errorf("no choices found in response")`
`99`	`99`	`}`
`100`	`100`
`101`		`- // 返回第一个 choice 的 message content`
`102`	`101`	`return res.Choices[0].Message.Content, nil`
`103`	`102`	`}`