Merge branch 'x/gorm' into x/sqlx

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)  

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运行时开启哪些功能项:

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
@@ -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

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 {