fix GUI

OpenBMB · Oct 18, 2023 · 1e8a079 · 1e8a079
1 parent 7b5d068
commit 1e8a079
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 19 deletions.
diff --git a/README_ZH.md b/README_ZH.md
@@ -107,8 +107,8 @@ npm install
 npm run dev
 ```
 构建XAgent-Server的docker镜像并启动docker容器。
-您将看到XAgent Server在端口`8000`上监听。
-参考[XAgentServer](XAgentServer/README_ZH.md)获取更多信息。
+您将看到XAgent Server在端口`8090`上监听。
+参考[XAgentServer](XAgentServer/README_zh.md)获取更多信息。
 
 
 <div><a id="Demo"></a></div>

diff --git a/XAgentServer/README_zh.md b/XAgentServer/README_zh.md
@@ -20,7 +20,7 @@ docker-compose build
 cd XAgentServer
 docker-compose up
 ```
-这将启动一个XAgent-Server实例，监听本机`16204`端口，配置信息在`XAgentServer/docker-compose.yml`文件中。
+这将启动一个XAgent-Server实例，监听本机`8090`端口，配置信息在`XAgentServer/docker-compose.yml`文件中。
 
 出现如下输出，就是镜像编译与启动成功了：
 

diff --git a/XAgentServer/docker-compose.yml b/XAgentServer/docker-compose.yml
@@ -10,7 +10,7 @@ services:
       context: ..
       dockerfile: ./XAgentServer/dockerfiles/Dockerfile
     ports:
-      - "8000:8000"
+      - "8090:8090"
     networks:
       - default
     container_name: XAgent-Server  

diff --git a/XAgentServer/dockerfiles/Dockerfile b/XAgentServer/dockerfiles/Dockerfile
@@ -3,7 +3,7 @@
 FROM python:3.10
 
 
-EXPOSE 8000
+EXPOSE 8090
 
 
 RUN pip config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple
@@ -22,6 +22,4 @@ COPY . .
 
 RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-HEALTHCHECK --interval=1s --timeout=10s --retries=3 CMD ["bash", "-c", "curl -sS 'http://localhost:8000/' > /dev/null || exit 1"]
-
 ENTRYPOINT [ "python", "start_server.py" ]
diff --git a/XAgentWeb/src/composables/useApi.ts b/XAgentWeb/src/composables/useApi.ts
@@ -9,7 +9,7 @@ type Result<T> = {
 
 const httpService = axios.create({
   // baseURL: import.meta.env.BASE_URL,
-  baseURL: '',
+  baseURL: 'http://localhost:8090',
   headers: {
     'Content-Type': 'application/x-www-form-urlencoded',
     // 'Content-Type': 'application/json',

diff --git a/app.py b/app.py
@@ -37,6 +37,7 @@
 from XAgentServer.response_body import ResponseBody, WebsocketResponseBody
 from XAgentServer.server import XAgentServer
 from XAgentServer.utils import AutoReplayUtil, ShareUtil
+from fastapi.middleware.cors import CORSMiddleware
 
 
 if not os.path.exists(os.path.join(XAgentServerEnv.base_dir, "logs")):
@@ -142,6 +143,14 @@ async def validation_exception_handler(request: Request, exc: RequestValidationE
         content={"status": "failed", "message": exc.errors()}
     )
 
+app.add_middleware(
+    CORSMiddleware,
+    allow_origins=['*'],
+    allow_credentials=True,
+    allow_methods=["*"],
+    allow_headers=["*"],
+)
+
 
 def check_user_auth(user_id: str = Form(...),
                     token: str = Form(...)):
@@ -155,7 +164,7 @@ def check_user_auth(user_id: str = Form(...),
     return True
 
 
-@app.post("/register")
+@app.post("/api/register")
 async def register(email: str = Form(...),
                    name: str = Form(...),
                    corporation: str = Form(...),
@@ -194,7 +203,7 @@ async def register(email: str = Form(...),
     return ResponseBody(data=user, success=True, message="Register success, we will send a email to you!")
 
 
-@app.get("/auth")
+@app.get("/api/auth")
 async def auth(user_id: str = Query(...),
                token: str = Query(...)) -> ResponseBody:
     """
@@ -224,7 +233,7 @@ async def auth(user_id: str = Query(...),
     return ResponseBody(data=user.to_dict(), success=True, message="auth success")
 
 
-@app.post("/login")
+@app.post("/api/login")
 async def login(email: str = Form(...),
                 token: str = Form(...)) -> ResponseBody:
     """
@@ -245,7 +254,7 @@ async def login(email: str = Form(...),
     return ResponseBody(data=user.to_dict(), success=True, message="login success")
 
 
-@app.post("/check")
+@app.post("/api/check")
 async def check(token: str = Form(...)) -> ResponseBody:
     """
     
@@ -262,7 +271,7 @@ async def check(token: str = Form(...)) -> ResponseBody:
     return ResponseBody(data=check, success=True, message="token is invalid")
 
 
-@app.post("/upload")
+@app.post("/api/upload")
 async def create_upload_files(files: List[UploadFile] = File(...),
                               user_id: str = Form(...),
                               token: str = Form(...)) -> ResponseBody:
@@ -302,7 +311,7 @@ async def create_upload_files(files: List[UploadFile] = File(...),
                         success=True, message="upload success")
 
 
-@app.post("/getUserInteractions")
+@app.post("/api/getUserInteractions")
 async def get_all_interactions(user_id: str = Form(...),
                                token: str = Form(...),
                                page_size: int = Form(...),
@@ -325,7 +334,7 @@ async def get_all_interactions(user_id: str = Form(...),
     return ResponseBody(data=data, success=True, message="success")
 
 
-@app.post("/getSharedInteractions")
+@app.post("/api/getSharedInteractions")
 async def get_all_interactions(user_id: str = Form(...),
                                token: str = Form(...),
                                page_size: int = Form(...),
@@ -339,7 +348,7 @@ async def get_all_interactions(user_id: str = Form(...),
     return ResponseBody(data=data, success=True, message="success")
 
 
-@app.post("/shareInteraction")
+@app.post("/api/shareInteraction")
 async def share_interaction(user_id: str = Form(...),
                             token: str = Form(...),
                             interaction_id: str = Form(...)) -> ResponseBody:
@@ -359,7 +368,7 @@ async def share_interaction(user_id: str = Form(...),
     return ResponseBody(data=interaction.to_dict(), success=flag, message="success!" if flag else "Failed!")
 
 
-@app.post("/deleteInteraction")
+@app.post("/api/deleteInteraction")
 async def get_all_interactions(user_id: str = Form(...),
                                token: str = Form(...),
                                interaction_id: str = Form(...)) -> ResponseBody:
@@ -382,7 +391,7 @@ async def get_all_interactions(user_id: str = Form(...),
     return ResponseBody(data=data, success=True, message="success")
 
 
-@app.post("/updateInteractionConfig")
+@app.post("/api/updateInteractionConfig")
 async def update_interaction_parameter(user_id: str = Form(...),
                                        token: str = Form(...),
                                        mode: str = Form(...),
@@ -418,7 +427,7 @@ async def update_interaction_parameter(user_id: str = Form(...),
     return ResponseBody(data=update_data, success=True, message="success!")
 
 
-@app.post("/updateInteractionDescription")
+@app.post("/api/updateInteractionDescription")
 async def update_interaction_description(user_id: str = Form(...),
                                          token: str = Form(...),
                                          description: str = Form(...),