From 6406ffe9a33260a49c5df0061091918e8b152878 Mon Sep 17 00:00:00 2001
From: sijinhui <sijinhui@qq.com>
Date: Sat, 13 Apr 2024 20:09:08 +0800
Subject: [PATCH] optimize

---
 .github/workflows/dockerToHub-dev.yml | 8 ++++----
 .github/workflows/dockerToHub.yml     | 4 ++--
 package.json                          | 1 +
 start.sh                              | 7 +++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/dockerToHub-dev.yml b/.github/workflows/dockerToHub-dev.yml
index bfbc8021a..053e289b1 100644
--- a/.github/workflows/dockerToHub-dev.yml
+++ b/.github/workflows/dockerToHub-dev.yml
@@ -72,8 +72,8 @@ jobs:
             docker network ls | grep -qw chatgpt-ns || docker network create chatgpt-ns
             docker-compose pull && docker-compose up -d
             yes | docker image prune
-            rm -rf /www/server/nginx/proxy_cache_dir/*
-            rm -rf /www/server/nginx/proxy_temp_dir/*
+            rm -rf /www/server/nginx/proxy_cache_dir/* || true
+            rm -rf /www/server/nginx/proxy_temp_dir/* || true
 
 
       - name: Sync repository to xy-nm
@@ -103,7 +103,7 @@ jobs:
             docker network ls | grep -qw chatgpt-ns || docker network create chatgpt-ns
             docker-compose pull && docker-compose up -d
             yes | docker image prune
-            rm -rf /www/server/nginx/proxy_cache_dir/*
-            rm -rf /www/server/nginx/proxy_temp_dir/*
+            rm -rf /www/server/nginx/proxy_cache_dir/* || true
+            rm -rf /www/server/nginx/proxy_temp_dir/* || true
 
 
diff --git a/.github/workflows/dockerToHub.yml b/.github/workflows/dockerToHub.yml
index 69c473933..fdb730139 100644
--- a/.github/workflows/dockerToHub.yml
+++ b/.github/workflows/dockerToHub.yml
@@ -73,8 +73,8 @@ jobs:
             docker network ls | grep -qw chatgpt-ns || docker network create chatgpt-ns
             docker-compose pull && docker-compose up -d
             yes | docker image prune
-            rm -rf /www/server/nginx/proxy_cache_dir/*
-            rm -rf /www/server/nginx/proxy_temp_dir/*
+            rm -rf /www/server/nginx/proxy_cache_dir/* || true
+            rm -rf /www/server/nginx/proxy_temp_dir/* || true
             sleep 2
             #tccli cdn PurgePathCache --cli-unfold-argument --Paths '${{ secrets.WEB_URL }}' --FlushType delete
   deploy-ty:
diff --git a/package.json b/package.json
index d6140e629..4baeb9bf1 100644
--- a/package.json
+++ b/package.json
@@ -50,6 +50,7 @@
     "remark-gfm": "^4.0.0",
     "remark-math": "^6.0.0",
     "sass": "^1.70.0",
+    "sharp": "^0.33.3",
     "spark-md5": "^3.0.2",
     "tailwind-merge": "^2.2.1",
     "tiktoken": "^1.0.13",
diff --git a/start.sh b/start.sh
index 6bfd086b8..272a992a8 100755
--- a/start.sh
+++ b/start.sh
@@ -10,10 +10,9 @@ yarn config delete sharp_binary_host
 yarn config delete sharp_libvips_binary_host
 
 #yarn cache clean
-# sharp
-yarn global add sharp
-
-yarn install
+#yarn install
+npm i -g cnpm
+cnpm i
 yarn run build
 
 mkdir -p "./node_modules/tiktoken"