diff --git a/.github/workflows/dockerToHub-dev.yml b/.github/workflows/dockerToHub-dev.yml index 56cb8f194..a6e224ed2 100644 --- a/.github/workflows/dockerToHub-dev.yml +++ b/.github/workflows/dockerToHub-dev.yml @@ -62,15 +62,13 @@ jobs: script: | mkdir -p /data/test/ChatGPT-Next-Web cd /data/test/ChatGPT-Next-Web - echo "${{ secrets.DOCKER_ENV }}" >> .env + echo "${{ secrets.DOCKER_ENV }}" > .env echo "PORT=23001" >> .env # 测试分支, echo "COMPOSE_PROJECT_NAME=test-chatgpt-web" >> .env sed -i 's@image: registry.cn-hangzhou.aliyuncs.com/si-private/chatgpt-next-web@image: registry.cn-hangzhou.aliyuncs.com/si-private/chatgpt-next-web:test@g' docker-compose.yml echo ${{ secrets.ALY_DOCKER_PASSWORD }} | docker login registry.cn-hangzhou.aliyuncs.com -u ${{ secrets.ALY_DOCKER_USERNAME }} --password-stdin - #sed -i 's|23000:|23001:|g' docker-compose.yml sed -i 's|container_name:|#container_name:|g' docker-compose.yml - #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/* || true diff --git a/app/app/(auth)/login/set-password/page.tsx b/app/app/(auth)/login/set-password/page.tsx index 5a2bb22e3..6f75dab7c 100644 --- a/app/app/(auth)/login/set-password/page.tsx +++ b/app/app/(auth)/login/set-password/page.tsx @@ -48,7 +48,7 @@ export default function SetPasswordPage() { if (result["result"] == "ok") { signOut({ redirect: true, callbackUrl: "/login" }); } - console.log("--------", result); + // console.log("--------", result); }); }; diff --git a/app/client/api.ts b/app/client/api.ts index 86fbecd0b..b6002e85b 100644 --- a/app/client/api.ts +++ b/app/client/api.ts @@ -205,6 +205,6 @@ export function useGetMidjourneySelfProxyUrl(url: string) { const accessStore = useAccessStore.getState(); console.log("useMjImgSelfProxy", accessStore.useMjImgSelfProxy); - console.log("---------", url); + // console.log("---------", url); return url.replace("cdn.discordapp.com", "cdnig.duckagi.com"); } diff --git a/app/components/chat.tsx b/app/components/chat.tsx index b6abe9273..ae0ad1d39 100644 --- a/app/components/chat.tsx +++ b/app/components/chat.tsx @@ -105,6 +105,8 @@ import { useAllModels } from "../utils/hooks"; import { MultimodalContent } from "../client/api"; // import { getTokenLength } from "@/lib/utils"; import VoiceInput from "./voice-input"; +import { Progress, Tooltip } from "antd"; +import { white } from "kleur/colors"; // import GptPrompts from "./gpt-prompts"; // const VoiceInput = dynamic( // () => import('@/app/components/voice-input'), { ssr: false }); @@ -1281,7 +1283,7 @@ function _Chat() { }) .then((response) => response.json()) .then((result) => { - console.log("请求成功,", result); + // console.log("请求成功,", result); localStorage.setItem( "current_day_token", result["result"]["current_token"], @@ -1333,11 +1335,29 @@ function _Chat() { {!session.topic ? DEFAULT_TOPIC : session.topic}