diff --git a/src/App.vue b/src/App.vue
index fe2cee7ce8ac59cd55f0d53a0eb095e94b6f1955..be3f6372895482072cc3e459b12f3b2cdc84b077 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,8 @@
 <template>
   <router-view/>
   <div class="container ivu-p">
+    <span style="color:chartreuse;">用户：</span> 
+    <Button type="large" class="ivu-ml" icon="md-log-out" :disabled="loading" @click="username">当前用户</Button>  
     <div class="dialog">
       <template v-for="(item, index) in dialogs" :key="index">
         <div class="dialog-item" :class="{ 'dialog-item-me': item.role === 'me', 'dialog-item-ai': item.role === 'ai' }">
@@ -21,6 +23,10 @@
         <Col>
           <Button size="large" class="ivu-ml" icon="md-arrow-up" :disabled="loading" @click="handleExportChat">导出</Button>
         </Col>
+        <Col>
+          <Button type="large" class="ivu-ml" icon="md-log-out" :disabled="loading" @click="logout">退出</Button> 
+        </Col>
+ 
       </Row>
     </div>
   </div>
@@ -28,6 +34,7 @@
 <script>
 import { fetchEventSource } from '@microsoft/fetch-event-source';
 import { apiKey, apiUrl } from './api';
+import axios from 'axios'
 
 export default {
   data() {
@@ -117,6 +124,27 @@ export default {
         return;
       }
       alert(JSON.stringify(this.dialogs));         
+    },
+    logout(){
+      axios({          
+                method: "get",
+                url: "https://flask-wujiaping.inscode.cc/logout",               
+              }).then((res) => {
+                console.log(res.data)
+                if(200==res.data['code']){
+                  this.$router.push("/login");
+                }else{
+                  alert(res.data['msg']);
+                }    
+            });
+    },
+    username(){
+      axios({          
+                method: "get",
+                url: "https://flask-wujiaping.inscode.cc/username",               
+              }).then((res) => {
+                console.log(res.data)  
+            });
     }
 
   }
diff --git a/src/plugins/axiosInstance.js b/src/plugins/axiosInstance.js
index 50a23839abd870dc99a4f68ca7024d5d8198eecf..7fc3ddba0984f9307b36ea59137fed023ec770f1 100644
--- a/src/plugins/axiosInstance.js
+++ b/src/plugins/axiosInstance.js
@@ -3,7 +3,8 @@ import axios from 'axios'
 
 //使用axios下面的create([config])方法创建axios实例，其中config参数为axios最基本的配置信息。
 const API = axios.create({
-	baseUrl:'https://flask-wujiaping.inscode.cc/' //请求后端数据的基本地址，自定义
+	baseUrl:'https://flask-wujiaping.inscode.cc/', //请求后端数据的基本地址，自定义
+	changeOrigin:true
 })
 
 //导出我们建立的axios实例模块，ES6 export用法
diff --git a/src/router/index.js b/src/router/index.js
index bf01878406d716eb0b0c376b07d6b9445210519a..38ff110e6c7c19350cec6587ff7741b8727f573a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,6 +1,4 @@
 import { createRouter, createWebHistory } from 'vue-router'
-import App from '../App.vue'
-
 const routes = [
     {
         path: '/login',
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 9c3ca395f981ae9338e68ce341d7e4008d9db499..0b355b1feef0c063f4c521d2b382ffd7eab266ca 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -11,7 +11,8 @@
           <label for="password">密&nbsp&nbsp&nbsp&nbsp码：</label>
           <input type="password" id="password" v-model="loginForm.password" />
         </div>
-        <button type="button" @click="login" style="background-color: aqua;width: 60px;">登录</button>
+        <button type="button" @click="login" style="background-color: aqua;width: 60px;">登录</button>&nbsp&nbsp&nbsp&nbsp
+        <button type="button" @click="regist" style="background-color: aqua;width: 60px;">注册</button>
       </form>
     </div> 
   </div>
@@ -28,25 +29,29 @@
         };  
     },  
     methods: { 
-      login() {
+        login() {
           //判读账号密码是否输入，没有则alert 出来
           if (this.loginForm.username === "" || this.loginForm.password === "") {
             alert("账号或密码不能为空");      
           } else { 
             axios({          
                 method: "post",
-                url: "/login",
+                url: "https://flask-wujiaping.inscode.cc/login",               
                 data: this.loginForm,
               }).then((res) => {
-                  alert(res.data);      
+                console.log(res.data)
+                if(200==res.data['code']){
                   this.$router.push("/");
-                  // alert("登陆成功");     
-              }).catch((error) => { 
-                  alert("账号或密码错误");   
-                });
-              }    
-            },  
-          },
+                }else{
+                  alert(res.data['msg']);
+                }    
+            });
+          }    
+        }, 
+        regist() {
+          this.$router.push("/register");
+        }, 
+    },
   };
 </script>
 <style>
diff --git a/src/views/Register.vue b/src/views/Register.vue
index 8a18b5ff2c1a808977dfeaea11debe5fe93ffa15..42d1330cbc41c4f0f9bf1be4c9fc1f5a3a3298d6 100644
--- a/src/views/Register.vue
+++ b/src/views/Register.vue
@@ -4,11 +4,11 @@
       <h2 style="color:greenyellow;">注&nbsp&nbsp&nbsp&nbsp册</h2>
       <form>
         <div class="input-group">
-          <label for="new_username">用户名：</label>
+          <label for="username">用户名：</label>
           <input type="text" id="username" v-model="registerForm.username" />
         </div>
         <div class="input-group">
-          <label for="new_password">密&nbsp&nbsp&nbsp&nbsp码：</label>
+          <label for="password">密&nbsp&nbsp&nbsp&nbsp码：</label>
           <input type="password" id="password" v-model="registerForm.password" />
         </div>
         <button type="button" @click="register" style="background-color: aqua;width: 60px;">注册</button>
@@ -17,7 +17,7 @@
   </div>
 </template>
 <script>
-  // import { axios } from 'axios'
+  import axios from 'axios'
   export default {  
     data() { 
         return {
@@ -30,24 +30,24 @@
     methods: { 
       register() {
           //判读账号密码是否输入，没有则alert 出来
-          // if (this.loginForm.username === "" || this.loginForm.password === "") {
-          //   alert("账号或密码不能为空");      
-          // } else { 
-          //   axios({          
-          //       method: "post",
-          //       url: "https://flask-wujiaping.inscode.cc/register",
-          //       data: this.loginForm,
-          //     }).then((res) => {
-          //         console.log(res.data);      
-          //         this.$router.push("/home");
-          //         alert("登陆成功");     
-          //     }).catch((error) => { 
-          //         alert("账号或密码错误");   
-          //         console.log(error);
-          //       });
-          //     }    
-            },  
-          },
+          if (this.registerForm.username === "" || this.registerForm.password === "") {
+            alert("注册账号或密码不能为空");      
+          } else { 
+            axios({          
+                method: "post",
+                url: "https://flask-wujiaping.inscode.cc/register",
+                data: this.registerForm,
+              }).then((res) => {
+                  if(200==res.data['code']){
+                    this.$router.push("/login"); 
+                    alert("请使用刚注册的账号进行登录")
+                  }else{
+                    alert(res.data['msg'])
+                  }                      
+              });
+            }    
+          },  
+        },
   };
 </script>
 <style>