From 0dbbda3c3f91ccb784eade3645e4ddace60839f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Mon, 9 Mar 2020 16:58:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/images/educoder/xcx/fenxiangs.png | Bin 0 -> 1370 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100755 public/images/educoder/xcx/fenxiangs.png

diff --git a/public/images/educoder/xcx/fenxiangs.png b/public/images/educoder/xcx/fenxiangs.png
new file mode 100755
index 0000000000000000000000000000000000000000..f5b170bede3a7efa3d0764d4695be77335e765e7
GIT binary patch
literal 1370
zcmV-g1*Q6lP)<h;3K|Lk000e1NJLTq001}u001}$1^@s6sD?Wp000FcNkl<ZXhZFq
ze`u6-9LHau+h*HJB?$ealrSWBxB9~sCSq--R#1pkYj^vBT2fGdR9N^=lu$&}us@7a
zlJdvh*(mA{qeavlNH%Fuw!5t`p)5l&N>dl!?)k)X-o@?q+}-nR&-0uEpZ~VcukY)5
ze}6vr6)c{n?OLCn#T+Z!RQ`9diqpwfIp;J-Q;*Ib9phb9)(V_OcqJK;ZaaA-=M?PG
z8JgxvF?b9J+6kV7&zK0?5@DW2MD50hV!A_>jrsm6JU<+f*URO|05-;SuEKs*ZYvky
zhFt=*C&Ci5n=2UApMeF1{zicHBVl>JR32&W)9O=ya1dpQ-GWo~6L>4pE>GFb6O8IX
zU|FHRLb}Re%}}R&S}d0=itEOJ!4A8{-0)N3nc;}MX*X9Wsx1ni12q<qqiV2nq*K1O
z$|uF%j@{yu@H<qUX4R1{IqxJk6xWCvM2p1yg|Ivskwl^01RMow#~Fkngslb`P8w0p
zH<0G|oa^a7&>~~ye68#aF@0K;tyVS_ey<Xi4u$1-zTE_zIGYKZ>`udzY3Nj9f-!v+
zWwT{>gppcd`Cvp&=j@h%PRGbp8tgb$RT|^$G?ew0vBE&zKdcyhTrQaQ=?4fr+@n>A
z6dwZ*6oKrenl;H*xmYp4;BH+aRcugbQn=2kk^<%$J{P#E$e7$c9A=&GfaZ=VFvdGY
zyO>kb(*9d~2W*JyK7mKv<*?4CaK=}_&>nqI1AOQQT((BaKfo6?5W1NmRT}&PRM_Ji
zU}&GVX_~kN+@C6Z2Be*Ui&78V3(PDM*H?Fr`~3kdp`IG79qyD*oWR|>S8o^-4gfcm
zf-~1bUjR#}_gyl=Vkc)qCvd(j^yYEw<Oz}j3k%=2Q}vv}`2x5ouImB@?^$%E!DNKn
z?W$)3?(j@y)j)@wExXxvYcHBPOrK!HYOILCeTh!#wKMkYz}3~TdazZ_6z21E3>H;S
z7)VCs4m)s7+qGu&8U}$|iufNc2IpxPbxXa5sIC<FVlr@^0=l7|*}za#?@_So$|aS{
zy%0~js9Wlpja=HJb$_Qav+#|1D%yhcOhLEQ%K<IerSt1+c*)SrQu7TpY_a<R*>wfo
zRL{;NRL;kBK)2N^2T;!LDqyA5GrMqY4ecsarG)s=HZi}1XC7ApgK>QVgSRKVRR`-{
zIYkQXp}iV3ghK+evbOVM2Frfxl<!>yG(Sa<;wUh0!fqnX-H9&w%4y^6_&3CKrzjip
zeHA_!ZkIN90gI^z{mFJ|w$s?j_ynVBzPOfx*#B#~(nU+D7cgiU>J;<r=E)O`s+s#P
zZviW$o(bhSU?tV_2e5+bc@9`<^}GkHuzH>XW`6)V2Fx#<9=)D9^Xqvw$u!1wo?-B-
z#oX`dx>s1wGr-KXlN6@}X6F|*gyxZm^n0@CStRug(5#jH-nk2yk*O_oCnK`SFE~%f
zU=AYNRTmq|v5^k>!B03}0R0B?Z46c#ELY#tF?cyZUIDbaC*#(qdp{JuqM+qXrvT3-
z!}5k73QV;|FskOJ;?7bBUh@X-)%gwzzes>>s!Zxm*;E^CH(ub{?6s~-8;#r}e3XpH
zLz%rtFs5IktgxGOI{0aT&BI}NEdyBQn&NceDQx4v)yl#n9rD|y-J_~B#OM`RJsoK#
zw7FpZ$lTdBZ?#`Y(KFp41zt|H%M0U&W9~0i3GE}S%A?u)+v6sl%UIo$3VlYJ?jO74
c+roDK2U8Ald>;LW5&!@I07*qoM6N<$f<S(sod5s;

literal 0
HcmV?d00001


From 357e6d5468804ed71b4a6a078171cce1388d0df8 Mon Sep 17 00:00:00 2001
From: harry <harry@fangmingyi.com>
Date: Mon, 9 Mar 2020 17:09:13 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=E5=88=87=E6=8D=A2=20=E5=AE=9E=E8=AE=AD?=
 =?UTF-8?q?=E6=9C=AA=E6=9B=B4=E6=96=B0=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/redux/reducers/ojForUserReducer.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/react/src/redux/reducers/ojForUserReducer.js b/public/react/src/redux/reducers/ojForUserReducer.js
index d20656513..60c3dc7af 100644
--- a/public/react/src/redux/reducers/ojForUserReducer.js
+++ b/public/react/src/redux/reducers/ojForUserReducer.js
@@ -17,7 +17,6 @@ const initialState = {
   commitTestRecordDetail: {}, // 调试代码执行结果
   commitRecordDetail: {}, // 提交成功后记录提交的详情
   commitRecord: [], // 提交记录
-  userCode: '', // 保存当前用户输入的代码
   isUpdateCode: false, // 是否更新了代码内容
   userCodeTab: 'task', // 学员测评tab位置: task | record | comment 
   userTestInput: '', // 用户自定义输入值 
@@ -59,7 +58,7 @@ const ojForUserReducer = (state = initialState, action) => {
         hack: Object.assign({}, hack),
         test_case: Object.assign({}, test_case),
         comment_identifier: hack.identifier,
-        userCode: tempCode
+        editor_code: tempCode
       }
     case types.COMMIT_RECORD_DETAIL:
       let result = action.payload.data;
@@ -127,7 +126,8 @@ const ojForUserReducer = (state = initialState, action) => {
       }
       return {
         ...state,
-        recordDetail: tempDetail
+        recordDetail: tempDetail,
+        editor_code: tempDetail['code']
       }
     case types.RESTORE_INITIAL_CODE:
       const curHack = state.hack;