Upgrade golang version
This commit is contained in:
CareyWong
parent
7f2b17e14b
commit
b3b1d9ea4f
@ -1,4 +1,4 @@
|
||||
FROM golang:1.13-alpine AS dependencies
|
||||
FROM golang:1.15-alpine AS dependencies
|
||||
WORKDIR /app
|
||||
RUN go env -w GO111MODULE="on" && go env -w GOPROXY="https://goproxy.cn,direct"
|
||||
|
||||
|
||||
10
Makefile
10
Makefile
@ -1,8 +1,8 @@
|
||||
BINARY_DEFAULT="build/myurls.service"
|
||||
BINARY_LINUX="build/linux-amd64-myurls.service"
|
||||
BINARY_DARWIN="build/darwin-amd64-myurls.service"
|
||||
BINARY_WINDOWS="build/windows-amd64-myurls.service"
|
||||
BINARY_ARRCH64="build/arrch64-myurls.service"
|
||||
BINARY_DEFAULT="build/myurls"
|
||||
BINARY_LINUX="build/linux-amd64-myurls"
|
||||
BINARY_DARWIN="build/darwin-amd64-myurls"
|
||||
BINARY_WINDOWS="build/windows-x64-myurls"
|
||||
BINARY_ARRCH64="build/arrch64-myurls"
|
||||
|
||||
GOFILES="main.go"
|
||||
VERSION=1.0.0
|
||||
|
||||
12
README.md
12
README.md
@ -1,6 +1,6 @@
|
||||
# MyUrls
|
||||
|
||||
基于 golang1.13 与 Redis 实现的本地短链接服务，用于缩短请求链接与短链接还原。
|
||||
基于 golang1.15 与 Redis 实现的本地短链接服务，用于缩短请求链接与短链接还原。
|
||||
|
||||
## Table of Contents
|
||||
|
||||
@ -63,7 +63,7 @@ make install
|
||||
生成可执行文件，目录位于 build/ 。默认当前平台，其他平台请参照 Makefile 或执行对应 go build 命令。
|
||||
|
||||
```shell script
|
||||
make
|
||||
bash release.sh
|
||||
```
|
||||
|
||||
## Usage
|
||||
@ -71,9 +71,9 @@ make
|
||||
前往 [Release](https://github.com/CareyWang/MyUrls/releases) 下载对应平台可执行文件。
|
||||
|
||||
```shell script
|
||||
./build/linux-amd64-myurls.service -h
|
||||
./build/linux-amd64-myurls -h
|
||||
|
||||
Usage of ./build/linux-amd64-myurls.service:
|
||||
Usage of ./build/linux-amd64-myurls:
|
||||
-conn string
|
||||
Redis连接，格式: host:port (default "127.0.0.1:6379")
|
||||
-domain string
|
||||
@ -83,13 +83,13 @@ Usage of ./build/linux-amd64-myurls.service:
|
||||
-port int
|
||||
服务端口 (default 8002)
|
||||
-ttl int
|
||||
短链接有效期，单位(天)，默认90天。 (default 90)
|
||||
短链接有效期，单位(天)，默认180天。 (default 180)
|
||||
```
|
||||
|
||||
建议配合 [pm2](https://pm2.keymetrics.io/) 开启守护进程。
|
||||
|
||||
```shell script
|
||||
pm2 start myurls.service --watch --name myurls -- -domain example.com
|
||||
pm2 start myurls --watch --name myurls -- -domain example.com
|
||||
```
|
||||
|
||||
## API
|
||||
|
||||
3
go.sum
3
go.sum
@ -45,11 +45,9 @@ github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVM
|
||||
github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
|
||||
github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
|
||||
golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ=
|
||||
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20191010194322-b09406accb47 h1:/XfQ9z7ib8eEJX2hdgFTZJ/ntt0swNk5oYBziWeTCvY=
|
||||
golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
|
||||
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
@ -57,7 +55,6 @@ gopkg.in/go-playground/assert.v1 v1.2.1 h1:xoYuJVE7KT85PYWrN730RguIQO0ePzVRfFMXa
|
||||
gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
|
||||
gopkg.in/go-playground/validator.v9 v9.29.1 h1:SvGtYmN60a5CVKTOzMSyfzWDeZRxRuGvRQyEAKbw1xc=
|
||||
gopkg.in/go-playground/validator.v9 v9.29.1/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ=
|
||||
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
|
||||
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
|
||||
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
|
||||
31
release.sh
31
release.sh
@ -1,12 +1,37 @@
|
||||
#!/bin/bash
|
||||
|
||||
make install
|
||||
make all
|
||||
|
||||
mkdir -p myurls
|
||||
cp -r public myurls/
|
||||
|
||||
cp build/linux-amd64-myurls.service myurls/
|
||||
# linux-amd64
|
||||
cp build/linux-amd64-myurls myurls/
|
||||
tar -czvf linux-amd64-myurls.tar.gz myurls
|
||||
mv linux-amd64-myurls.tar.gz build/
|
||||
rm build/linux-amd64-myurls
|
||||
rm -rf myurls/*
|
||||
|
||||
tar -czvf linux-amd64.tar.gz myurls
|
||||
mv linux-amd64.tar.gz build/
|
||||
# arrch64
|
||||
cp build/arrch64-myurls myurls/
|
||||
tar -czvf arrch64-myurls.tar.gz myurls
|
||||
mv arrch64-myurls.tar.gz build/
|
||||
rm build/arrch64-myurls
|
||||
rm -rf myurls/*
|
||||
|
||||
# darwin-amd64
|
||||
cp build/darwin-amd64-myurls myurls/
|
||||
tar -czvf darwin-amd64-myurls.tar.gz myurls
|
||||
mv darwin-amd64-myurls.tar.gz build/
|
||||
rm build/darwin-amd64-myurls
|
||||
rm -rf myurls/*
|
||||
|
||||
# windows-x64
|
||||
cp build/windows-x64-myurls myurls/
|
||||
tar -czvf windows-x64-myurls.tar.gz myurls
|
||||
mv windows-x64-myurls.tar.gz build/
|
||||
rm build/windows-x64-myurls
|
||||
rm -rf myurls/*
|
||||
|
||||
rm -rf myurls
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user