Merge branch 'dev_tj' into dev_aliyun

merge oj

public/react/src/modules/developer/studentStudy/index.js

@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-23 10:53:19
  * @LastEditors: tangjiang
- * @LastEditTime: 2019-12-13 16:46:31
+ * @LastEditTime: 2019-12-13 17:19:15
  */
 import './index.scss';
 import React, { useEffect, useState } from 'react';
@@ -23,15 +23,14 @@ import { withRouter } from 'react-router';
 
 function StudentStudy (props) {
 
+  const [hasUpdate, setHasUpdate] = useState(true);
   const {
+    // hack,
     userInfo,
     hack_identifier,
-    user_program_identifier,
+    // user_program_identifier,
     restoreInitialCode
   } = props;
-  
-  // 是否更新
-  const [isUpdate, setIsUpdate] = useState(true);
 
   const {
     match: { params }, 
@@ -50,8 +49,8 @@ function StudentStudy (props) {
 
   useEffect(() => {
     const { hack = {} } = props;
-    if (!hack.modify_code && isUpdate) { // 代码更改，提示是否需要更新代码
+    if (hack.modify_code && hasUpdate) { // 代码更改，提示是否需要更新代码
-      setIsUpdate(false);
+      setHasUpdate(false);
       Modal.confirm({
         title: '提示',
         content: (
@@ -67,7 +66,7 @@ function StudentStudy (props) {
         }
       });
     }
-  }, [props]);
+  }, [props, hasUpdate, setHasUpdate]);
 
   const _hack_id = hack_identifier || fromStore('hack_identifier');
 
@@ -93,7 +92,7 @@ function StudentStudy (props) {
         </div> */}
         <UserInfo userInfo={userInfo}/>
         <div className={'study_name'}>
-          <span>乘积最大序列</span>
+      <span>乘积最大序列 {hasUpdate}</span>
         </div>
         <div className={'study_quit'}>
           {/* to={`/problems/${_hack_id}/edit`} */}
@@ -129,8 +128,9 @@ function StudentStudy (props) {
 
 const mapStateToProps = (state) => {
   const { userInfo } = state.userReducer;
-  const { hack_identifier, user_program_identifier } = state.ojForUserReducer;
+  const { hack_identifier, user_program_identifier,  hack } = state.ojForUserReducer;
   return {
+    hack,
     userInfo,
     user_program_identifier,
     hack_identifier

public/react/src/services/ojService.js

@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-20 10:55:38
  * @LastEditors: tangjiang
- * @LastEditTime: 2019-12-13 10:09:12
+ * @LastEditTime: 2019-12-13 17:03:47
  */
 
 import axios from 'axios';
@@ -84,10 +84,10 @@ export async function fetchUserCommitRecordDetail (identifier) {
 }
 
 // 恢复初始代码
-export async function restoreInitialCode (identifier) {
+// export async function restoreInitialCode (identifier) {
-  const url = `/myproblems/${identifier}/restore_initial_code.json`;
+//   const url = `/myproblems/${identifier}/restore_initial_code.json`;
-  return axios.get(url);
+//   return axios.get(url);
-}
+// }
 
 // 发布任务
 export async function publishTask (identifier) {
@@ -115,7 +115,8 @@ export async function fetchUserCodeSubmit (identifier) {
 
 // 恢复初始代码
 export async function fetchRestoreInitialCode (identifier) {
-  const url = `/myproblems/${identifier}/restore_initial_code.json`;
+  // const url = `/myproblems/${identifier}/restore_initial_code.json`;
+  const url = `/myproblems/${identifier}/sync_code.json`;
   return axios.post(url);
 }