From e8ec65dec2e099ecc37d74f3fd5ca1cd3992cb35 Mon Sep 17 00:00:00 2001
From: wsczx <wsc@wsczx.com>
Date: Fri, 30 Sep 2022 20:00:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0Go=E7=89=88=E6=9C=AC=E4=B8=BA?=
=?UTF-8?q?1.18?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.github/workflows/go.yml | 2 +-
Dockerfile | 2 +-
README.md | 2 +-
server/go.mod | 41 ++++++++++++++++++++++++++++++++++++----
4 files changed, 40 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index cb040e7..5f64d25 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -16,7 +16,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v2
with:
- go-version: 1.16
+ go-version: 1.18
id: go
- name: Check out code into the Go module directory
diff --git a/Dockerfile b/Dockerfile
index cec779e..6459d68 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ RUN yarn install \
&& ls /web/ui
# server
-FROM golang:1.17-alpine as builder_golang
+FROM golang:1.18-alpine as builder_golang
#TODO 本地打包时使用镜像
ENV GOPROXY=https://goproxy.io
ENV GOOS=linux
diff --git a/README.md b/README.md
index 4e87f8c..40767af 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@ AnyLink 服务端仅在 CentOS 7、Ubuntu 18.04 测试通过，如需要安装
### 自行编译安装
-> 需要提前安装好 golang >= 1.17 和 nodejs >= 14.x 和 yarn >= v1.22.x
+> 需要提前安装好 golang >= 1.18 和 nodejs >= 14.x 和 yarn >= v1.22.x
```shell
git clone https://github.com/bjdgyc/anylink.git
diff --git a/server/go.mod b/server/go.mod
index 8343fc5..d51cee6 100644
--- a/server/go.mod
+++ b/server/go.mod
@@ -1,9 +1,8 @@
module github.com/bjdgyc/anylink
-go 1.16
+go 1.18
require (
- github.com/StackExchange/wmi v1.2.1 // indirect
github.com/go-ldap/ldap v3.0.3+incompatible
github.com/go-sql-driver/mysql v1.6.0
github.com/gocarina/gocsv v0.0.0-20220712153207-8b2118da4570
@@ -24,13 +23,47 @@ require (
github.com/spf13/cobra v1.2.1
github.com/spf13/viper v1.8.1
github.com/stretchr/testify v1.7.0
- github.com/tklauser/go-sysconf v0.3.7 // indirect
github.com/xhit/go-simple-mail/v2 v2.10.0
github.com/xlzd/gotp v0.0.0-20181030022105-c8557ba2c119
golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
- gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect
layeh.com/radius v0.0.0-20210819152912-ad72663a72ab
xorm.io/xorm v1.2.2
)
+
+require (
+ github.com/StackExchange/wmi v1.2.1 // indirect
+ github.com/davecgh/go-spew v1.1.1 // indirect
+ github.com/felixge/httpsnoop v1.0.1 // indirect
+ github.com/fsnotify/fsnotify v1.4.9 // indirect
+ github.com/go-ole/go-ole v1.2.5 // indirect
+ github.com/goccy/go-json v0.7.4 // indirect
+ github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db // indirect
+ github.com/hashicorp/hcl v1.0.0 // indirect
+ github.com/inconshreveable/mousetrap v1.0.0 // indirect
+ github.com/json-iterator/go v1.1.11 // indirect
+ github.com/magiconair/properties v1.8.5 // indirect
+ github.com/mitchellh/mapstructure v1.4.1 // indirect
+ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+ github.com/modern-go/reflect2 v1.0.1 // indirect
+ github.com/pelletier/go-toml v1.9.3 // indirect
+ github.com/pion/transport v0.13.0 // indirect
+ github.com/pion/udp v0.1.1 // indirect
+ github.com/pmezard/go-difflib v1.0.0 // indirect
+ github.com/spf13/afero v1.6.0 // indirect
+ github.com/spf13/cast v1.3.1 // indirect
+ github.com/spf13/jwalterweatherman v1.1.0 // indirect
+ github.com/spf13/pflag v1.0.5 // indirect
+ github.com/subosito/gotenv v1.2.0 // indirect
+ github.com/syndtr/goleveldb v1.0.0 // indirect
+ github.com/tklauser/go-sysconf v0.3.7 // indirect
+ github.com/tklauser/numcpus v0.2.3 // indirect
+ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
+ golang.org/x/text v0.3.7 // indirect
+ gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect
+ gopkg.in/ini.v1 v1.62.0 // indirect
+ gopkg.in/yaml.v2 v2.4.0 // indirect
+ gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+ xorm.io/builder v0.3.9 // indirect
+)