From 384e40d05b0b5d08e3ab80b2a28da71fb6567757 Mon Sep 17 00:00:00 2001
From: okxlin <okxlin@gmail.com>
Date: Fri, 7 Jul 2023 01:17:56 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=9B=B4=E6=96=B0pandora?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/pandora/1.2.5/.env.sample         |  2 --
 apps/pandora/1.2.5/data.yml            | 14 --------------
 apps/pandora/1.2.5/docker-compose.yml  | 10 ++++++++--
 apps/pandora/latest/.env.sample        |  2 --
 apps/pandora/latest/data.yml           | 14 --------------
 apps/pandora/latest/docker-compose.yml | 10 ++++++++--
 6 files changed, 16 insertions(+), 36 deletions(-)

diff --git a/apps/pandora/1.2.5/.env.sample b/apps/pandora/1.2.5/.env.sample
index c0ba7723..09e15b17 100644
--- a/apps/pandora/1.2.5/.env.sample
+++ b/apps/pandora/1.2.5/.env.sample
@@ -2,5 +2,3 @@ CONTAINER_NAME="pandora"
 PANEL_APP_PORT_HTTP="40040"
 DATA_PATH="./data"
 PROXY=""
-ACCESS_TOKEN=""
-API_KEY=""
diff --git a/apps/pandora/1.2.5/data.yml b/apps/pandora/1.2.5/data.yml
index 8ee33174..8f332d71 100644
--- a/apps/pandora/1.2.5/data.yml
+++ b/apps/pandora/1.2.5/data.yml
@@ -15,20 +15,6 @@ additionalProperties:
           labelZh: 数据文件夹路径
           required: true
           type: text
-        - default: ''
-          edit: true
-          envKey: ACCESS_TOKEN
-          labelEn: OPENAI ACCESS TOKEN (fill in at least one with OPENAI API KEY)
-          labelZh: OPENAI ACCESS TOKEN(与OPENAI API KEY至少填一个)
-          required: false
-          type: text
-        - default: ''
-          edit: true
-          envKey: API_KEY
-          labelEn: OPENAI API KEY (fill in at least one with OPENAI ACCESS TOKEN)
-          labelZh: OPENAI API KEY(与OPENAI ACCESS TOKEN至少填一个)
-          required: false
-          type: text
         - default: ''
           edit: true
           envKey: PROXY
diff --git a/apps/pandora/1.2.5/docker-compose.yml b/apps/pandora/1.2.5/docker-compose.yml
index 1b8f41e0..2133aa1a 100644
--- a/apps/pandora/1.2.5/docker-compose.yml
+++ b/apps/pandora/1.2.5/docker-compose.yml
@@ -9,9 +9,11 @@ services:
       - "${PANEL_APP_PORT_HTTP}:40040"
     volumes:
       - "${DATA_PATH}:/data"
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
     environment:
       # 指定Access Token字符串。
-      - PANDORA_ACCESS_TOKEN=${ACCESS_TOKEN}
+      #- PANDORA_ACCESS_TOKEN=${ACCESS_TOKEN}
       # 指定一个存放多Access Token的文件路径。
       #- PANDORA_TOKENS_FILE=${DATA_PATH}/TOKEN.txt
       # 指定代理，格式：protocol://user:pass@ip:port。
@@ -19,13 +21,17 @@ services:
       # 以http服务方式启动，格式：ip:port
       - PANDORA_SERVER=0.0.0.0:40040
       # 使用gpt-3.5-turboAPI请求，你可能需要向OpenAI支付费用。
-      - PANDORA_API=${API_KEY}
+      #- PANDORA_API=${API_KEY}
       # 启用sentry框架来发送错误报告供作者查错，敏感信息不会被发送。
       #- PANDORA_SENTRY
       # 显示调试信息，且出错时打印异常堆栈信息，供查错使用。
       - PANDORA_VERBOSE
       # 指定服务启动的线程数，默认为 8，Cloud模式为 4。
       - PANDORA_THREADS=4
+      - PANDORA_CLOUD=CLOUD
+      #- OPENAI_EMAIL=${OPENAI_ACCOUNT}
+      #- OPENAI_PASSWORD=${OPENAI_PASSWORD}
+      #- OPENAI_MFA_CODE=${OPENAI_MFA}
     tty: true
     image: pengzhile/pandora:1.2.5
     labels:  
diff --git a/apps/pandora/latest/.env.sample b/apps/pandora/latest/.env.sample
index c0ba7723..09e15b17 100644
--- a/apps/pandora/latest/.env.sample
+++ b/apps/pandora/latest/.env.sample
@@ -2,5 +2,3 @@ CONTAINER_NAME="pandora"
 PANEL_APP_PORT_HTTP="40040"
 DATA_PATH="./data"
 PROXY=""
-ACCESS_TOKEN=""
-API_KEY=""
diff --git a/apps/pandora/latest/data.yml b/apps/pandora/latest/data.yml
index 8ee33174..8f332d71 100644
--- a/apps/pandora/latest/data.yml
+++ b/apps/pandora/latest/data.yml
@@ -15,20 +15,6 @@ additionalProperties:
           labelZh: 数据文件夹路径
           required: true
           type: text
-        - default: ''
-          edit: true
-          envKey: ACCESS_TOKEN
-          labelEn: OPENAI ACCESS TOKEN (fill in at least one with OPENAI API KEY)
-          labelZh: OPENAI ACCESS TOKEN(与OPENAI API KEY至少填一个)
-          required: false
-          type: text
-        - default: ''
-          edit: true
-          envKey: API_KEY
-          labelEn: OPENAI API KEY (fill in at least one with OPENAI ACCESS TOKEN)
-          labelZh: OPENAI API KEY(与OPENAI ACCESS TOKEN至少填一个)
-          required: false
-          type: text
         - default: ''
           edit: true
           envKey: PROXY
diff --git a/apps/pandora/latest/docker-compose.yml b/apps/pandora/latest/docker-compose.yml
index aae0f4c9..0f257f42 100644
--- a/apps/pandora/latest/docker-compose.yml
+++ b/apps/pandora/latest/docker-compose.yml
@@ -9,9 +9,11 @@ services:
       - "${PANEL_APP_PORT_HTTP}:40040"
     volumes:
       - "${DATA_PATH}:/data"
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
     environment:
       # 指定Access Token字符串。
-      - PANDORA_ACCESS_TOKEN=${ACCESS_TOKEN}
+      #- PANDORA_ACCESS_TOKEN=${ACCESS_TOKEN}
       # 指定一个存放多Access Token的文件路径。
       #- PANDORA_TOKENS_FILE=${DATA_PATH}/TOKEN.txt
       # 指定代理，格式：protocol://user:pass@ip:port。
@@ -19,13 +21,17 @@ services:
       # 以http服务方式启动，格式：ip:port
       - PANDORA_SERVER=0.0.0.0:40040
       # 使用gpt-3.5-turboAPI请求，你可能需要向OpenAI支付费用。
-      - PANDORA_API=${API_KEY}
+      #- PANDORA_API=${API_KEY}
       # 启用sentry框架来发送错误报告供作者查错，敏感信息不会被发送。
       #- PANDORA_SENTRY
       # 显示调试信息，且出错时打印异常堆栈信息，供查错使用。
       - PANDORA_VERBOSE
       # 指定服务启动的线程数，默认为 8，Cloud模式为 4。
       - PANDORA_THREADS=4
+      - PANDORA_CLOUD=CLOUD
+      #- OPENAI_EMAIL=${OPENAI_ACCOUNT}
+      #- OPENAI_PASSWORD=${OPENAI_PASSWORD}
+      #- OPENAI_MFA_CODE=${OPENAI_MFA}
     tty: true
     image: pengzhile/pandora:latest
     labels: