msb-public
/
paopao-ce
mirror of https://github.com/rocboss/paopao-ce
1
0
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' into x/docker

Browse Source
pull/455/head
Michael Li 2 years ago
parent 31ef659cf7 6368518d51
commit 35c2c14ec3
No known key found for this signature in database
19 changed files with 58 additions and 1755 deletions
Show Stats Download Patch File Download Diff File

2
auto/api/m/v1/user.go
Unescape View File

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

2
auto/api/r/v1/user.go
Unescape View File

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

2
auto/api/s/v1/user.go
Unescape View File

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

2
auto/api/v1/admin.go
Unescape View File

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

2
auto/api/v1/alipay_priv.go
Unescape View File

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

2
auto/api/v1/alipay_pub.go
Unescape View File

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

2
auto/api/v1/core.go
Unescape View File

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

2
auto/api/v1/followship.go
Unescape View File

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

2
auto/api/v1/friendship.go
Unescape View File

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

2
auto/api/v1/loose.go
Unescape View File

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

2
auto/api/v1/priv.go
Unescape View File

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

2
auto/api/v1/pub.go
Unescape View File

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

2
auto/api/v1/relax.go
Unescape View File

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

2
auto/api/v1/site.go
Unescape View File

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

2
auto/api/v1/trends.go
Unescape View File

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

2
auto/api/x/v1/user.go
Unescape View File

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

16
docker-compose.yaml
Unescape View File

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

18
go.mod
Unescape View File

@ -4,9 +4,9 @@ go 1.20
require ( require (
github.com/Masterminds/semver/v3 v3.2.1 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/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/alimy/tryst v0.10.1
github.com/aliyun/aliyun-oss-go-sdk v3.0.1+incompatible github.com/aliyun/aliyun-oss-go-sdk v3.0.1+incompatible
github.com/allegro/bigcache/v3 v3.1.0 github.com/allegro/bigcache/v3 v3.1.0
@ -22,7 +22,7 @@ require (
github.com/goccy/go-json v0.10.2 github.com/goccy/go-json v0.10.2
github.com/gofrs/uuid/v5 v5.0.0 github.com/gofrs/uuid/v5 v5.0.0
github.com/golang-jwt/jwt/v5 v5.2.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/huaweicloud/huaweicloud-sdk-go-obs v3.23.9+incompatible
github.com/json-iterator/go v1.1.12 github.com/json-iterator/go v1.1.12
github.com/meilisearch/meilisearch-go v0.26.0 github.com/meilisearch/meilisearch-go v0.26.0
@ -37,12 +37,12 @@ require (
github.com/smartwalle/alipay/v3 v3.2.20 github.com/smartwalle/alipay/v3 v3.2.20
github.com/sourcegraph/conc v0.3.0 github.com/sourcegraph/conc v0.3.0
github.com/spf13/cobra v1.8.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/tencentyun/cos-go-sdk-v5 v0.7.45
github.com/yinheli/mahonia v0.0.0-20131226213531-0eef680515cc github.com/yinheli/mahonia v0.0.0-20131226213531-0eef680515cc
go.uber.org/automaxprocs v1.5.3 go.uber.org/automaxprocs v1.5.3
google.golang.org/grpc v1.60.0 google.golang.org/grpc v1.60.1
google.golang.org/protobuf v1.31.0 google.golang.org/protobuf v1.32.0
gopkg.in/natefinch/lumberjack.v2 v2.2.1 gopkg.in/natefinch/lumberjack.v2 v2.2.1
gopkg.in/resty.v1 v1.12.0 gopkg.in/resty.v1 v1.12.0
gorm.io/driver/mysql v1.5.2 gorm.io/driver/mysql v1.5.2
@ -57,7 +57,7 @@ require (
require ( require (
github.com/andybalholm/brotli v1.0.5 // indirect github.com/andybalholm/brotli v1.0.5 // indirect
github.com/beorn7/perks v1.0.1 // 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/cespare/xxhash/v2 v2.2.0 // indirect
github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
github.com/chenzhuoyu/iasm v0.9.0 // 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/pretty v0.3.1 // indirect
github.com/kr/text v0.2.0 // indirect github.com/kr/text v0.2.0 // indirect
github.com/leodido/go-urn v1.2.4 // 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/magiconair/properties v1.8.7 // indirect
github.com/mailru/easyjson v0.7.7 // indirect github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.13 // 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/atomic v1.9.0 // indirect
go.uber.org/multierr v1.9.0 // indirect go.uber.org/multierr v1.9.0 // indirect
golang.org/x/arch v0.5.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/exp v0.0.0-20230905200255-921286631fa9 // indirect
golang.org/x/image v0.0.0-20210216034530-4410531fe030 // indirect golang.org/x/image v0.0.0-20210216034530-4410531fe030 // indirect
golang.org/x/mod v0.13.0 // indirect golang.org/x/mod v0.13.0 // indirect

1747
go.sum
View File

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