Merge branch 'dev' into x/docker

pull/455/head
Michael Li 2 years ago
commit 35c2c14ec3
No known key found for this signature in database

@ -1,6 +1,6 @@
// Code generated by go-mir. DO NOT EDIT.
// versions:
// - mir v4.0.0
// - mir v4.1.0
package v1

@ -1,6 +1,6 @@
// Code generated by go-mir. DO NOT EDIT.
// versions:
// - mir v4.0.0
// - mir v4.1.0
package v1

@ -1,6 +1,6 @@
// Code generated by go-mir. DO NOT EDIT.
// versions:
// - mir v4.0.0
// - mir v4.1.0
package v1

@ -1,6 +1,6 @@
// Code generated by go-mir. DO NOT EDIT.
// versions:
// - mir v4.0.0
// - mir v4.1.0
package v1

@ -1,6 +1,6 @@
// Code generated by go-mir. DO NOT EDIT.
// versions:
// - mir v4.0.0
// - mir v4.1.0
package v1

@ -1,6 +1,6 @@
// Code generated by go-mir. DO NOT EDIT.
// versions:
// - mir v4.0.0
// - mir v4.1.0
package v1

@ -1,6 +1,6 @@
// Code generated by go-mir. DO NOT EDIT.
// versions:
// - mir v4.0.0
// - mir v4.1.0
package v1

@ -1,6 +1,6 @@
// Code generated by go-mir. DO NOT EDIT.
// versions:
// - mir v4.0.0
// - mir v4.1.0
package v1

@ -1,6 +1,6 @@
// Code generated by go-mir. DO NOT EDIT.
// versions:
// - mir v4.0.0
// - mir v4.1.0
package v1

@ -1,6 +1,6 @@
// Code generated by go-mir. DO NOT EDIT.
// versions:
// - mir v4.0.0
// - mir v4.1.0
package v1

@ -1,6 +1,6 @@
// Code generated by go-mir. DO NOT EDIT.
// versions:
// - mir v4.0.0
// - mir v4.1.0
package v1

@ -1,6 +1,6 @@
// Code generated by go-mir. DO NOT EDIT.
// versions:
// - mir v4.0.0
// - mir v4.1.0
package v1

@ -1,6 +1,6 @@
// Code generated by go-mir. DO NOT EDIT.
// versions:
// - mir v4.0.0
// - mir v4.1.0
package v1

@ -1,6 +1,6 @@
// Code generated by go-mir. DO NOT EDIT.
// versions:
// - mir v4.0.0
// - mir v4.1.0
package v1

@ -1,6 +1,6 @@
// Code generated by go-mir. DO NOT EDIT.
// versions:
// - mir v4.0.0
// - mir v4.1.0
package v1

@ -1,6 +1,6 @@
// Code generated by go-mir. DO NOT EDIT.
// versions:
// - mir v4.0.0
// - mir v4.1.0
package v1

@ -2,7 +2,7 @@ version: '3.1'
services:
db:
image: mysql:8.0
image: mysql:${MYSQL_TAG:-8.0}
restart: always
environment:
MYSQL_DATABASE: paopao
@ -33,7 +33,7 @@ services:
# - paopao-network
# redis:
# image: redis:7.2.1-alpine
# image: redis:${REDIS_TAG:-7.2.1-alpine}
# restart: always
# ports:
# - 6379:6379
@ -41,7 +41,7 @@ services:
# - paopao-network
redis:
image: redis/redis-stack:7.2.0-v2
image: redis/redis-stack:${REDIS_STACK_TAG:-7.2.0-v6}
restart: always
ports:
- 6379:6379
@ -67,7 +67,7 @@ services:
# - paopao-network
meili:
image: getmeili/meilisearch:v1.4
image: getmeili/meilisearch:${MEILI_TAG:-v1.5}
restart: always
ports:
- 7700:7700
@ -87,7 +87,7 @@ services:
# - paopao-network
# openobserve:
# image: public.ecr.aws/zinclabs/openobserve:latest
# image: public.ecr.aws/zinclabs/openobserve:${OPENOBSERVE_TAG:-latest}
# restart: always
# ports:
# - 5080:5080
@ -101,7 +101,7 @@ services:
# - paopao-network
# pyroscope:
# image: pyroscope/pyroscope:latest
# image: pyroscope/pyroscope:${PYROSCOPE_TAG:-latest}
# restart: always
# ports:
# - 4040:4040
@ -111,7 +111,7 @@ services:
# - paopao-network
# phpmyadmin:
# image: phpmyadmin:5.2
# image: phpmyadmin:${PHPMYADMIN_TAG:-5.2}
# depends_on:
# - db
# ports:
@ -124,7 +124,7 @@ services:
# - paopao-network
backend:
image: bitbus/paopao-ce:nightly
image: bitbus/paopao-ce:${PAOPAOCE_TAG:-nightly}
restart: always
depends_on:
- db

@ -4,9 +4,9 @@ go 1.20
require (
github.com/Masterminds/semver/v3 v3.2.1
github.com/RoaringBitmap/roaring v1.6.0
github.com/RoaringBitmap/roaring v1.7.0
github.com/afocus/captcha v0.0.0-20191010092841-4bd1f21c8868
github.com/alimy/mir/v4 v4.0.0
github.com/alimy/mir/v4 v4.1.0-beta.1
github.com/alimy/tryst v0.10.1
github.com/aliyun/aliyun-oss-go-sdk v3.0.1+incompatible
github.com/allegro/bigcache/v3 v3.1.0
@ -22,7 +22,7 @@ require (
github.com/goccy/go-json v0.10.2
github.com/gofrs/uuid/v5 v5.0.0
github.com/golang-jwt/jwt/v5 v5.2.0
github.com/golang-migrate/migrate/v4 v4.15.2
github.com/golang-migrate/migrate/v4 v4.17.0
github.com/huaweicloud/huaweicloud-sdk-go-obs v3.23.9+incompatible
github.com/json-iterator/go v1.1.12
github.com/meilisearch/meilisearch-go v0.26.0
@ -37,12 +37,12 @@ require (
github.com/smartwalle/alipay/v3 v3.2.20
github.com/sourcegraph/conc v0.3.0
github.com/spf13/cobra v1.8.0
github.com/spf13/viper v1.18.1
github.com/spf13/viper v1.18.2
github.com/tencentyun/cos-go-sdk-v5 v0.7.45
github.com/yinheli/mahonia v0.0.0-20131226213531-0eef680515cc
go.uber.org/automaxprocs v1.5.3
google.golang.org/grpc v1.60.0
google.golang.org/protobuf v1.31.0
google.golang.org/grpc v1.60.1
google.golang.org/protobuf v1.32.0
gopkg.in/natefinch/lumberjack.v2 v2.2.1
gopkg.in/resty.v1 v1.12.0
gorm.io/driver/mysql v1.5.2
@ -57,7 +57,7 @@ require (
require (
github.com/andybalholm/brotli v1.0.5 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bits-and-blooms/bitset v1.2.0 // indirect
github.com/bits-and-blooms/bitset v1.12.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
github.com/chenzhuoyu/iasm v0.9.0 // indirect
@ -99,7 +99,7 @@ require (
github.com/kr/pretty v0.3.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/leodido/go-urn v1.2.4 // indirect
github.com/lib/pq v1.10.0 // indirect
github.com/lib/pq v1.10.9 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
@ -138,7 +138,7 @@ require (
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.9.0 // indirect
golang.org/x/arch v0.5.0 // indirect
golang.org/x/crypto v0.16.0 // indirect
golang.org/x/crypto v0.17.0 // indirect
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
golang.org/x/image v0.0.0-20210216034530-4410531fe030 // indirect
golang.org/x/mod v0.13.0 // indirect

1747
go.sum

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save