From ce237b4d638a1fa770a91e0081b1f0a4a1d981cb Mon Sep 17 00:00:00 2001 From: Michael Li Date: Sat, 7 Oct 2023 23:39:12 +0800 Subject: [PATCH 1/3] update version info --- CHANGELOG.md | 8 +++++++- README.md | 2 +- ROADMAP.md | 2 +- docker-compose.yaml | 2 +- pkg/version/version.go | 4 ++-- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a0ddc7ee..41aa00ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,10 @@ # Changelog All notable changes to paopao-ce are documented in this file. -## 0.5.0+dev ([`dev`](https://github.com/rocboss/paopao-ce/tree/dev)) +## 0.6.0+dev ([`dev`](https://github.com/rocboss/paopao-ce/tree/dev)) +TODO; + +## 0.5.0 ### Added - add `LoggerOpenObserve` feature use OpenObserve to collect log.[#370](https://github.com/rocboss/paopao-ce/pull/370) add `LoggerOpenObserve` to `conf.yaml` 's `Features` section to enable this feature like below: @@ -187,6 +190,9 @@ All notable changes to paopao-ce are documented in this file. ``` - add read more contents support for post card in tweets list. +### Changed +- optimize jwt token generate logic. + ## 0.4.2 ### Fixed - fixed remove multi-objects no effects and occurs resource leak error when use Minio as OSS(Object Storage System).[#371](https://github.com/rocboss/paopao-ce/pull/371) [#372](https://github.com/rocboss/paopao-ce/pull/372) diff --git a/README.md b/README.md index 39874ff9..69a5c860 100644 --- a/README.md +++ b/README.md @@ -288,7 +288,7 @@ make run TAGS='docs' ```sh cp config.yaml.sample config.yaml vim config.yaml # 修改参数 -paopao-ce +paopao serve ``` 配置文件中的 `Features` 小节是声明paopao-ce运行时开启哪些功能项: diff --git a/ROADMAP.md b/ROADMAP.md index 564278ed..b45e21df 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -56,7 +56,7 @@ ## paopao-ce-plus roadmap #### paopao-ce-plus/v0.5.0 -* [ ] adapt for paopao-ce v0.4.0 +* [x] adapt for paopao-ce v0.5.0 #### paopao-ce-plus/v0.4.0 * [x] adapt for paopao-ce v0.4.0 diff --git a/docker-compose.yaml b/docker-compose.yaml index 9cada34c..3536580f 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -124,7 +124,7 @@ services: # - paopao-network backend: - image: bitbus/paopao-ce:0.5.0-rc + image: bitbus/paopao-ce:0.5 restart: always depends_on: - db diff --git a/pkg/version/version.go b/pkg/version/version.go index 93c5806d..86491239 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -9,7 +9,7 @@ import ( ) const ( - series = "v0.5.0-rc" + series = "v0.5" ) var ( @@ -28,7 +28,7 @@ type BuildInfo struct { } func VersionInfo() string { - return fmt.Sprintf("paopao %s (build:%s %s)", series, commitID, buildDate) + return fmt.Sprintf("paopao %s (build:%s %s)", version, commitID, buildDate) } func ReadBuildInfo() *BuildInfo { From 9306c431d02fa986934660b3eab95bb731976819 Mon Sep 17 00:00:00 2001 From: Michael Li Date: Sat, 7 Oct 2023 23:59:59 +0800 Subject: [PATCH 2/3] update default.pgo --- default.pgo | Bin 16492 -> 18500 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/default.pgo b/default.pgo index 38d83f51e6d43876ca494ec757fd2908cfd92cbb..ff77ea1456ff403fad86a65510c7e5c190faefed 100644 GIT binary patch literal 18500 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 literal 16492 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 Date: Sun, 8 Oct 2023 00:31:28 +0800 Subject: [PATCH 3/3] update docker-compose.yaml --- docker-compose.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 9bfdb4ef..fdaabe0a 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -33,7 +33,7 @@ services: # - paopao-network # redis: - # image: redis:7.0-alpine + # image: redis:7.2.1-alpine # restart: always # ports: # - 6379:6379 @@ -41,7 +41,7 @@ services: # - paopao-network redis: - image: redis/redis-stack:7.2.0-RC3 + image: redis/redis-stack:7.2.0-v2 restart: always ports: - 6379:6379 @@ -67,7 +67,7 @@ services: # - paopao-network meili: - image: getmeili/meilisearch:v1.3 + image: getmeili/meilisearch:v1.4 restart: always ports: - 7700:7700 @@ -78,13 +78,13 @@ services: networks: - paopao-network - meilisearch-ui: - image: riccoxie/meilisearch-ui:latest - restart: always - ports: - - 24900:24900 - networks: - - paopao-network + # meilisearch-ui: + # image: riccoxie/meilisearch-ui:latest + # restart: always + # ports: + # - 24900:24900 + # networks: + # - paopao-network # openobserve: # image: public.ecr.aws/zinclabs/openobserve:latest