Merge branch 'main' of https://github.com/lobehub/lobe-chat

Ericiyo · Jan 28, 2025 · 01380a2 · 01380a2
2 parents fdd5b65 + 789da45
commit 01380a2
Show file tree

Hide file tree

Showing 98 changed files with 1,139 additions and 657 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,131 @@
 
 # Changelog
 
+### [Version 1.49.3](https://github.com/lobehub/lobe-chat/compare/v1.49.2...v1.49.3)
+
+<sup>Released on **2025-01-27**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fix discover ssr hydration error.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Fix discover ssr hydration error, closes [#5605](https://github.com/lobehub/lobe-chat/issues/5605) ([e3702a6](https://github.com/lobehub/lobe-chat/commit/e3702a6))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+### [Version 1.49.2](https://github.com/lobehub/lobe-chat/compare/v1.49.1...v1.49.2)
+
+<sup>Released on **2025-01-27**</sup>
+
+#### ♻ Code Refactoring
+
+- **misc**: Remove use query.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **misc**: Remove use query, closes [#5604](https://github.com/lobehub/lobe-chat/issues/5604) ([58c60de](https://github.com/lobehub/lobe-chat/commit/58c60de))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+### [Version 1.49.1](https://github.com/lobehub/lobe-chat/compare/v1.49.0...v1.49.1)
+
+<sup>Released on **2025-01-27**</sup>
+
+#### ♻ Code Refactoring
+
+- **misc**: UseMobileWorkspace use nqus to replace useQuery.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **misc**: UseMobileWorkspace use nqus to replace useQuery, closes [#5603](https://github.com/lobehub/lobe-chat/issues/5603) ([70e5272](https://github.com/lobehub/lobe-chat/commit/70e5272))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+## [Version 1.49.0](https://github.com/lobehub/lobe-chat/compare/v1.48.4...v1.49.0)
+
+<sup>Released on **2025-01-27**</sup>
+
+#### ✨ Features
+
+- **misc**: Support Doubao Models.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's improved
+
+- **misc**: Support Doubao Models, closes [#5481](https://github.com/lobehub/lobe-chat/issues/5481) ([d8afe47](https://github.com/lobehub/lobe-chat/commit/d8afe47))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+### [Version 1.48.4](https://github.com/lobehub/lobe-chat/compare/v1.48.3...v1.48.4)
+
+<sup>Released on **2025-01-27**</sup>
+
+#### 💄 Styles
+
+- **misc**: Improve thinking style.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Styles
+
+- **misc**: Improve thinking style, closes [#5602](https://github.com/lobehub/lobe-chat/issues/5602) ([d4dc3f2](https://github.com/lobehub/lobe-chat/commit/d4dc3f2))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 1.48.3](https://github.com/lobehub/lobe-chat/compare/v1.48.2...v1.48.3)
 
 <sup>Released on **2025-01-26**</sup>

diff --git a/changelog/v1.json b/changelog/v1.json
@@ -1,4 +1,39 @@
 [
+  {
+    "children": {
+      "fixes": ["Fix discover ssr hydration error."]
+    },
+    "date": "2025-01-27",
+    "version": "1.49.3"
+  },
+  {
+    "children": {
+      "improvements": ["Remove use query."]
+    },
+    "date": "2025-01-27",
+    "version": "1.49.2"
+  },
+  {
+    "children": {
+      "improvements": ["UseMobileWorkspace use nqus to replace useQuery."]
+    },
+    "date": "2025-01-27",
+    "version": "1.49.1"
+  },
+  {
+    "children": {
+      "features": ["Support Doubao Models."]
+    },
+    "date": "2025-01-27",
+    "version": "1.49.0"
+  },
+  {
+    "children": {
+      "improvements": ["Improve thinking style."]
+    },
+    "date": "2025-01-27",
+    "version": "1.48.4"
+  },
   {
     "children": {
       "improvements": ["Improve model pricing with CNY."]

diff --git a/docker-compose/local/setup.sh b/docker-compose/local/setup.sh
@@ -287,18 +287,27 @@ generate_key() {
 
 echo $(show_message "security_secrect_regenerate")
 
+# check operating system
+if [[ "$OSTYPE" == "darwin"* ]]; then
+    # macOS
+    SED_COMMAND="sed -i ''"
+else
+    # not macOS
+    SED_COMMAND="sed -i"
+fi
+
 # Generate CASDOOR_SECRET
 CASDOOR_SECRET=$(generate_key 32)
 if [ $? -ne 0 ]; then
   echo $(show_message "security_secrect_regenerate_failed") "CASDOOR_SECRET"
 else
   # Search and replace the value of CASDOOR_SECRET in .env
-  sed -i "s#^AUTH_CASDOOR_SECRET=.*#AUTH_CASDOOR_SECRET=${CASDOOR_SECRET}#" .env
+  $SED_COMMAND "s#^AUTH_CASDOOR_SECRET=.*#AUTH_CASDOOR_SECRET=${CASDOOR_SECRET}#" .env
   if [ $? -ne 0 ]; then
     echo $(show_message "security_secrect_regenerate_failed") "AUTH_CASDOOR_SECRET in \`.env\`"
   fi
   # replace `clientSecrect` in init_data.json
-  sed -i "s#dbf205949d704de81b0b5b3603174e23fbecc354#${CASDOOR_SECRET}#" init_data.json
+  $SED_COMMAND "s#dbf205949d704de81b0b5b3603174e23fbecc354#${CASDOOR_SECRET}#" init_data.json
   if [ $? -ne 0 ]; then
     echo $(show_message "security_secrect_regenerate_failed") "AUTH_CASDOOR_SECRET in \`init_data.json\`"
   fi
@@ -311,7 +320,7 @@ if [ $? -ne 0 ]; then
   echo $(show_message "security_secrect_regenerate_failed") "CASDOOR_PASSWORD"
 else
   # replace `password` in init_data.json
-  sed -i "s/"123"/${CASDOOR_PASSWORD}/" init_data.json
+  $SED_COMMAND "s/"123"/${CASDOOR_PASSWORD}/" init_data.json
   if [ $? -ne 0 ]; then
     echo $(show_message "security_secrect_regenerate_failed") "CASDOOR_PASSWORD in \`init_data.json\`"
   fi
@@ -325,7 +334,7 @@ fi
 #  echo $(show_message "security_secrect_regenerate_failed") "S3_SECRET_ACCESS_KEY"
 #else
 #  # Search and replace the value of S3_SECRET_ACCESS_KEY in .env
-#  sed -i "s#^S3_SECRET_ACCESS_KEY=.*#S3_SECRET_ACCESS_KEY=${S3_SECRET_ACCESS_KEY}#" .env
+#  $SED_COMMAND "s#^S3_SECRET_ACCESS_KEY=.*#S3_SECRET_ACCESS_KEY=${S3_SECRET_ACCESS_KEY}#" .env
 #  if [ $? -ne 0 ]; then
 #    echo $(show_message "security_secrect_regenerate_failed") "S3_SECRET_ACCESS_KEY in \`.env\`"
 #  fi
@@ -334,12 +343,12 @@ fi
 # Modify the .env file if the host is specified
 if [ -n "$HOST" ]; then
   # Modify env
-  sed -i "s/localhost/$HOST/g" .env
+  $SED_COMMAND "s/localhost/$HOST/g" .env
   if [ $? -ne 0 ]; then
     echo $(show_message "security_secrect_regenerate_failed") "HOST in \`.env\`"
   fi
   # Modify casdoor init data
-  sed -i "s/localhost/$HOST/g" init_data.json
+  $SED_COMMAND "s/localhost/$HOST/g" init_data.json
   if [ $? -ne 0 ]; then
     echo $(show_message "security_secrect_regenerate_failed") "HOST in \`init_data.json\`"
   fi
@@ -363,3 +372,4 @@ print_centered "docker compose up -d" "green"
 printf "\n%s" "$(show_message "tips_show_documentation")"
 printf "%s\n" $(show_message "tips_show_documentation_url")
 printf "\n\e[33m%s\e[0m\n" "$(show_message "tips_warning")"
+