From b1d13f4014aa9096d3ebf594323b604c2950bcfc Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 30 Dec 2022 13:53:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5-=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=AE=80=E4=BB=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/AppConfig.js                          |  7 +++----
 src/forge/users/Infos.js                  |  4 +---
 src/forge/users/Personal/Index.jsx        | 13 ++++++-------
 src/modules/user/usersInfo/InfosTopics.js | 11 +----------
 4 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/src/AppConfig.js b/src/AppConfig.js
index e87c10bdf..cf7fe8b6a 100644
--- a/src/AppConfig.js
+++ b/src/AppConfig.js
@@ -2,7 +2,6 @@ import axios from 'axios';
 import { requestProxy } from "./indexEduplus2RequestProxy";
 import { broadcastChannelOnmessage, isDev, queryString } from 'educoder';
 import { notification } from 'antd';
-import cookie from 'react-cookies';
 
 import './index.css';
 
@@ -17,7 +16,7 @@ function locationurl(list) {
   }
 }
 // TODO 开发期多个身份切换
-let debugType = "";
+let debugType = ""
 if (isDev) {
   const _search = window.location.search;
   let parsed = {};
@@ -26,7 +25,7 @@ if (isDev) {
   }
   debugType = window.location.search.indexOf('debug=t') !== -1 ? 'teacher' :
   window.location.search.indexOf('debug=s') !== -1 ? 'student' :
-  window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || ''
+  window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'admin'
 }                 
 window._debugType = debugType;
 export function initAxiosInterceptors(props) {
@@ -70,7 +69,7 @@ export function initAxiosInterceptors(props) {
     if (response.data.status === -1) {
       if (window.location.pathname.startsWith('/tasks/')) {
         props.showSnackbar(response.data.message || '服务器异常，请联系管理员。')
-      } else if(window.location.pathname.startsWith('/login') || window.location.pathname.startsWith('/register') || window.location.pathname.startsWith('/resetPassword') || window.location.pathname.indexOf("/bindlogin/")>-1) {
+      } else if(window.location.pathname.startsWith('/login') || window.location.pathname.startsWith('/register') || window.location.pathname.startsWith('/resetPassword')) {
         return response;
       } else {
         notification.open({
diff --git a/src/forge/users/Infos.js b/src/forge/users/Infos.js
index a703597a1..79b793a08 100644
--- a/src/forge/users/Infos.js
+++ b/src/forge/users/Infos.js
@@ -142,8 +142,6 @@ class Infos extends Component {
     });
     const { current_user } = this.props;
     const { username } = this.props.match.params;
-    const { pathname } = this.props.location;
-    const { notice } = this.state;
 
     let url = `/users/${username || (current_user && current_user.login)}.json`;
     axios.get(url).then((result) => {
@@ -461,7 +459,7 @@ class Infos extends Component {
                   <Route
                     path="/:username"
                     render={(props) => {
-                      return <GeneralView {...this.props} {...this.state} menuKey={menuKey} show_super_description={user && user.show_super_description}/>;
+                      return <GeneralView {...this.props} {...this.state} menuKey={menuKey} show_super_description={user && user.show_super_description} generalFetchUser={this.fetchUser}/>;
                     }}
                   ></Route>
                   {/* <Route
diff --git a/src/forge/users/Personal/Index.jsx b/src/forge/users/Personal/Index.jsx
index b2ab6ea95..53df10c8f 100644
--- a/src/forge/users/Personal/Index.jsx
+++ b/src/forge/users/Personal/Index.jsx
@@ -7,19 +7,18 @@ import { Divider } from 'antd';
 import axios from 'axios';
 
 function Personal(props){
-  const { user ,current_user , resetUserInfo } = props;
+  const { user ,current_user , generalFetchUser } = props;
   const [ edit , setEdit ] = useState(false);
   const [ showedit , setShowEdit ] = useState(false);
   const [ description ,setDescription ] = useState("");
   const [ copyDescription ,setCopyDescription ] = useState("");
-  
   useEffect(()=>{
-    if(current_user && current_user.super_description){
-      setDescription(current_user.super_description);
-      setCopyDescription(current_user.super_description);
+    if(user && user.super_description){
+      setDescription(user.super_description);
+      setCopyDescription(user.super_description);
       setShowEdit(true);
     }
-  },[current_user && current_user.super_description])
+  },[user && user.super_description])
 
   function onContentChange(value){
     setDescription(value);
@@ -52,7 +51,7 @@ function Personal(props){
         setCopyDescription(description);
         setEdit(false);
         setShowEdit(description ?true :false);
-        resetUserInfo && resetUserInfo();
+        generalFetchUser && generalFetchUser();
       }
     })
   }
diff --git a/src/modules/user/usersInfo/InfosTopics.js b/src/modules/user/usersInfo/InfosTopics.js
index 56820fa4a..d80bb0700 100644
--- a/src/modules/user/usersInfo/InfosTopics.js
+++ b/src/modules/user/usersInfo/InfosTopics.js
@@ -1,9 +1,6 @@
 import React, { Component } from 'react';
-import { SnackbarHOC } from 'educoder';
-import {BrowserRouter as Router,Route,Switch,Link} from 'react-router-dom';
-import {Tooltip,Menu,Pagination,Spin, Dropdown,Checkbox} from 'antd';
+import {Menu,Pagination,Spin, Dropdown,Checkbox} from 'antd';
 import axios from 'axios';
-import {getImageUrl,WordsBtn} from 'educoder';
 import moment from 'moment';
 import Modals from '../../modals/Modals';
 import SendTopics from '../../modals/SendTopics'
@@ -313,12 +310,6 @@ class InfosTopics extends Component{
 		let user_type=this.props.current_user&&this.props.current_user.user_identity;
 		let targetuserid=this.props.data&&this.props.data.id;
 
-
-
-		// console.log(is_current)
-		// console.log(current_user)
-		// console.log(current_user.is_teacher)
-		// console.log(current_user.admin)
 		const menu = (
 			<Menu>
 				<Menu.Item onClick={()=>this.updatedlist("updated_at")}>