Merge branch '2024-editor-server' into editor-blender

NTUEELightDance · Feb 4, 2024 · 68809aa · 68809aa
2 parents f1d589c + f067b96
commit 68809aa
Show file tree

Hide file tree

Showing 71 changed files with 4,683 additions and 40,438 deletions.
diff --git a/dev.docker-compose.yml b/dev.docker-compose.yml
@@ -4,14 +4,10 @@ services:
     image: redis
     ports:
       - "6379:6379"
-    volumes:
-      - ./data/redisData:/data
   mysql:
     image: mysql:8.1.0
     environment:
       MYSQL_DATABASE: editor
       MYSQL_ROOT_PASSWORD: password
     ports:
       - "3306:3306"
-    volumes:
-      - ./data/mysql:/var/lib/mysql
diff --git a/editor-server/Cargo.lock b/editor-server/Cargo.lock
diff --git a/editor-server/Cargo.toml b/editor-server/Cargo.toml
@@ -21,6 +21,7 @@ futures-core = "0.3.28"
 futures-util = "0.3.28"
 http = "0.2.7"
 itertools = "0.12.0"
+indicatif = { version = "*" }
 once_cell = "1.18.0"
 redis = { version = "0.23.3", features = ["tokio-comp"] }
 serde = "1.0.188"