diff --git a/public/react/src/modules/developer/components/myMonacoEditor/index.js b/public/react/src/modules/developer/components/myMonacoEditor/index.js
index 930561e37..c2f3cafd8 100644
--- a/public/react/src/modules/developer/components/myMonacoEditor/index.js
+++ b/public/react/src/modules/developer/components/myMonacoEditor/index.js
@@ -9,15 +9,13 @@
 import './index.scss';
 import React, { useState, useRef, useEffect } from 'react';
 import { Drawer, Tooltip, Badge } from 'antd';
-import { fromStore, CNotificationHOC } from 'educoder'; 
+import { fromStore, CNotificationHOC } from 'educoder';
 import { connect } from 'react-redux';
 import MonacoEditor from '@monaco-editor/react';
 import SettingDrawer from '../../components/monacoSetting';
 import CONST from '../../../../constants';
 import MyIcon from '../../../../common/components/MyIcon';
 
-// import actions from '../../../../redux/actions';
-
 const { fontSetting, opacitySetting } = CONST;
 const maps = {
   'c': 'main.c',
@@ -26,15 +24,15 @@ const maps = {
   'python': 'main.py'
 };
 
-function MyMonacoEditor (props, ref) {
+function MyMonacoEditor(props, ref) {
 
   const {
     code,
     notice,
-    language, 
+    language,
     identifier,
     hadCodeUpdate,
-    showOrHideControl, 
+    showOrHideControl,
     // saveUserInputCode,
     onCodeChange,
     onRestoreInitialCode,
@@ -50,13 +48,13 @@ function MyMonacoEditor (props, ref) {
   const [theme, setTheme] = useState(() => { // 主题 theme
     return fromStore('oj_theme') || 'dark';
   });
-  const [ height, setHeight ] = useState('calc(100% - 56px)');
+  const [height, setHeight] = useState('calc(100% - 56px)');
   const editorRef = useRef(null);
 
   // useEffect(() => {
   //   setEditCode(props.code || '');
   // }, [props]);
-  
+
   useEffect(() => {
     setHeight(showOrHideControl ? 'calc(100% - 378px)' : 'calc(100% - 56px)');
   }, [showOrHideControl]);
@@ -78,45 +76,38 @@ function MyMonacoEditor (props, ref) {
     setTheme(value);
   }
 
-    // 文本框内容变化时，记录文本框内容
-  const handleEditorChange = (origin, monaco) => {
+  // 文本框内容变化时，记录文本框内容
+  const handleEditorChange = (_, monaco) => {
     editorRef.current = monaco; // 获取当前monaco实例
-    // setEditCode(origin); // 保存编辑器初始值
-    editorRef.current.onDidChangeModelContent(e => { // 监听编辑器内容的变化
-      // TODO 需要优化 节流
-      const val = editorRef.current.getValue();
-      // setEditCode(val);
-      // console.log('编辑器代码====>>>>', val);
-      onCodeChange(val);
-      // 值一变化保存当前代码值
-      // saveUserInputCode(val);
-    });
   }
 
+  useEffect(() => {
+    if (editorRef.current) {
+      editorRef.current.onDidChangeModelContent(e => { // 监听编辑器内容的变化
+        const val = editorRef.current.getValue();
+        onCodeChange(val);
+      });
+    }
+  }, [
+    editorRef.current
+  ])
+
   // 配置编辑器属性
   const editorOptions = {
     selectOnLineNumbers: true,
     automaticLayout: true,
     fontSize: `${fontSize}px`
   }
-  
+
   // 恢复初始代码
   const handleRestoreCode = () => {
     props.confirm({
       title: '提示',
       content: '确定要恢复代码吗?',
-      onOk () {
+      onOk() {
         onRestoreInitialCode && onRestoreInitialCode();
       }
     })
-    // Modal.confirm({
-    //   content: '确定要恢复代码吗?',
-    //   okText: '确定',
-    //   cancelText: '取消',
-    //   onOk () {
-    //     onRestoreInitialCode && onRestoreInitialCode();
-    //   }
-    // })
   }
 
   const handleUpdateNotice = () => {
@@ -124,49 +115,38 @@ function MyMonacoEditor (props, ref) {
       onUpdateNotice && onUpdateNotice();
     }
   }
-  
-  // const renderRestore = identifier ? (
-  //   <MyIcon type="iconzaicizairu" />
-  // ) : '';
 
-  // lex_has_save ${hadCodeUpdate} ? : ''
   const _classnames = hadCodeUpdate ? `flex_strict flex_has_save` : 'flex_strict';
   return (
     <React.Fragment>
       <div className={"monaco_editor_area"}>
         <div className="code_title">
           {/* 未保存时 ? '学员初始代码文件' : main.x */}
-          <span className='flex_strict' style={{ color: '#ddd'}}>{identifier ? language ? maps[language.toLowerCase()] : '' : '学员初始代码文件'}</span>
+          <span className='flex_strict' style={{ color: '#ddd' }}>{identifier ? language ? maps[language.toLowerCase()] : '' : '学员初始代码文件'}</span>
           <span className={_classnames}>{hadCodeUpdate ? '已保存' : ''}</span>
-          {/* <Tooltip
-            style={{ background: 'gold' }}
-            className="tooltip_style"
-            title="通知" 
-            placement="bottom"
-          > */}
           <Tooltip
             placement="bottom"
             title="通知"
           >
-            <Badge 
-              className="flex_normal" 
-              style={{ color: '#666'}} 
+            <Badge
+              className="flex_normal"
+              style={{ color: '#666' }}
               dot={notice}
               onClick={handleUpdateNotice}
             >
               {/* <Icon type="bell" /> */}
-              <MyIcon type="iconxiaoxi1" style={{fontSize: '18px'}}/>
+              <MyIcon type="iconxiaoxi1" style={{ fontSize: '18px' }} />
             </Badge>
           </Tooltip>
           <Tooltip
             placement="bottom"
             title="恢复"
           >
-            <MyIcon 
-              className="flex_normal" 
-              onClick={handleRestoreCode} 
+            <MyIcon
+              className="flex_normal"
+              onClick={handleRestoreCode}
               type="iconzaicizairu"
-              style={{ display: identifier ? 'inline-block' : 'none', fontSize: '18px'}}
+              style={{ display: identifier ? 'inline-block' : 'none', fontSize: '18px' }}
             />
             {/* <span onClick={handleRestoreCode} className="flex_normal"  style={{ display: identifier ? 'inline-block' : 'none'}}>{renderRestore}</span> */}
           </Tooltip>
@@ -174,18 +154,18 @@ function MyMonacoEditor (props, ref) {
             placement="bottom"
             title="设置"
           >
-            <MyIcon className='code-icon' type="iconshezhi" onClick={handleShowDrawer} style={{fontSize: '18px'}}/>
+            <MyIcon className='code-icon' type="iconshezhi" onClick={handleShowDrawer} style={{ fontSize: '18px' }} />
           </Tooltip>
         </div>
         <MonacoEditor
-            height={height}
-            width="100%"
-            language={language && language.toLowerCase()}
-            value={code || ''}
-            options={editorOptions}
-            theme={theme} // dark || light
-            editorDidMount={handleEditorChange}
-          />
+          height={height}
+          width="100%"
+          language={language && language.toLowerCase()}
+          value={code || ''}
+          options={editorOptions}
+          theme={theme} // dark || light
+          editorDidMount={handleEditorChange}
+        />
       </div>
 
       <Drawer
@@ -194,12 +174,12 @@ function MyMonacoEditor (props, ref) {
         onClose={handleDrawerClose}
         visible={showDrawer}
       >
-        <SettingDrawer 
-          {...fontSetting} 
+        <SettingDrawer
+          {...fontSetting}
           onChangeFontSize={handleChangeFontSize}
           onChangeTheme={handleChangeTheme}
         />
-        <SettingDrawer {...opacitySetting}/>
+        <SettingDrawer {...opacitySetting} />
       </Drawer>
     </React.Fragment>
   )
@@ -212,12 +192,6 @@ const mapStateToProps = (state) => {
   }
 };
 
-// const mapDispatchToProps = (dispatch) => ({
-//   // saveUserInputCode: (code) => dispatch(actions.saveUserInputCode(code)),
-// });
-
-// MyMonacoEditor = React.forwardRef(MyMonacoEditor);
 export default connect(
   mapStateToProps,
-  // mapDispatchToProps
-)(CNotificationHOC() (MyMonacoEditor));
+)(CNotificationHOC()(MyMonacoEditor));
diff --git a/public/react/src/modules/developer/newOrEditTask/index.js b/public/react/src/modules/developer/newOrEditTask/index.js
index b95668413..43cad6106 100644
--- a/public/react/src/modules/developer/newOrEditTask/index.js
+++ b/public/react/src/modules/developer/newOrEditTask/index.js
@@ -8,23 +8,19 @@
 import './index.scss';
 import React, { useEffect } from 'react';
 import { connect } from 'react-redux';
-import SplitPane from 'react-split-pane';// import { Form } from 'antd';
+import SplitPane from 'react-split-pane';
 import { Button } from 'antd';
 import LeftPane from './leftpane';
 import RightPane from './rightpane';
 import { withRouter } from 'react-router';
 import { toStore, CNotificationHOC } from 'educoder';
 import UserInfo from '../components/userInfo';
-// import RightPane from './rightpane/index';
 import actions from '../../../redux/actions';
-// import {ModalConfirm} from '../../../common/components/ModalConfirm';
 
 const NewOrEditTask = (props) => {
   const {
     publishLoading,
     handlePublish,
-    // testCases = [],
-    // ojTestCaseValidate = [],
     identifier,
     isPublish,
     userInfo,
@@ -38,15 +34,10 @@ const NewOrEditTask = (props) => {
     getQuestion,
     saveSearchParams,
     setOjInitialValue,
-    courseQuestions
-    // updateTestAndValidate,
   } = props;
 
-  // 表单提交
   const handleSubmitForm = () => {
-    // 改变loading状态
     changeSubmitLoadingStatus(true);
-    // 调用输入表单验证功能
     if (props.identifier) {
       props.handleUpdateOjForm(props);
     } else {
@@ -54,12 +45,10 @@ const NewOrEditTask = (props) => {
     }
   };
 
+  const id = props.match.params.id;
   useEffect(() => {
     // 获取用户信息
     getUserInfoForNew();
-    // console.log('获取路由参数： ====', props.match.params);
-    const id = props.match.params.id;
-    // 保存OJForm的id号，指明是编辑还是新增
     props.saveOJFormId(id);
     // 获取地址栏查询参数
     const $searchs = window.location.search && window.location.search.substring(1);
@@ -80,21 +69,16 @@ const NewOrEditTask = (props) => {
           tag_discipline_id: tag_arrs
         });
       }
-      saveSearchParams({searchParams: $searchs, curPage: obj['pages']});
+      saveSearchParams({ searchParams: $searchs, curPage: obj['pages'] });
     }
     // 获取课程列表
     getQuestion({
       source: 'question'
     });
     if (id) { // id号即 identifier
-      // TODO id 存在时, 编辑, 获取 store 中的记录数
       props.getOJFormById(id);
-    } else {
-      // 清空store中的测试用例集合
-      // props.clearOJFormStore();
     }
-    return () => {}
-  }, []);
+  }, [id])
 
   // 模拟挑战
   const imitationChallenge = () => {
@@ -107,11 +91,9 @@ const NewOrEditTask = (props) => {
   // 开始挑战
   const startChallenge = () => {
     // 调用 start 接口, 成功后跳转到开启实战
-    // TODO
     identifier && validateOjForm(props, 'challenge', () => {
       startProgramQuestion(identifier, props);
     });
-    // identifier && startProgramQuestion(identifier, props);
   }
 
   // 取消
@@ -120,20 +102,15 @@ const NewOrEditTask = (props) => {
     props.clearOJFormStore();
     // 清空描述信息
     toStore('oj_description', '');
-    // props.history.push('/problems');
     props.history.push(`/problemset?${props.searchParams}`);
   }
 
   // 发布
   const handleClickPublish = () => {
-    // ModalConfirm('提示', (<p>发布后即可应用到自己管理的课堂<br /> 是否确认发布?</p>), () => {
-    //   changePublishLoadingStatus(true);
-    //   handlePublish(props, 'publish');
-    // });
     props.confirm({
       title: '提示',
       content: (<p>发布后即可应用到自己管理的课堂<br /> 是否确认发布?</p>),
-      onOk () {
+      onOk() {
         changePublishLoadingStatus(true);
         handlePublish(props, 'publish');
       }
@@ -141,14 +118,10 @@ const NewOrEditTask = (props) => {
   }
   // 撤销发布
   const handleClickCancelPublish = () => {
-    // ModalConfirm('提示', (<p>是否确认撤销发布?</p>), () => {
-    //   changePublishLoadingStatus(true);
-    //   handleCancelPublish(props, identifier);
-    // });
     props.confirm({
       title: '提示',
       content: ((<p>是否确认撤销发布?</p>)),
-      onOk () {
+      onOk() {
         changePublishLoadingStatus(true);
         handleCancelPublish(props, identifier);
       }
@@ -174,33 +147,33 @@ const NewOrEditTask = (props) => {
   // 发布/模拟挑战
   const renderPubOrFight = () => {
     const pubButton = isPublish
-     ? (<Button
-          style={{ background: 'rgba(102,102,102,1)', border: 'none' }}
-          type="primary"
-          loading={publishLoading}
-          onClick={handleClickCancelPublish}
-       >撤销发布</Button>)
-     : (<Button
-          type="primary"
-          loading={publishLoading}
-          onClick={handleClickPublish}
-       >立即发布</Button>);
+      ? (<Button
+        style={{ background: 'rgba(102,102,102,1)', border: 'none' }}
+        type="primary"
+        loading={publishLoading}
+        onClick={handleClickCancelPublish}
+      >撤销发布</Button>)
+      : (<Button
+        type="primary"
+        loading={publishLoading}
+        onClick={handleClickPublish}
+      >立即发布</Button>);
     // 未发布: 模拟挑战 已发布: 开始挑战
     const challengeBtn = isPublish ? (
       <Button type="primary" onClick={startChallenge}>开始挑战</Button>
     ) : (
-      <Button type="primary" onClick={imitationChallenge}>模拟挑战</Button>
-    );
+        <Button type="primary" onClick={imitationChallenge}>模拟挑战</Button>
+      );
 
     if (isPublish) {
       return (
         <React.Fragment>
           {pubButton}
           <Button
-              type="primary"
-              loading={submitLoading}
-              onClick={handleSubmitForm}
-            >保存</Button>
+            type="primary"
+            loading={submitLoading}
+            onClick={handleSubmitForm}
+          >保存</Button>
           {challengeBtn}
         </React.Fragment>
       );
@@ -208,10 +181,10 @@ const NewOrEditTask = (props) => {
       return (
         <React.Fragment>
           <Button
-              type="primary"
-              loading={submitLoading}
-              onClick={handleSubmitForm}
-            >保存</Button>
+            type="primary"
+            loading={submitLoading}
+            onClick={handleSubmitForm}
+          >保存</Button>
           {pubButton}
           {challengeBtn}
         </React.Fragment>
@@ -233,9 +206,9 @@ const NewOrEditTask = (props) => {
   return (
     <div className={'new_add_task_wrap'}>
       <div className={'task_header'}>
-        <UserInfo userInfo={userInfo}/>
+        <UserInfo userInfo={userInfo} />
         <p className={'header_title'}>{props.name || ''}</p>
-        { renderQuit() }
+        {renderQuit()}
       </div>
       <div className="split-pane-area">
         <SplitPane className='outer-split-pane' split="vertical" minSize={350} maxSize={-350} defaultSize="40%">
@@ -243,18 +216,17 @@ const NewOrEditTask = (props) => {
             <LeftPane />
           </div>
           <SplitPane split="vertical" defaultSize="100%" allowResize={false}>
-            <RightPane onSubmitForm={handleSubmitForm}/>
+            <RightPane onSubmitForm={handleSubmitForm} />
             <div />
           </SplitPane>
         </SplitPane>
       </div>
-      {/* 控制台 */}
       <div className='new_add_task_ctl'>
         {
           /* 录入时: 取消 保存 */
           /* 保存未发布: 立即发布 模拟挑战  */
         }
-        { !identifier ? renderSaveOrCancel() : renderPubOrFight() }
+        {!identifier ? renderSaveOrCancel() : renderPubOrFight()}
       </div>
     </div>
   )
@@ -313,4 +285,4 @@ const mapDispatchToProps = (dispatch) => ({
 export default withRouter(connect(
   mapStateToProps,
   mapDispatchToProps
-)(CNotificationHOC() (NewOrEditTask)));
+)(CNotificationHOC()(NewOrEditTask)));
diff --git a/public/react/src/modules/developer/newOrEditTask/rightpane/index.js b/public/react/src/modules/developer/newOrEditTask/rightpane/index.js
index d42089d7f..15790a803 100644
--- a/public/react/src/modules/developer/newOrEditTask/rightpane/index.js
+++ b/public/react/src/modules/developer/newOrEditTask/rightpane/index.js
@@ -13,7 +13,7 @@ import MyMonacoEditor from '../../components/myMonacoEditor';
 // import ControlSetting from '../../components/controlSetting';
 import actions from '../../../../redux/actions';
 
-function RightPane (props, ref) {
+function RightPane(props, ref) {
 
   const {
     // identifier,
@@ -23,7 +23,7 @@ function RightPane (props, ref) {
     // onSubmitForm,
     saveOjFormCode
   } = props;
-  
+
   // let timer = null;
   // 代码改变时，保存
   const handleCodeChange = (updateCode) => {
@@ -33,7 +33,7 @@ function RightPane (props, ref) {
     //     timer = setInterval(() => {
     //       clearInterval(timer);
     //       timer = null;
-          
+
     //     }, 3000);
     //   }
     // }
@@ -45,11 +45,11 @@ function RightPane (props, ref) {
   // }
   return (
     <div className={'right_pane_code_wrap'}>
-      <MyMonacoEditor 
-        language={language} 
+      <MyMonacoEditor
+        language={language}
         code={showCode}
-        onCodeChange={handleCodeChange}/>
-        
+        onCodeChange={handleCodeChange} />
+
       {/* <ControlSetting
         // identifier={identifier}
         inputValue={props.input} 
diff --git a/public/react/src/modules/developer/studentStudy/rightpane/index.js b/public/react/src/modules/developer/studentStudy/rightpane/index.js
index bebaea1e8..e9229ae39 100644
--- a/public/react/src/modules/developer/studentStudy/rightpane/index.js
+++ b/public/react/src/modules/developer/studentStudy/rightpane/index.js
@@ -6,22 +6,19 @@
  * @LastEditors  : tangjiang
  * @LastEditTime : 2020-01-02 14:23:43
  */
-import React, { useState, useEffect } from 'react';
-import {connect} from 'react-redux';
+import React, { useState } from 'react';
+import { connect } from 'react-redux';
 import MyMonacoEditor from '../../components/myMonacoEditor';
 import ControlSetting from '../../components/controlSetting';
 import actions from '../../../../redux/actions';
-// import QuillForEditor from '../../../../common/quillForEditor';
-// import TextArea from 'antd/lib/input/TextArea';
 import { Input, Form, Button } from 'antd';
-// import FormItem from 'antd/lib/form/FormItem';
 const { TextArea } = Input;
 const FormItem = Form.Item;
 const RightPane = (props) => {
-  
+
   const {
-    identifier, 
-    submitInput, 
+    identifier,
+    submitInput,
     submitUserCode,
     input,
     hack,
@@ -33,54 +30,34 @@ const RightPane = (props) => {
     updateNotice,
     saveUserInputCode,
     restoreInitialCode,
-    // saveOpacityType,
     saveUserCodeForInterval,
     addNotes,
     changeLoadingState
   } = props;
 
-  // const [editorCode, setEditorCode] = useState(editor_code || hack.code);
   const [noteClazz, setNoteClazz] = useState('editor_nodte_area');
   const [noteCount] = useState(5000);
-  // const [code, setCode] = useState(editor_code || hack.code);
-  // let initFlag = true;
-
-  // useEffect(() => {
-  //   if (editor_code) {
-  //     setEditorCode(editor_code);
-  //   } else {
-  //     setEditorCode(hack.code);
-  //   }
-  // }, [hack, editor_code]);
-
-  
+
+
   const handleSubmitForm = () => {
-    // 提交时， 先调用提交接口，提交成功后，循环调用测评接口
-    // saveOpacityType('submit');
     submitUserCode(identifier, submitInput, 'submit');
-    // // 提交时，先调用评测接口， 评测通过后才调用保存接口
-    // updateCode(identifier, submitInput, 'submit');
   }
 
   let timer = null; // 定时器
   // 代码块内容变化时
   const handleCodeChange = (value) => {
-    // console.log('编辑器代码 ======》》》》》》》》》++++++++++', value);
     saveUserInputCode(value);
-    // setEditorCode(value);
     if (!timer) {
       timer = setInterval(function () {
         clearInterval(timer);
         timer = null;
         saveUserCodeForInterval(identifier);
-      }, 3000);
+      }, 10000);
     }
   }
 
   // 代码调试
   const handleDebuggerCode = (value) => {
-    // 调用保存代码块接口，成功后，调用调试接口
-    // saveOpacityType('debug');
     updateCode(identifier, value, 'debug');
   }
   // 恢复初始代码
@@ -101,7 +78,7 @@ const RightPane = (props) => {
     props.form.resetFields();
     setNoteClazz('editor_nodte_area');
   }
- 
+
   const handleSubmitNote = () => {
     props.form.validateFields((err, values) => {
       if (!err) {
@@ -113,7 +90,6 @@ const RightPane = (props) => {
       }
     });
   }
-
   const { getFieldDecorator } = props.form;
   return (
     <div className={'right_pane_code_wrap'}>
@@ -121,7 +97,7 @@ const RightPane = (props) => {
       <MyMonacoEditor
         notice={notice}
         identifier={identifier}
-        language={hack.language} 
+        language={hack.language}
         code={editor_code || hack.code}
         hadCodeUpdate={hadCodeUpdate}
         onCodeChange={handleCodeChange}
@@ -129,11 +105,11 @@ const RightPane = (props) => {
         onRestoreInitialCode={handleRestoreInitialCode}
       />
 
-      <span 
+      <span
         className="iconfont icon-biji student_notes"
         onClick={handleClickNote}
       ></span>
-      
+
       {/* <div className="student_notes">
         <TextArea rows={5} />
       </div> */}
@@ -141,7 +117,7 @@ const RightPane = (props) => {
         <Form>
           <FormItem>
             {
-              getFieldDecorator('notes',{
+              getFieldDecorator('notes', {
                 rules: [
                   { required: true, message: '笔记不能为空' },
                   { max: noteCount, message: `笔记最大字数为${noteCount}` }
@@ -153,7 +129,7 @@ const RightPane = (props) => {
                 rows="5"
               />)
             }
-            
+
           </FormItem>
           <FormItem style={{ textAlign: 'right' }}>
             <Button loading={loading} style={{ marginRight: '10px' }} onClick={handleCancelNote}>取消</Button>
@@ -161,12 +137,12 @@ const RightPane = (props) => {
           </FormItem>
         </Form>
       </div>
-      
-      <ControlSetting 
+
+      <ControlSetting
         identifier={identifier}
         inputValue={input}
         onDebuggerCode={handleDebuggerCode}
-        onSubmitForm={handleSubmitForm}/>
+        onSubmitForm={handleSubmitForm} />
     </div>
   );
 }
@@ -174,10 +150,10 @@ const RightPane = (props) => {
 const mapStateToProps = (state) => {
 
   const {
-    user_program_identifier, 
-    hack, 
-    userTestInput, 
-    editor_code, 
+    user_program_identifier,
+    hack,
+    userTestInput,
+    editor_code,
     notice,
     hadCodeUpdate
   } = state.ojForUserReducer;
@@ -192,7 +168,7 @@ const mapStateToProps = (state) => {
     hadCodeUpdate,
     editor_code,
     input: userTestInput,
-    submitInput: hack.input, 
+    submitInput: hack.input,
     identifier: user_program_identifier
   };
 }
diff --git a/public/react/src/redux/actions/ojForUser.js b/public/react/src/redux/actions/ojForUser.js
index a5650d481..3069cb917 100644
--- a/public/react/src/redux/actions/ojForUser.js
+++ b/public/react/src/redux/actions/ojForUser.js
@@ -25,11 +25,10 @@ import { notification } from "antd";
 // 进入编程页面时，首先调用开启编程题接口
 export const startProgramQuestion = (id, props) => {
   return (dispatch, getState) => {
-    const {searchParams} = getState().ojFormReducer;
     fetchStartProgram(id).then(res => {
       const { status, data } = res;
       if (status === 200) {
-        const {identifier} = data;
+        const { identifier } = data;
         dispatch({
           type: types.SAVE_USER_PROGRAM_ID,
           payload: identifier
@@ -41,13 +40,6 @@ export const startProgramQuestion = (id, props) => {
         });
         // 跳转至开启编程
         if (identifier) {
-          // let data = Object.assign({}, props);
-          // const path = {
-          //   pathname: `/myproblems/${identifier}`,
-          //   state: data
-          // }
-          // console.log(path);
-          // props.history.push(`/myproblems/${identifier}`);
           props.history.push({
             pathname: `/myproblems/${identifier}`,
           });
@@ -115,24 +107,18 @@ export const saveUserCodeForInterval = (identifier, code) => {
       type: types.AUTO_UPDATE_CODE,
       payload: true
     });
-    // console.log('+++', userCode);
     fetchUpdateCode(identifier, {
       code: Base64.encode(userCode)
     }).then(res => {
       if (res.data.status === 401) {
         return;
       };
-      // dispatch({
-      //   type: types.RESTORE_INITIAL_CODE,
-      //   payload: userCode
-      // });
       setTimeout(() => {
         dispatch({
           type: types.AUTO_UPDATE_CODE,
           payload: false
         })
       }, 1000);
-      // console.log('代码保存成功', res);
     }).catch(() => {
       dispatch({
         type: types.AUTO_UPDATE_CODE,
@@ -190,7 +176,7 @@ export const codeEvaluate = (dispatch, identifier, type, time_limit, hackStatus,
    * @param {*} count  执行次数
    * @param {*} timer  定时器
    */
-  function getCodeSubmit (intervalTime, finalTime, count, timer){
+  function getCodeSubmit(intervalTime, finalTime, count, timer) {
     const excuteTime = (count++) * intervalTime; // 当前执行时间
     fetchCodeSubmit(identifier, { mode: type }).then(res => {
       const { status } = res.data; // 评测返回结果
@@ -290,7 +276,7 @@ export const codeEvaluate = (dispatch, identifier, type, time_limit, hackStatus,
  * @param {*} inputValue 输入值: 自定义 | 系统返回的
  * @param {*} type 测评类型 debug | submit
  */
-export const debuggerCode = (identifier,value, type) => {
+export const debuggerCode = (identifier, value, type) => {
   return (dispatch, getState) => {
     // 调用之前 先保存 code
     // TODO
@@ -337,19 +323,26 @@ export const debuggerCode = (identifier,value, type) => {
 // 获取提交记录
 export const getUserCommitRecord = (identifier) => {
   return (dispatch, getState) => {
-    const { pages: { limit, page } } = getState().ojForUserReducer;
-    fetchUserCommitRecord(identifier, {
-      limit,
-      page
-    }).then(res => {
-      const {status, data} = res;
-      if (status === 200) {
-        dispatch({
-          type: types.COMMIT_RECORD,
-          payload: data
-        })
-      }
-    });
+    try {
+      const { pages: { limit, page } } = getState().ojForUserReducer;
+      fetchUserCommitRecord(identifier, {
+        limit,
+        page
+      }).then(res => {
+        if (res) {
+          const { status, data } = res;
+          if (status === 200) {
+            dispatch({
+              type: types.COMMIT_RECORD,
+              payload: data
+            })
+          }
+        }
+      })
+    } catch (error) {
+      console.log(error, '-------')
+    }
+    ;
   }
 }
 // 获取提交记录详情
@@ -401,11 +394,10 @@ export const changeUserCodeTab = (key) => {
  */
 export const submitUserCode = (identifier, inputValue, type) => {
   return (dispatch, getState) => {
-    const { userCode, isUpdateCode, hack} = getState().ojForUserReducer;
+    const { userCode, isUpdateCode, hack } = getState().ojForUserReducer;
 
-    function userCodeSubmit () {
+    function userCodeSubmit() {
       fetchUserCodeSubmit(identifier).then(res => {
-        // console.log('用户提交代码成功======》》》》》', res);
         if (res.status === 200) {
           if (res.data.status === 401) {
             dispatch({
@@ -415,7 +407,6 @@ export const submitUserCode = (identifier, inputValue, type) => {
             return;
           };
           // 测评
-          console.log('hack=====', hack);
           codeEvaluate(dispatch, identifier, type, hack.time_limit, hack.status, hack.score, hack.passed);
         }
       }).catch(() => {
@@ -427,10 +418,9 @@ export const submitUserCode = (identifier, inputValue, type) => {
     }
     if (isUpdateCode) {
       fetchUpdateCode(identifier, {
-        code: userCode
+        code: Base64.encode(userCode)
       }).then(res => {
         // 是否更新了代码, 目的是当代码没有更新时不调用更新代码接口，目录没有实现
-        // TODO 需要优化
         if (res.data.status === 401) {
           dispatch({
             type: types.SUBMIT_LOADING_STATUS,
@@ -460,8 +450,7 @@ export const restoreInitialCode = (identifier, msg) => {
   return (dispatch) => {
     fetchRestoreInitialCode(identifier).then(res => {
       if (res.data.status === 401) return;
-      // console.log('恢复初始代码====》》》》', res);
-      const {status, data} = res;
+      const { status, data } = res;
       if (status === 200) {
         dispatch({
           type: types.RESTORE_INITIAL_CODE,
@@ -515,7 +504,6 @@ export const changeRecordPagination = (page) => {
 export const addNotes = (identifier, params, cb) => {
   return (dispatch) => {
     fetchAddNotes(identifier, params).then(res => {
-      // console.log('添加笔记成功===>>', res);
       dispatch({
         type: types.LOADING_STATUS,
         payload: false